diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-01 20:24:01 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-16 14:38:47 -0700 |
| commit | 51b85471af1d2df88749e8a7aa424a879e33a9d7 (patch) | |
| tree | aaaffc3d661ac6e36e713d09bc057551ae32b3c7 /t/t5500-fetch-pack.sh | |
| parent | f957f03b60163ffdc346cce44a67b0347a51190b (diff) | |
| download | git-51b85471af1d2df88749e8a7aa424a879e33a9d7.tar.gz | |
t5000-t5999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5500-fetch-pack.sh')
| -rwxr-xr-x | t/t5500-fetch-pack.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index ea6570e819..ebbbbfe054 100755 --- a/t/t5500-fetch-pack.sh +++ b/t/t5500-fetch-pack.sh @@ -259,7 +259,7 @@ test_expect_success 'clone shallow object count' ' test_expect_success 'pull in shallow repo with missing merge base' ' ( cd shallow && - git fetch --depth 4 .. A + git fetch --depth 4 .. A && test_must_fail git merge --allow-unrelated-histories FETCH_HEAD ) ' |