diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-02 00:24:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-16 21:38:47 (GMT) |
| commit | c8ce3763ffbc1841f2b4fedebd82280ed0c3a7b7 (patch) | |
| tree | e521ef6a568f3e33f4c804e47fd38f3449065d00 /t/t6043-merge-rename-directories.sh | |
| parent | 51b85471af1d2df88749e8a7aa424a879e33a9d7 (diff) | |
| download | git-c8ce3763ffbc1841f2b4fedebd82280ed0c3a7b7.zip git-c8ce3763ffbc1841f2b4fedebd82280ed0c3a7b7.tar.gz git-c8ce3763ffbc1841f2b4fedebd82280ed0c3a7b7.tar.bz2 | |
t6000-t6999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6043-merge-rename-directories.sh')
| -rwxr-xr-x | t/t6043-merge-rename-directories.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh index 2e28f29..4a71f17 100755 --- a/t/t6043-merge-rename-directories.sh +++ b/t/t6043-merge-rename-directories.sh @@ -3583,7 +3583,7 @@ test_expect_success '11d-check: Avoid losing not-uptodate with rename + D/F conf grep -q stuff z/c && test_seq 1 10 >expected && echo stuff >>expected && - test_cmp expected z/c + test_cmp expected z/c && git ls-files -s >out && test_line_count = 4 out && |