diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-01 20:24:00 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-16 14:38:47 -0700 |
| commit | f957f03b60163ffdc346cce44a67b0347a51190b (patch) | |
| tree | 75c88bf6b4a724a1c43b49d891e821e9d7d1f1e9 /t/t4041-diff-submodule-option.sh | |
| parent | b6c32f63f30ac5f469780c1d522af36d9a67d334 (diff) | |
| download | git-f957f03b60163ffdc346cce44a67b0347a51190b.tar.gz | |
t4000-t4999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4041-diff-submodule-option.sh')
| -rwxr-xr-x | t/t4041-diff-submodule-option.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh index 058ee0829d..4e3499ef84 100755 --- a/t/t4041-diff-submodule-option.sh +++ b/t/t4041-diff-submodule-option.sh @@ -498,7 +498,7 @@ test_expect_success 'given commit --submodule=short' ' test_expect_success 'setup .git file for sm2' ' (cd sm2 && REAL="$(pwd)/../.real" && - mv .git "$REAL" + mv .git "$REAL" && echo "gitdir: $REAL" >.git) ' @@ -527,7 +527,7 @@ test_expect_success 'diff --submodule with objects referenced by alternates' ' git commit -m "sub a" ) && (cd sub_alt && - sha1_before=$(git rev-parse --short HEAD) + sha1_before=$(git rev-parse --short HEAD) && echo b >b && git add b && git commit -m b && |