diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-12-17 21:01:25 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-17 20:49:18 -0800 |
| commit | 34454e858d2a648b0a6ce56acd9def84bd2a8712 (patch) | |
| tree | 724903c66c5c2d6935207393da2623502e5191c4 /git-rebase--interactive.sh | |
| parent | 77680caadb939cf47fd08447b81faadc7c3bd436 (diff) | |
| download | git-34454e858d2a648b0a6ce56acd9def84bd2a8712.tar.gz git-34454e858d2a648b0a6ce56acd9def84bd2a8712.tar.xz | |
rebase -p -i: handle "no changes" gracefully
Since commit 376ccb8cbb453343998e734d8a1ce79f57a4e092 (rebase -i: style
fixes and minor cleanups), unchanged SHA-1s are no longer mapped via
$REWRITTEN. But the updating phase was not prepared for the old head
not being rewritten.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index f83e00fe8..cd7e43fae 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -322,7 +322,12 @@ do_next () { test -f "$DOTEST"/current-commit && current_commit=$(cat "$DOTEST"/current-commit) && git rev-parse HEAD > "$REWRITTEN"/$current_commit - NEWHEAD=$(cat "$REWRITTEN"/$OLDHEAD) + if test -f "$REWRITTEN"/$OLDHEAD + then + NEWHEAD=$(cat "$REWRITTEN"/$OLDHEAD) + else + NEWHEAD=$OLDHEAD + fi else NEWHEAD=$(git rev-parse HEAD) fi && |