1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-03 00:57:52 +02:00
Commit Graph

15 Commits

Author SHA1 Message Date
3928d0ebda Insert fake todo entry for a conflicting commit that is being applied
When stopping in a rebase because of a conflict, it is nice to see the commit
that git is trying to apply. Create a fake todo entry labelled "conflict" for
this, and show the "<-- YOU ARE HERE ---" string for that one (in red) instead
of for the real current head.
2023-06-22 18:57:58 +02:00
d772c9f1d4 Use sentence case everywhere
We have not been good at consistent casing so far. Now we use 'Sentence case' everywhere. EVERYWHERE.

Also Removing 'Lc' prefix from i18n field names: the 'Lc' stood for lowercase but now that everything
is in 'Sentence case' there's no need for the distinction.

I've got a couple lower case things I've kept: namely, things that show up in parentheses.
2023-05-25 23:52:19 +10:00
63dc07fded Construct arg vector manually rather than parse string
By constructing an arg vector manually, we no longer need to quote arguments

Mandate that args must be passed when building a command

Now you need to provide an args array when building a command.
There are a handful of places where we need to deal with a string,
such as with user-defined custom commands, and for those we now require
that at the callsite they use str.ToArgv to do that. I don't want
to provide a method out of the box for it because I want to discourage its
use.

For some reason we were invoking a command through a shell when amending a
commit, and I don't believe we needed to do that as there was nothing user-
supplied about the command. So I've switched to using a regular command out-
side the shell there
2023-05-23 19:49:19 +10:00
45d45d2397 show file tree by default in integration tests 2023-02-26 13:01:51 +11:00
f7e8b2dd71 cleanup integration test code 2023-02-26 12:54:13 +11:00
1034962c7e migrate more tests 2023-02-22 22:29:01 +11:00
bfde06d049 migrate push tests 2023-02-21 21:50:03 +11:00
76a1b501f2 migrate more force push tests 2023-02-19 15:48:09 +11:00
7201a91b69 remove unneeded config setting 2023-02-19 13:51:37 +11:00
31d796ee75 migrate forcePush integration test 2023-02-19 13:38:15 +11:00
a3096e720c migrate pullAndSetUpstream test 2023-02-19 12:42:48 +11:00
c599aaed51 migrate pull integration test 2023-02-19 11:48:21 +11:00
bff076c70a rename key to Pull 2023-02-19 11:42:00 +11:00
6f709456fe migrate test for rename branch and pull 2022-12-30 22:42:32 +11:00
277ca706eb migrate fetchPrune integration test 2022-12-30 22:42:32 +11:00