author | David D. Kilzer <ddkilzer@kilzer.net> | |
Wed, 28 Jul 2010 08:20:16 +0000 (01:20 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 28 Jul 2010 20:57:36 +0000 (13:57 -0700) | ||
commit | 25e932504096ad5cba21978a0b9a13e2708bae87 | |
tree | e5742063c2b6de345882d8abf0095b1dc83e8acf | tree | snapshot |
parent | 5bc0e247c4f281b44cfb72a5b31f479233a981f5 | commit | diff |
Fix git rebase --continue to work with touched files
When performing a non-interactive rebase, sometimes
"git rebase --continue" will fail if an unmodified file is
touched in the working directory:
You must edit all merge conflicts and then
mark them as resolved using git add
This is caused by "git diff-files" reporting a difference
between the index and the filesystem:
:100644 100644 d00491...... 000000...... M file
The fix is to run "git update-index --refresh" before
"git diff-files" as is done in git-rebase--interactive.
Signed-off-by: David D. Kilzer <ddkilzer@kilzer.net>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When performing a non-interactive rebase, sometimes
"git rebase --continue" will fail if an unmodified file is
touched in the working directory:
You must edit all merge conflicts and then
mark them as resolved using git add
This is caused by "git diff-files" reporting a difference
between the index and the filesystem:
:100644 100644 d00491...... 000000...... M file
The fix is to run "git update-index --refresh" before
"git diff-files" as is done in git-rebase--interactive.
Signed-off-by: David D. Kilzer <ddkilzer@kilzer.net>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase.sh | diff | blob | history | |
t/t3418-rebase-continue.sh | [new file with mode: 0755] | blob |