Skip to content

Commit

Permalink
rerere: record (or avoid misrecording) resolved, skipped or aborted r…
Browse files Browse the repository at this point in the history
…ebase/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>
  • Loading branch information
Eric Wong authored and Junio C Hamano committed Dec 9, 2006
1 parent cda2d3c commit f131dd4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
8 changes: 8 additions & 0 deletions git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
8 changes: 8 additions & 0 deletions git-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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`"
Expand All @@ -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"
Expand Down

0 comments on commit f131dd4

Please sign in to comment.