mirror of
https://github.com/git/git.git
synced 2024-11-05 08:47:56 +01:00
a48fcd8369
Breaks in a test assertion's && chain can potentially hide failures from earlier commands in the chain. Commands intended to fail should be marked with !, test_must_fail, or test_might_fail. The examples in this patch do not require that. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
124 lines
2.8 KiB
Bash
Executable file
124 lines
2.8 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='subtree merge strategy'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
s="1 2 3 4 5 6 7 8" &&
|
|
for i in $s; do echo $i; done >hello &&
|
|
git add hello &&
|
|
git commit -m initial &&
|
|
git checkout -b side &&
|
|
echo >>hello world &&
|
|
git add hello &&
|
|
git commit -m second &&
|
|
git checkout master &&
|
|
for i in mundo $s; do echo $i; done >hello &&
|
|
git add hello &&
|
|
git commit -m master
|
|
|
|
'
|
|
|
|
test_expect_success 'subtree available and works like recursive' '
|
|
|
|
git merge -s subtree side &&
|
|
for i in mundo $s world; do echo $i; done >expect &&
|
|
test_cmp expect hello
|
|
|
|
'
|
|
|
|
test_expect_success 'setup' '
|
|
mkdir git-gui &&
|
|
cd git-gui &&
|
|
git init &&
|
|
echo git-gui > git-gui.sh &&
|
|
o1=$(git hash-object git-gui.sh) &&
|
|
git add git-gui.sh &&
|
|
git commit -m "initial git-gui" &&
|
|
cd .. &&
|
|
mkdir git &&
|
|
cd git &&
|
|
git init &&
|
|
echo git >git.c &&
|
|
o2=$(git hash-object git.c) &&
|
|
git add git.c &&
|
|
git commit -m "initial git"
|
|
'
|
|
|
|
test_expect_success 'initial merge' '
|
|
git remote add -f gui ../git-gui &&
|
|
git merge -s ours --no-commit gui/master &&
|
|
git read-tree --prefix=git-gui/ -u gui/master &&
|
|
git commit -m "Merge git-gui as our subdirectory" &&
|
|
git checkout -b work &&
|
|
git ls-files -s >actual &&
|
|
(
|
|
echo "100644 $o1 0 git-gui/git-gui.sh"
|
|
echo "100644 $o2 0 git.c"
|
|
) >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'merge update' '
|
|
cd ../git-gui &&
|
|
echo git-gui2 > git-gui.sh &&
|
|
o3=$(git hash-object git-gui.sh) &&
|
|
git add git-gui.sh &&
|
|
git checkout -b master2 &&
|
|
git commit -m "update git-gui" &&
|
|
cd ../git &&
|
|
git pull -s subtree gui master2 &&
|
|
git ls-files -s >actual &&
|
|
(
|
|
echo "100644 $o3 0 git-gui/git-gui.sh"
|
|
echo "100644 $o2 0 git.c"
|
|
) >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'initial ambiguous subtree' '
|
|
cd ../git &&
|
|
git reset --hard master &&
|
|
git checkout -b master2 &&
|
|
git merge -s ours --no-commit gui/master &&
|
|
git read-tree --prefix=git-gui2/ -u gui/master &&
|
|
git commit -m "Merge git-gui2 as our subdirectory" &&
|
|
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 $o2 0 git.c"
|
|
) >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'merge using explicit' '
|
|
cd ../git &&
|
|
git reset --hard master2 &&
|
|
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 $o2 0 git.c"
|
|
) >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'merge2 using explicit' '
|
|
cd ../git &&
|
|
git reset --hard master2 &&
|
|
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 $o2 0 git.c"
|
|
) >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_done
|