1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-19 00:28:03 +02:00
Commit Graph

6505 Commits

Author SHA1 Message Date
fc2f8b7b20 Make debugger config work when changing repos while debugging
When changing repos while debugging, the current working directory changes,
which means that a daemon lazygit doesn't find the debugger_config.yml file any
more when you do an interactive rebase. Fix this by using an absolute path for
the --use-config-file option.
2023-04-04 10:26:42 +02:00
298dae23e8 fix: generalize parsing of ssh git urls 2023-04-03 12:10:30 +10:00
a02b54e1b7 Merge pull request #2497 from stefanhaller/fix-initial-scroll-bar-size 2023-04-02 16:38:07 +10:00
0af4e5a843 prevent unnecessary re-renders of view 2023-04-02 15:44:05 +10:00
e0503b9922 Updated README.md 2023-04-02 00:26:39 +00:00
ef239c04fb Merge pull request #2485 from stefanhaller/interactive-rebase-improvements 2023-04-02 10:26:19 +10:00
d508badd62 Better error message when trying to amend a commit other than head during rebase 2023-04-01 08:16:15 +02:00
e7d0116312 Allow amending the head commit during interactive rebase 2023-04-01 08:16:15 +02:00
85fdb700ba Extract amendHead function into new AmendHelper 2023-04-01 08:16:15 +02:00
7513d77567 Add integration test for amending from the files panel 2023-04-01 08:16:15 +02:00
c757063264 Better error message when trying to edit or move a non-todo commit during rebase
Previously we would have tried to do the rebase, resulting in a long and
somewhat cryptic error message from git; now we check ourselves and show a less
intimidating message.
2023-04-01 08:16:15 +02:00
b24955063c Allow rewording the head commit during interactive rebase 2023-04-01 08:16:15 +02:00
605bc026a1 Set promptToReturnFromSubprocess to false for integration tests
There is no way how we could confirm the prompt in an integration test.
2023-04-01 08:16:15 +02:00
c6930e0538 Cleanup: use commit.isTODO() consistently
It seems cleaner than checking the Status for "rebasing".
2023-04-01 08:16:15 +02:00
3a59aba46d Merge pull request #2521 from jesseduffield/fix-reflog-text-colour 2023-03-26 17:10:31 +11:00
213ae8dd07 fix reflog text colour by defaulting every view to the same foreground colour 2023-03-26 15:24:09 +11:00
4780953cef Merge pull request #2377 from shinhs0506/clear-staging-after-commit 2023-03-24 19:13:00 +11:00
11bc8b87fa Updated README.md 2023-03-24 07:55:25 +00:00
3bfbc9d255 Merge pull request #2518 from jesseduffield/remove-old-integration-test-stuff 2023-03-24 18:55:06 +11:00
8121a0cc74 remove old integration test recording code 2023-03-24 18:42:11 +11:00
4adca84d68 Make sure scrollbars have the right size initially
We refresh the view after reading just enough to fill it, so that we see the
initial content as quickly as possible, but then we continue reading enough
lines so that we can tell how long the scrollbar needs to be, and then we
refresh again. This can result in slight flicker of the scrollbar when it is
first drawn with a bigger size and then jumps to a smaller size; however, that's
a good tradeoff for a solution that provides both good speed and accuracy.
2023-03-21 18:26:18 +01:00
b7c61aa883 Push initial context instead of just putting it in the context array
This makes sure activateContext gets called on it.
2023-03-20 20:14:13 +11:00
40f6767cfc Avoid deactivating and activating when pushing the current context again
When calling PushContext, do nothing if the context to be pushed is already on
top of the stack. Avoids flicker in certain situations.
2023-03-20 20:14:13 +11:00
776d8f4d2e refresh the staging panel on successful commit
apply formatting
2023-03-20 20:13:59 +11:00
4b67a45a16 Merge pull request #2515 from stefanhaller/fix-deprecated-rand-seed 2023-03-20 20:12:25 +11:00
a82d952f48 Merge pull request #2495 from jesseduffield/feature/remove-altreturn 2023-03-20 20:11:35 +11:00
549ce09f71 Fix deprecated rand.Seed 2023-03-19 10:00:19 +01:00
cef804f27a Merge pull request #2513 from jesseduffield/refactor-patch-handling 2023-03-19 16:53:02 +11:00
60f902f026 rename patch manager to patch builder 2023-03-19 16:35:57 +11:00
7ce3165afa specify view when assertion on line count fails 2023-03-19 16:30:39 +11:00
c28e25524a bump gocui to fix race condition 2023-03-19 16:30:39 +11:00
73c7dc9c5d refactor patch code 2023-03-19 16:30:39 +11:00
e842548fc8 Bump golang.org/x/net from 0.0.0-20220722155237-a158d28d115b to 0.7.0
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.0.0-20220722155237-a158d28d115b to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](https://github.com/golang/net/commits/v0.7.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-19 04:42:38 +00:00
b542579db3 Better escape code parsing (thanks to Ryooooooga) (#2514) 2023-03-19 15:41:47 +11:00
e6274af015 appease golangci-lint (#2512) 2023-03-19 11:20:29 +11:00
4f57bf22c9 Updated README.md 2023-03-19 00:09:11 +00:00
8dbd7d44ff Fix checking for credentials performance (#2452)
Co-authored-by: Jesse Duffield <jessedduffield@gmail.com>
2023-03-19 11:08:54 +11:00
4b4dccfd7d Fix "move patch into new commit" for partial hunk (#2507) 2023-03-18 18:17:47 +11:00
81ea3107ed Uffizzi PR: Update Uffizzi Workflows (#2502) 2023-03-18 11:33:07 +11:00
5c8bc790ff Make arrows consistent (#2501) 2023-03-18 11:32:44 +11:00
b5d612e6d6 Add border config (#2344)
Co-authored-by: yk-kd <yosuke.komada@gmail.com>
2023-03-18 11:23:31 +11:00
dea279920c Updated README.md 2023-03-17 23:26:33 +00:00
5834440767 Merge pull request #2500 from Ryooooooga/fix-commit-loader 2023-03-18 10:26:15 +11:00
33f332e28d build: remove github.com/jesseduffield/yaml package 2023-03-17 23:19:11 +09:00
55fb3ef4e6 fix(commit_loader): fix log command 2023-03-16 20:13:23 +09:00
f314cb3763 Remove alternative confirmation and return keymappings 2023-03-09 10:32:00 +01:00
516e963392 Updated README.md 2023-03-08 09:45:26 +00:00
804a134aa5 Merge pull request #2471 from stefanhaller/improve-custom-patch-conflict-handling 2023-03-08 20:45:10 +11:00
82fc6fb111 Merge pull request #2491 from TylerBarnes/patch-1 2023-03-08 10:26:06 +11:00
0bda93d4c3 Add more unit tests 2023-03-08 09:19:23 +11:00