]> git.99rst.org Git - git.git/commit
git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8f240b8)
merge: fix save_state() to work when there are stat-dirty files
authorElijah Newren <redacted>
Sat, 23 Jul 2022 01:53:15 +0000 (01:53 +0000)
committerJunio C Hamano <redacted>
Sat, 23 Jul 2022 04:45:23 +0000 (21:45 -0700)
commit1369f1475b998b0022f9bdf3a084ef6e590800aa
tree5f3a52677ecca8fa030cf3c09a5c156b2da03717tree
parent8f240b8bbb63591f15c10e43debaf564e63a66bdcommit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/merge.c diff | blob | history
t/t6424-merge-unrelated-index-changes.sh diff | blob | history
git clone https://git.99rst.org/PROJECT