diff options
| author | Elijah Newren <newren@gmail.com> | 2022-07-23 01:53:15 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-22 21:45:23 -0700 |
| commit | 1369f1475b998b0022f9bdf3a084ef6e590800aa (patch) | |
| tree | 5f3a52677ecca8fa030cf3c09a5c156b2da03717 /contrib/persistent-https/client.go | |
| parent | merge: do not abort early if one strategy fails to handle the merge (diff) | |
| download | git-1369f1475b998b0022f9bdf3a084ef6e590800aa.tar.gz git-1369f1475b998b0022f9bdf3a084ef6e590800aa.zip | |
merge: fix save_state() to work when there are stat-dirty files
When there are stat-dirty files, but no files are modified,
`git stash create` exits with unsuccessful status. This causes merge
to fail. Copy some code from sequencer.c's create_autostash to refresh
the index first to avoid this problem.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/persistent-https/client.go')
0 files changed, 0 insertions, 0 deletions