diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-13 23:24:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-13 23:24:02 -0800 |
| commit | 42e283a1bfd0651fd2e6264157ecbe8841511788 (patch) | |
| tree | d5b1e1235c93e4cad18dd37894e8cb7bd2be4adf /t/t7600-merge.sh | |
| parent | 58d4203aa617293d1dc3746a1ea33d84eb766e0f (diff) | |
| parent | 3adab6f3a7793253b22a4a7aae34221d19e0236a (diff) | |
| download | git-42e283a1bfd0651fd2e6264157ecbe8841511788.tar.gz | |
Merge branch 'jn/merge-no-edit-fix' into maint
* jn/merge-no-edit-fix:
merge: do not launch an editor on "--no-edit $tag"
Diffstat (limited to 't/t7600-merge.sh')
| -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 |