diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-02 10:30:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-02 10:30:12 -0800 |
| commit | 0748494e866041034605aaf177f29a61bdc25951 (patch) | |
| tree | e48f6c091a7231ae0db5d643215df16c5bd7a8d9 /t | |
| parent | c86485dd15d54fc6ff2cd0dda3b2a9faa4f2d66e (diff) | |
| parent | 28044baba6d268d91057398ffa041ee1b931a5e0 (diff) | |
| download | git-0748494e866041034605aaf177f29a61bdc25951.tar.gz git-0748494e866041034605aaf177f29a61bdc25951.tar.xz | |
Merge branch 'maint'
* maint:
Prepare for 1.6.5.4
merge: do not add standard message when message is given with -m option
Do not misidentify "git merge foo HEAD" as an old-style invocation
Conflicts:
RelNotes
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7604-merge-custom-message.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh index de977c5e2..269cfdf26 100755 --- a/t/t7604-merge-custom-message.sh +++ b/t/t7604-merge-custom-message.sh @@ -22,15 +22,12 @@ test_expect_success 'setup' ' git tag c2 ' -cat >expected <<\EOF -custom message -Merge commit 'c2' -EOF test_expect_success 'merge c2 with a custom message' ' git reset --hard c1 && + echo >expected "custom message" && git merge -m "custom message" c2 && - git cat-file commit HEAD | sed -e "1,/^$/d" > actual && + git cat-file commit HEAD | sed -e "1,/^$/d" >actual && test_cmp expected actual ' |