Theodore Tso <tytso@xxxxxxx> writes: > While you have "git am" open, how about adding an "git am --abort" > which nukes the .dotest aka .git/rebase directory, and resets HEAD > back to the original position? This does not seem to have reached the list nor its archives. I cannot say I have really looked at it deeply but it may be a good starting point. It needs docs ;-) -- >8 -- From: Nanako Shiraishi <nanako3@xxxxxxxxxxx> Date: Wed, 16 Jul 2008 19:39:10 +0900 Subject: [PATCH] git am --abort After failing to apply patches in the middle of a series, "git am --abort" lets you go back to the original commit. Signed-off-by: Nanako Shiraishi <nanako3@xxxxxxxxxxx> --- git-am.sh | 19 +++++++++++++++---- t/t4151-am-abort.sh | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 4 deletions(-) create mode 100755 t/t4151-am-abort.sh diff --git a/git-am.sh b/git-am.sh index cc8787b..a44bd7a 100755 --- a/git-am.sh +++ b/git-am.sh @@ -22,6 +22,7 @@ p= pass it through git-apply resolvemsg= override error message when patch failure occurs r,resolved to be used after a patch failure skip skip the current patch +abort abandon patch application and clear .dotest directory rebasing (internal use for git-rebase)" . git-sh-setup @@ -120,7 +121,7 @@ It does not apply to blobs recorded in its index." prec=4 dotest="$GIT_DIR/rebase" -sign= utf8=t keep= skip= interactive= resolved= binary= rebasing= +sign= utf8=t keep= skip= interactive= resolved= binary= rebasing= abort= resolvemsg= resume= git_apply_opt= @@ -145,6 +146,8 @@ do resolved=t ;; --skip) skip=t ;; + --abort) + abort=t ;; --rebasing) rebasing=t threeway=t keep=t binary=t ;; -d|--dotest) @@ -177,7 +180,7 @@ fi if test -d "$dotest" then - case "$#,$skip$resolved" in + case "$#,$skip$resolved$abort" in 0,*t*) # Explicit resume command and we do not have file, so # we are happy. @@ -197,9 +200,17 @@ then esac || die "previous rebase directory $dotest still exists but mbox given." resume=yes + + case "$abort" in + t) + rm -fr "$dotest" && + git read-tree -m -u ORIG_HEAD && + git reset ORIG_HEAD && : + exit ;; + esac else - # Make sure we are not given --skip nor --resolved - test ",$skip,$resolved," = ,,, || + # Make sure we are not given --skip, --resolved, nor --abort + test "$skip$resolved$abort" = "" || die "Resolve operation not in progress, we are not resuming." # Start afresh. diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh new file mode 100755 index 0000000..96b2cd5 --- /dev/null +++ b/t/t4151-am-abort.sh @@ -0,0 +1,48 @@ +#!/bin/sh + +test_description='am --abort' + +. ./test-lib.sh + +test_expect_success setup ' + for i in a b c d e f g + do + echo $i + done >file-1 && + cp file-1 file-2 && + test_tick && + git add file-1 file-2 && + git commit -m initial && + git tag initial && + for i in 2 3 4 5 + do + echo $i >>file-1 && + test_tick && + git commit -a -m $i || break + done && + git format-patch initial && + git checkout -b side initial && + echo local change >file-2 && + cp file-2 file-2-expect +' + +test_expect_success 'am stops at a patch that does not apply' ' + test_must_fail git am 000[124]-*.patch && + git log --pretty=tformat:%s >actual && + for i in 3 2 initial + do + echo $i + done >expect && + test_cmp expect actual +' + +test_expect_success 'am --abort goes back' ' + git am --abort && + git rev-parse HEAD >actual && + git rev-parse initial >expect && + test_cmp expect actual && + test_cmp file-2-expect file-2 && + git diff-index --exit-code --cached HEAD +' + +test_done -- 1.5.6 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
