diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-29 15:01:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-29 15:01:16 -0700 |
| commit | 9affecbc89538b6fd63f772b6f14047bced9345e (patch) | |
| tree | b4047fd9dec7f6dde2c1d41eae23d8ce74375dc4 /t/t7500-commit.sh | |
| parent | 659f09689614d3d745b9aea746672bf43216d294 (diff) | |
| parent | 4c8d4c14c6de59bc14d6118724ffee949e8654a7 (diff) | |
Merge branch 'sb/maint-1.6.2-opt-filename-fix'
* sb/maint-1.6.2-opt-filename-fix:
apply, fmt-merge-msg: use relative filenames
commit: -F overrides -t
Diffstat (limited to 't/t7500-commit.sh')
| -rwxr-xr-x | t/t7500-commit.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh index 5998baf27b..8eec0fa9bc 100755 --- a/t/t7500-commit.sh +++ b/t/t7500-commit.sh @@ -183,4 +183,14 @@ test_expect_success 'commit message from stdin' ' commit_msg_is "Log with foo word" ' +test_expect_success 'commit -F overrides -t' ' + ( + cd subdir && + echo "-F log" > f.log && + echo "-t template" > t.template && + git commit --allow-empty -F f.log -t t.template + ) && + commit_msg_is "-F log" +' + test_done |