diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-21 17:20:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-21 17:20:11 -0800 |
| commit | a66cee2edeb503cb7a589ff9d9efa75dc8f0fedc (patch) | |
| tree | 11a25853c8469f614c21423e9e1c8fc0b05a7284 /t/t7500-commit.sh | |
| parent | 5673d695fcce217b26d1a5956c1184ff62dc74f1 (diff) | |
| parent | d5a719e4afbfd74cf5ccf94c2a5b27aa5d06e914 (diff) | |
| download | git-a66cee2edeb503cb7a589ff9d9efa75dc8f0fedc.tar.xz | |
Merge branch 'maint'
* maint:
t/t7500-commit.sh: use test_cmp instead of test
t/gitweb-lib.sh: Ensure that errors are shown for --debug --immediate
gitweb/gitweb.perl: don't call S_ISREG() with undef
gitweb/gitweb.perl: remove use of qw(...) as parentheses
Diffstat (limited to 't/t7500-commit.sh')
| -rwxr-xr-x | t/t7500-commit.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh index 162527c211..d551b77ce6 100755 --- a/t/t7500-commit.sh +++ b/t/t7500-commit.sh @@ -10,7 +10,12 @@ Tests for selected commit options.' . ./test-lib.sh commit_msg_is () { - test "`git log --pretty=format:%s%b -1`" = "$1" + expect=commit_msg_is.expect + actual=commit_msg_is.actual + + printf "%s" "$(git log --pretty=format:%s%b -1)" >$expect && + printf "%s" "$1" >$actual && + test_cmp $expect $actual } # A sanity check to see if commit is working at all. |