Jesse Duffield
c61bfbdd4c
Support opening lazygit in a submodule
2019-05-12 17:59:49 +10:00
Jesse Duffield
5a0d0bb299
support resetting to a commit in either soft, hard, or mixed mode
2019-05-06 22:44:38 +10:00
Suhas Karanth
e09aac6450
Improve directory check for .git
...
Return error if the .git exists but is not a directory. This provides a
slightly better failure message for git repo with submodules in case
the '.git' is a file which provides the reference to the parent's .git
folder with the submodule inside.
2019-05-06 21:37:42 +10:00
Jesse Duffield
0d3a193ab5
Add 'w' keybinding in files panel to commit as a WIP
...
If your git.skipHookPrefix is set to, say, WIP, in your config, then
hitting 'w' in the files panel will bring up the commit message panel
with 'WIP' pre-filled, so you just need to hit enter to confirm
(or add some more to the message) in order to commit your changes
with the --no-verify flag, meaning the pre-commit hook will be skipped
2019-04-13 14:38:17 +10:00
Jesse Duffield
ab9fa291a8
Add skipHookPrefix to config
...
allows a user to specify a commit message prefix that will tell lazygit to skip
the pre-commit hook. This defaults to WIP. Setting it to the empty string will
disable the feature.
So if my message goes 'WIP: do the thing' then the pre-commit hook will not run
2019-04-13 14:38:17 +10:00
Peter Lundberg
fc3a57b5e2
Change expected sha for DiscardOldFileChanges
2019-04-10 17:17:31 +10:00
Peter Lundberg
7ff07e1454
Always include atleast 2 commits when doing squash and fixup
2019-04-10 17:17:31 +10:00
Jesse Duffield
55538a3695
support custom commands
2019-04-07 17:15:01 +10:00
Jesse Duffield
60e33f5d8c
Allow for creating fixup! commits
2019-04-07 13:13:40 +10:00
skanehira
f34be1896a
fixed some #397
2019-04-06 13:02:20 +11:00
skanehira
c350cdba43
add feature of display diff between specific commits #397
2019-04-06 13:02:20 +11:00
Jesse Duffield
acfc961909
move soft reset keybinding into reset options
2019-03-23 13:26:17 +11:00
Jesse Duffield
f502f75e1f
add more options for resetting files in the working tree
2019-03-23 13:26:17 +11:00
Jesse Duffield
ff97ef7b94
support discarding unstaged changes
2019-03-23 13:26:17 +11:00
Kristijan Husak
0d208b7957
Update bitbucket pull request url.
2019-03-16 11:58:26 +11:00
Jesse Duffield
f5c8aac97d
add two more tests
2019-03-16 10:20:27 +11:00
Jesse Duffield
466fc4227e
fix tests
2019-03-16 10:20:27 +11:00
Jesse Duffield
c034c88be4
display test name when running tests
2019-03-16 10:20:27 +11:00
Jesse Duffield
72830efc45
add some tests
2019-03-16 10:20:27 +11:00
Jesse Duffield
c98eddc185
appease golangci
2019-03-16 10:20:27 +11:00
Jesse Duffield
3f567c952c
i18n for error message about a feature being disabled for GPG users
2019-03-16 10:20:27 +11:00
Jesse Duffield
4f7f6a073c
allow user to discard old file changes for a given commit
2019-03-16 10:20:27 +11:00
Jesse Duffield
0e008cc15f
allow user to checkout old files
2019-03-16 10:20:27 +11:00
Jesse Duffield
1ad9c6faac
minor cleanup
2019-03-16 10:20:27 +11:00
skanehira
06fe726ee7
Add feature of display committed file list #383
2019-03-16 10:20:27 +11:00
Jesse Duffield
0079015102
distinguish between inline and non-inline merge conflicts
2019-03-03 15:58:01 +11:00
Jesse Duffield
7a2176f479
acknowledge 'DU' statuses as being merge conflicts
2019-03-03 15:48:16 +11:00
Jesse Duffield
8925b161a7
windows support for skipping the editor
2019-03-03 12:44:10 +11:00
Jesse Duffield
273678f081
fix issue where you couldn't rearrange commits while rebasing onto a branch
2019-03-02 21:31:48 +11:00
Jesse Duffield
0c886eddfb
Revert "remove old rebase code now that we're only ever interactively rebasing"
...
This reverts commit 1a19b1412d
2019-03-02 20:00:26 +11:00
Jesse Duffield
1337f6e76a
appease golangci
2019-03-02 17:45:53 +11:00
Jesse Duffield
4de31da4be
fix up tests
...
This fixes up some git and oscommand tests, and pulls some tests into commit_list_builder_test.go
I've also made the NewDummyBlah functions public so that I didn't need to duplicate them across packages
I've also given OSCommand a SetCommand() method for setting the command on the struct
I've also created a file utils.go in the test package for creating convient 'CommandSwapper's, which
basically enable you to assert a sequence of commands on the command line, and swap each one out for
a different one to actually be executed
2019-03-02 13:39:09 +11:00
Jesse Duffield Duffield
23c51ba708
cleanup
2019-02-24 18:34:18 +11:00
Jesse Duffield Duffield
f4938deaae
change type of cherryPickedCommits from []string to []*Commit
2019-02-24 17:34:19 +11:00
Jesse Duffield Duffield
a8858cbd12
support cherry picking commits
2019-02-24 13:51:52 +11:00
Jesse Duffield Duffield
1a19b1412d
remove old rebase code now that we're only ever interactively rebasing
2019-02-24 11:03:14 +11:00
Jesse Duffield Duffield
95d451e59a
Make it easier to run sync/async commands, switch to interactive rebase when rebasing on branches
2019-02-24 10:58:15 +11:00
Jesse Duffield
f6b3a9b184
rearranging todo items while interactively rebasing
2019-02-24 09:42:34 +11:00
Jesse Duffield
cdc50e8557
more support for files with spaces
2019-02-24 09:42:34 +11:00
Jesse Duffield
0173fdb9df
support file renames
2019-02-24 09:42:32 +11:00
Jesse Duffield
0228e25084
work towards more interactive rebase options
2019-02-19 23:36:36 +11:00
Jesse Duffield
935f774834
don't autostash when editing
2019-02-19 09:34:24 +11:00
Jesse Duffield
dcc7855fd0
pull commit list builder functions into their own builder struct
2019-02-19 09:18:30 +11:00
Jesse Duffield
a8e22ed82f
show interactive rebase commits that are yet to go
2019-02-19 09:03:29 +11:00
Jesse Duffield
d44638130c
add various interactive rebase commands
2019-02-18 23:27:54 +11:00
Jesse Duffield
76a27f417f
rename any commit
2019-02-18 21:29:43 +11:00
Jesse Duffield
e011e9bc42
more work on rebasing feature
2019-02-16 21:01:17 +11:00
Jesse Duffield
ad93b4c863
consider whether the view has focus when rendering the contents of a view
2019-02-16 15:17:44 +11:00
Jesse Duffield
d967f65329
fix git tests
2019-02-16 11:24:47 +11:00
Jesse Duffield
6430ab6ac9
Merge branch 'master' into feature/rebasing
2019-02-11 22:46:27 +11:00
Jesse Duffield
cfe3605e6b
use go-errors package to display stacktrace of errors that cause panics
2019-02-11 22:39:17 +11:00
Jesse Duffield
3d343e9b57
Merge branch 'master' into feature/rebasing
2019-02-11 21:02:53 +11:00
KimMachineGune
3e24069722
pkg: Fix typo
2019-01-16 18:06:11 +11:00
Jesse Duffield
0afffd03ca
remove comment
2018-12-19 21:46:48 +11:00
mjarkk
800b40ecc4
Translated credentials error with git push/pull/fetch
2018-12-19 10:06:58 +01:00
Jesse Duffield
7835fce708
fix tests
2018-12-18 22:40:36 +11:00
Jesse Duffield
20a94447d7
explicitly return newlines to our live command stdin
2018-12-18 22:23:17 +11:00
Jesse Duffield
c35255b7a9
set stderr ourselves so that we only read the error output if there is any
2018-12-18 21:25:49 +11:00
mjarkk
f5f726e9c4
A try to hide the password from the error output
2018-12-17 08:58:09 +01:00
Jesse Duffield
4886b8350e
always hide rather than delete the credentials view, and don't log on error in case there is a user password in the error
2018-12-16 17:28:04 +11:00
mjarkk
af26b5f3e0
Tried to fix circleci
2018-12-14 13:45:43 +01:00
mjarkk
70cd6700e7
Tried to fix circleci
2018-12-14 13:43:13 +01:00
mjarkk
d11f8989d9
Merge branch 'https-ask-for-username-password' of https://github.com/mjarkk/lazygit into https-ask-for-username-password
2018-12-14 13:40:40 +01:00
mjarkk
0fca27d022
Tried to fix circleci
2018-12-14 13:40:29 +01:00
Mark Kopenga
255319e597
Merge branch 'master' into https-ask-for-username-password
2018-12-14 11:13:29 +01:00
mjarkk
5d038dfd33
Removed the wired error handling
2018-12-12 22:11:31 +01:00
mjarkk
0577d3b97f
Removed the username / password savety check
...
This check is not realy needed because the change that it will show up a second time is so low that this is more work to check than the change it actualy might happen
2018-12-12 21:08:53 +01:00
Jesse Duffield
a26c15dafa
some fixes for issues around the credentials panel
2018-12-12 22:34:20 +11:00
Jesse Duffield
9489a94473
Make merge panel its own panel
2018-12-11 22:02:12 +11:00
Jesse Duffield
e0ff46fe53
more work on rebasing including visual indicators
2018-12-11 09:39:54 +11:00
Glenn Vriesman
7a7e885773
Added rebase support commands
2018-12-11 09:39:54 +11:00
Glenn Vriesman
670f0e37c7
Added rebase functions
2018-12-11 09:39:54 +11:00
Glenn Vriesman
822dc5dada
Moved push-pullables status to the end
2018-12-11 09:38:33 +11:00
mjarkk
f14effe5f5
Worked and fixed a view comments
2018-12-09 13:04:19 +01:00
Mark Kopenga
19a6a32625
Merge branch 'master' into https-ask-for-username-password
2018-12-08 16:41:39 +01:00
Jesse Duffield
ff856b7630
fetching branches without checking out
2018-12-08 11:51:47 +11:00
Jesse Duffield
99a8b1ae8b
making a start on unidirectional data binding to fix these UI bugs
2018-12-08 11:51:47 +11:00
Mark Kopenga
1b6d34e76a
Merge branch 'master' into https-ask-for-username-password
2018-12-06 08:31:12 +01:00
Jesse Duffield
3b51d7cd00
clean as well as reset (I'm hoping this is a good design decision)
2018-12-05 20:06:47 +11:00
Jesse Duffield
66512ca253
use porcelain git rather than go-git for reset --hard HEAD because go-git takes over 5 seconds
2018-12-05 19:49:07 +11:00
Jesse Duffield
c0f9795910
staging lines and hunks
2018-12-05 19:33:46 +11:00
Jesse Duffield
658e5a9faf
initial support for staging individual lines
2018-12-04 22:11:48 +11:00
mjarkk
2edd2b74ff
Removed a lot of useless code
2018-12-02 14:58:18 +01:00
BlakeMScurr
181f91d2ef
Add full stops to new comments.
2018-11-30 13:47:14 +13:00
BlakeMScurr
643cdd3461
Add simple comments to uncommented functions.
2018-11-30 11:04:08 +13:00
BlakeMScurr
5c70d2724b
Fix function comments with CodeLingo.
2018-11-28 15:31:22 +13:00
mjarkk
9da1382e09
Added credentials popup
2018-11-25 13:15:36 +01:00
Mark Kopenga
b0eaf507a5
Merge branch 'master' into https-ask-for-username-password
2018-11-14 13:40:17 +01:00
mjarkk
448d9caf1b
Fixed typo
2018-11-14 11:40:32 +01:00
Jesse Duffield
0eb1e4a86b
change how we build our list of branches to support detached heads
2018-11-14 21:19:12 +11:00
mjarkk
0c4c00c1bf
Removed useless channel read
2018-11-14 11:14:31 +01:00
Jesse Duffield
a5f483fae9
refactor obtaining current branch name
2018-11-14 19:08:42 +11:00
mjarkk
18a1070c2c
Trying to fix circleci
2018-11-10 18:24:37 +01:00
mjarkk
9fafd7ebc1
Fixed case that a commit message will break git push
2018-11-10 18:10:53 +01:00
mjarkk
80c6e0a8c4
Fixed pushing forever
2018-11-10 17:02:39 +01:00
mjarkk
834e42897d
Switched back to github.com/mgutz/str instaid of a copy of ToArgv
2018-11-10 08:57:02 +01:00
mjarkk
500267417b
Removed some duplicated code
2018-11-10 08:46:42 +01:00
mjarkk
18bcc0df4d
Fixed no error text on windows
...
when executing a command live on windows it detects errors but did just show a empty string
2018-11-10 08:43:02 +01:00
mjarkk
5ae0e75e5e
Switched to channels instaid of a mutex
2018-11-10 08:39:09 +01:00
mjarkk
1fd8cadd9e
Replaced regex with trim
2018-11-10 08:14:35 +01:00
