diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-02 07:47:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-02 07:47:03 -0700 |
| commit | b91ffd37d5c18046f7b0bf47e939273bead9e52e (patch) | |
| tree | 6b912973a29e5fa81340388f978904764f5a0f37 /t/t6200-fmt-merge-msg.sh | |
| parent | f2823263bd53b62831450277c746c6cbfcb95a15 (diff) | |
| parent | 4c8d4c14c6de59bc14d6118724ffee949e8654a7 (diff) | |
| download | git-b91ffd37d5c18046f7b0bf47e939273bead9e52e.tar.gz git-b91ffd37d5c18046f7b0bf47e939273bead9e52e.tar.xz | |
Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint
* sb/maint-1.6.2-opt-filename-fix:
apply, fmt-merge-msg: use relative filenames
commit: -F overrides -t
Diffstat (limited to 't/t6200-fmt-merge-msg.sh')
| -rwxr-xr-x | t/t6200-fmt-merge-msg.sh | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh index 2049ab6cf..42f6fff37 100755 --- a/t/t6200-fmt-merge-msg.sh +++ b/t/t6200-fmt-merge-msg.sh @@ -208,4 +208,36 @@ test_expect_success 'merge-msg test #5-2' ' test_cmp expected actual ' +test_expect_success 'merge-msg -F' ' + + git config --unset-all merge.log + git config --unset-all merge.summary + git config merge.summary yes && + + git checkout master && + setdate && + git fetch . left right && + + git fmt-merge-msg -F .git/FETCH_HEAD >actual && + test_cmp expected actual +' + +test_expect_success 'merge-msg -F in subdirectory' ' + + git config --unset-all merge.log + git config --unset-all merge.summary + git config merge.summary yes && + + git checkout master && + setdate && + git fetch . left right && + mkdir sub && + cp .git/FETCH_HEAD sub/FETCH_HEAD && + ( + cd sub && + git fmt-merge-msg -F FETCH_HEAD >../actual + ) && + test_cmp expected actual +' + test_done |