diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2010-07-29 17:10:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-09 09:15:01 -0700 |
| commit | 3c8710aeaa81a70ecad9facfc332d843ee37de35 (patch) | |
| tree | 4b7e473d63d36ae4d3bdd1263961da2db2bc7288 | |
| parent | 49cc460d88f5bae79b45ce2db16674f36b6cf38a (diff) | |
| download | git-3c8710aeaa81a70ecad9facfc332d843ee37de35.tar.gz git-3c8710aeaa81a70ecad9facfc332d843ee37de35.tar.xz | |
t7003: fix subdirectory-filter test
The test would not fail if the filtering failed to do anything, since
in
test -z "$(git diff HEAD directorymoved:newsubdir)"'
'directorymoved:newsubdir' is not valid, so git-diff fails without
printing anything on stdout. But then the exit status of git-diff is
lost, whereas test -z "" succeeds.
Use 'git diff --exit-code' instead, which does the right thing and has
the added bonus of showing the differences if there are any.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t7003-filter-branch.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 0da13a8d6..fd7e3a113 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -147,7 +147,8 @@ test_expect_success 'use index-filter to move into a subdirectory' ' GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \ git update-index --index-info && mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved && - test -z "$(git diff HEAD directorymoved:newsubdir)"' + git diff --exit-code HEAD directorymoved:newsubdir +' test_expect_success 'stops when msg filter fails' ' old=$(git rev-parse HEAD) && |