diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-24 15:51:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 15:51:49 -0800 |
| commit | b3ff808b714fd8fc5e4d2770720398e5dc7d27f9 (patch) | |
| tree | 3db88ef171d6fcae53d0edf714fb280134be3baf /t/t4027-diff-submodule.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | t4124 (apply --whitespace): use test_might_fail (diff) | |
| download | git-b3ff808b714fd8fc5e4d2770720398e5dc7d27f9.tar.gz git-b3ff808b714fd8fc5e4d2770720398e5dc7d27f9.zip | |
Merge branch 'en/and-cascade-tests'
* en/and-cascade-tests: (25 commits)
t4124 (apply --whitespace): use test_might_fail
t3404: do not use 'describe' to implement test_cmp_rev
t3404 (rebase -i): introduce helper to check position of HEAD
t3404 (rebase -i): move comment to description
t3404 (rebase -i): unroll test_commit loops
t3301 (notes): use test_expect_code for clarity
t1400 (update-ref): use test_must_fail
t1502 (rev-parse --parseopt): test exit code from "-h"
t6022 (renaming merge): chain test commands with &&
test-lib: introduce test_line_count to measure files
tests: add missing &&, batch 2
tests: add missing &&
Introduce sane_unset and use it to ensure proper && chaining
t7800 (difftool): add missing &&
t7601 (merge-pull-config): add missing &&
t7001 (mv): add missing &&
t6016 (rev-list-graph-simplify-history): add missing &&
t5602 (clone-remote-exec): add missing &&
t4026 (color): remove unneeded and unchained command
t4019 (diff-wserror): add lots of missing &&
...
Conflicts:
t/t7006-pager.sh
Diffstat (limited to 't/t4027-diff-submodule.sh')
| -rwxr-xr-x | t/t4027-diff-submodule.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh index d99814ac64..241a74d2a2 100755 --- a/t/t4027-diff-submodule.sh +++ b/t/t4027-diff-submodule.sh @@ -316,11 +316,11 @@ test_expect_success 'git diff (empty submodule dir)' ' test_expect_success 'conflicted submodule setup' ' # 39 efs - c=fffffffffffffffffffffffffffffffffffffff + c=fffffffffffffffffffffffffffffffffffffff && ( - echo "000000 $_z40 0 sub" - echo "160000 1$c 1 sub" - echo "160000 2$c 2 sub" + echo "000000 $_z40 0 sub" && + echo "160000 1$c 1 sub" && + echo "160000 2$c 2 sub" && echo "160000 3$c 3 sub" ) | git update-index --index-info && echo >expect.nosub '\''diff --cc sub |