diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:41:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:41:51 -0800 |
| commit | 5cdc9fbb0894023da8e4dab552dfdda8b662feab (patch) | |
| tree | 9c4c577d565a76e2af67903d4cf0e98a3d416c14 /t | |
| parent | Update draft release notes to 1.7.10 (diff) | |
| parent | merge: do not launch an editor on "--no-edit $tag" (diff) | |
| download | tgif-5cdc9fbb0894023da8e4dab552dfdda8b662feab.tar.xz | |
Merge branch 'jn/merge-no-edit-fix'
* jn/merge-no-edit-fix:
merge: do not launch an editor on "--no-edit $tag"
Conflicts:
builtin/merge.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7600-merge.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index a598dfa477..9e27bbf902 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -683,4 +683,16 @@ test_expect_success GPG 'merge --ff-only tag' ' test_cmp actual expect ' +test_expect_success GPG 'merge --no-edit tag should skip editor' ' + git reset --hard c0 && + git commit --allow-empty -m "A newer commit" && + git tag -f -s -m "A newer commit" signed && + git reset --hard c0 && + + EDITOR=false git merge --no-edit signed && + git rev-parse signed^0 >expect && + git rev-parse HEAD^2 >actual && + test_cmp actual expect +' + test_done |