t6000-t6999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
Eric Sunshine
Junio C Hamano
parent
51b85471af
commit
c8ce3763ff
|
|
@ -245,7 +245,7 @@ test_expect_success 'using reflog to find the fork point' '
|
|||
git commit --allow-empty -m "Derived #$count" &&
|
||||
git rev-parse HEAD >derived$count &&
|
||||
git checkout -B base $E || exit 1
|
||||
done
|
||||
done &&
|
||||
|
||||
for count in 1 2 3
|
||||
do
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ test_expect_success 'initial merge' '
|
|||
git checkout -b work &&
|
||||
git ls-files -s >actual &&
|
||||
(
|
||||
echo "100644 $o1 0 git-gui/git-gui.sh"
|
||||
echo "100644 $o1 0 git-gui/git-gui.sh" &&
|
||||
echo "100644 $o2 0 git.c"
|
||||
) >expected &&
|
||||
test_cmp expected actual
|
||||
|
|
@ -72,7 +72,7 @@ test_expect_success 'merge update' '
|
|||
git pull -s subtree gui master2 &&
|
||||
git ls-files -s >actual &&
|
||||
(
|
||||
echo "100644 $o3 0 git-gui/git-gui.sh"
|
||||
echo "100644 $o3 0 git-gui/git-gui.sh" &&
|
||||
echo "100644 $o2 0 git.c"
|
||||
) >expected &&
|
||||
test_cmp expected actual
|
||||
|
|
@ -88,8 +88,8 @@ test_expect_success 'initial ambiguous subtree' '
|
|||
git checkout -b work2 &&
|
||||
git ls-files -s >actual &&
|
||||
(
|
||||
echo "100644 $o1 0 git-gui/git-gui.sh"
|
||||
echo "100644 $o1 0 git-gui2/git-gui.sh"
|
||||
echo "100644 $o1 0 git-gui/git-gui.sh" &&
|
||||
echo "100644 $o1 0 git-gui2/git-gui.sh" &&
|
||||
echo "100644 $o2 0 git.c"
|
||||
) >expected &&
|
||||
test_cmp expected actual
|
||||
|
|
@ -101,8 +101,8 @@ test_expect_success 'merge using explicit' '
|
|||
git pull -Xsubtree=git-gui gui master2 &&
|
||||
git ls-files -s >actual &&
|
||||
(
|
||||
echo "100644 $o3 0 git-gui/git-gui.sh"
|
||||
echo "100644 $o1 0 git-gui2/git-gui.sh"
|
||||
echo "100644 $o3 0 git-gui/git-gui.sh" &&
|
||||
echo "100644 $o1 0 git-gui2/git-gui.sh" &&
|
||||
echo "100644 $o2 0 git.c"
|
||||
) >expected &&
|
||||
test_cmp expected actual
|
||||
|
|
@ -114,8 +114,8 @@ test_expect_success 'merge2 using explicit' '
|
|||
git pull -Xsubtree=git-gui2 gui master2 &&
|
||||
git ls-files -s >actual &&
|
||||
(
|
||||
echo "100644 $o1 0 git-gui/git-gui.sh"
|
||||
echo "100644 $o3 0 git-gui2/git-gui.sh"
|
||||
echo "100644 $o1 0 git-gui/git-gui.sh" &&
|
||||
echo "100644 $o3 0 git-gui2/git-gui.sh" &&
|
||||
echo "100644 $o2 0 git.c"
|
||||
) >expected &&
|
||||
test_cmp expected actual
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ test_expect_success 'merge simple rename+criss-cross with no modifications' '
|
|||
git rev-parse >actual \
|
||||
:2:three :3:three &&
|
||||
git hash-object >>actual \
|
||||
three~HEAD three~R2^0
|
||||
three~HEAD three~R2^0 &&
|
||||
test_cmp expect actual
|
||||
)
|
||||
'
|
||||
|
|
@ -148,7 +148,7 @@ test_expect_success 'merge criss-cross + rename merges with basic modification'
|
|||
git rev-parse >actual \
|
||||
:2:three :3:three &&
|
||||
git hash-object >>actual \
|
||||
three~HEAD three~R2^0
|
||||
three~HEAD three~R2^0 &&
|
||||
test_cmp expect actual
|
||||
)
|
||||
'
|
||||
|
|
@ -228,7 +228,7 @@ test_expect_success 'git detects differently handled merges conflict' '
|
|||
D:new_a E:new_a &&
|
||||
git rev-parse >actual \
|
||||
:2:new_a :3:new_a &&
|
||||
test_cmp expect actual
|
||||
test_cmp expect actual &&
|
||||
|
||||
git cat-file -p B:new_a >ours &&
|
||||
git cat-file -p C:new_a >theirs &&
|
||||
|
|
|
|||
|
|
@ -352,7 +352,7 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
|
|||
base:file left-conflict:newfile right:file &&
|
||||
git rev-parse >actual \
|
||||
:1:newfile :2:newfile :3:newfile &&
|
||||
test_cmp expect actual
|
||||
test_cmp expect actual &&
|
||||
|
||||
test_path_is_file newfile/realfile &&
|
||||
test_path_is_file newfile~HEAD
|
||||
|
|
@ -580,7 +580,7 @@ test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge'
|
|||
C:a A:a B:b C:C &&
|
||||
git rev-parse >actual \
|
||||
:3:a :1:a :2:b :3:c &&
|
||||
test_cmp expect actual
|
||||
test_cmp expect actual &&
|
||||
|
||||
test_path_is_file a &&
|
||||
test_path_is_file b &&
|
||||
|
|
@ -680,13 +680,13 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting
|
|||
A:a C:b B:b C:c B:c &&
|
||||
git rev-parse >actual \
|
||||
:1:a :2:b :3:b :2:c :3:c &&
|
||||
test_cmp expect actual
|
||||
test_cmp expect actual &&
|
||||
|
||||
git rev-parse >expect \
|
||||
C:c B:c C:b B:b &&
|
||||
git hash-object >actual \
|
||||
c~HEAD c~B\^0 b~HEAD b~B\^0 &&
|
||||
test_cmp expect actual
|
||||
test_cmp expect actual &&
|
||||
|
||||
test_path_is_missing b &&
|
||||
test_path_is_missing c
|
||||
|
|
|
|||
|
|
@ -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 &&
|
||||
|
|
|
|||
Loading…
Reference in New Issue