diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-12-08 13:29:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-09 11:13:36 -0800 |
| commit | f131dd492f098f9f565df93df13e35c734284590 (patch) | |
| tree | c120eff1e594acc4a6e5487b23e48a83c1f8060b | |
| parent | cda2d3c112a03079af9019c7d6617e65ab88ae7e (diff) | |
| download | git-f131dd492f098f9f565df93df13e35c734284590.tar.gz git-f131dd492f098f9f565df93df13e35c734284590.tar.xz | |
rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am
Data in rr-cache isn't valid after a patch application is
skipped or and aborted, so our next commit could be misrecorded
as a resolution of that skipped/failed commit, which is wrong.
git-am --skip, git-rebase --skip/--abort will automatically
invoke git-rerere clear to avoid this.
Also, since git-am --resolved indicates a resolution was
succesful, remember to run git-rerere to record the resolution
(and not surprise the user when the next commit is made).
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-am.sh | 8 | ||||
| -rwxr-xr-x | git-rebase.sh | 8 |
2 files changed, 16 insertions, 0 deletions
@@ -246,6 +246,10 @@ last=`cat "$dotest/last"` this=`cat "$dotest/next"` if test "$skip" = t then + if test -d "$GIT_DIR/rr-cache" + then + git-rerere clear + fi this=`expr "$this" + 1` resume= fi @@ -408,6 +412,10 @@ do stop_here_user_resolve $this fi apply_status=0 + if test -d "$GIT_DIR/rr-cache" + then + git rerere + fi ;; esac diff --git a/git-rebase.sh b/git-rebase.sh index 25530dfdc..2b4f3477f 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -139,6 +139,10 @@ do --skip) if test -d "$dotest" then + if test -d "$GIT_DIR/rr-cache" + then + git-rerere clear + fi prev_head="`cat $dotest/prev_head`" end="`cat $dotest/end`" msgnum="`cat $dotest/msgnum`" @@ -157,6 +161,10 @@ do exit ;; --abort) + if test -d "$GIT_DIR/rr-cache" + then + git-rerere clear + fi if test -d "$dotest" then rm -r "$dotest" |