|
|
|
@ -27,36 +27,36 @@ HASH6=
@@ -27,36 +27,36 @@ HASH6=
|
|
|
|
|
HASH7= |
|
|
|
|
|
|
|
|
|
test_expect_success 'set up buggy branch' ' |
|
|
|
|
echo "line 1" >> hello && |
|
|
|
|
echo "line 2" >> hello && |
|
|
|
|
echo "line 3" >> hello && |
|
|
|
|
echo "line 4" >> hello && |
|
|
|
|
echo "line 1" >>hello && |
|
|
|
|
echo "line 2" >>hello && |
|
|
|
|
echo "line 3" >>hello && |
|
|
|
|
echo "line 4" >>hello && |
|
|
|
|
add_and_commit_file hello "4 lines" && |
|
|
|
|
HASH1=$(git rev-parse --verify HEAD) && |
|
|
|
|
echo "line BUG" >> hello && |
|
|
|
|
echo "line 6" >> hello && |
|
|
|
|
echo "line 7" >> hello && |
|
|
|
|
echo "line 8" >> hello && |
|
|
|
|
echo "line BUG" >>hello && |
|
|
|
|
echo "line 6" >>hello && |
|
|
|
|
echo "line 7" >>hello && |
|
|
|
|
echo "line 8" >>hello && |
|
|
|
|
add_and_commit_file hello "4 more lines with a BUG" && |
|
|
|
|
HASH2=$(git rev-parse --verify HEAD) && |
|
|
|
|
echo "line 9" >> hello && |
|
|
|
|
echo "line 10" >> hello && |
|
|
|
|
echo "line 9" >>hello && |
|
|
|
|
echo "line 10" >>hello && |
|
|
|
|
add_and_commit_file hello "2 more lines" && |
|
|
|
|
HASH3=$(git rev-parse --verify HEAD) && |
|
|
|
|
echo "line 11" >> hello && |
|
|
|
|
echo "line 11" >>hello && |
|
|
|
|
add_and_commit_file hello "1 more line" && |
|
|
|
|
HASH4=$(git rev-parse --verify HEAD) && |
|
|
|
|
sed -e "s/BUG/5/" hello > hello.new && |
|
|
|
|
sed -e "s/BUG/5/" hello >hello.new && |
|
|
|
|
mv hello.new hello && |
|
|
|
|
add_and_commit_file hello "BUG fixed" && |
|
|
|
|
HASH5=$(git rev-parse --verify HEAD) && |
|
|
|
|
echo "line 12" >> hello && |
|
|
|
|
echo "line 13" >> hello && |
|
|
|
|
echo "line 12" >>hello && |
|
|
|
|
echo "line 13" >>hello && |
|
|
|
|
add_and_commit_file hello "2 more lines" && |
|
|
|
|
HASH6=$(git rev-parse --verify HEAD) && |
|
|
|
|
echo "line 14" >> hello && |
|
|
|
|
echo "line 15" >> hello && |
|
|
|
|
echo "line 16" >> hello && |
|
|
|
|
echo "line 14" >>hello && |
|
|
|
|
echo "line 15" >>hello && |
|
|
|
|
echo "line 16" >>hello && |
|
|
|
|
add_and_commit_file hello "again 3 more lines" && |
|
|
|
|
HASH7=$(git rev-parse --verify HEAD) |
|
|
|
|
' |
|
|
|
@ -95,7 +95,7 @@ test_expect_success 'tag replaced commit' '
@@ -95,7 +95,7 @@ test_expect_success 'tag replaced commit' '
|
|
|
|
|
' |
|
|
|
|
|
|
|
|
|
test_expect_success '"git fsck" works' ' |
|
|
|
|
git fsck master > fsck_master.out && |
|
|
|
|
git fsck master >fsck_master.out && |
|
|
|
|
grep "dangling commit $R" fsck_master.out && |
|
|
|
|
grep "dangling tag $(cat .git/refs/tags/mytag)" fsck_master.out && |
|
|
|
|
test -z "$(git fsck)" |
|
|
|
@ -217,14 +217,14 @@ test_expect_success 'fetch branch with replacement' '
@@ -217,14 +217,14 @@ test_expect_success 'fetch branch with replacement' '
|
|
|
|
|
( |
|
|
|
|
cd clone_dir && |
|
|
|
|
git fetch origin refs/heads/tofetch:refs/heads/parallel3 && |
|
|
|
|
git log --pretty=oneline parallel3 > output.txt && |
|
|
|
|
git log --pretty=oneline parallel3 >output.txt && |
|
|
|
|
! grep $PARA3 output.txt && |
|
|
|
|
git show $PARA3 > para3.txt && |
|
|
|
|
git show $PARA3 >para3.txt && |
|
|
|
|
grep "A U Thor" para3.txt && |
|
|
|
|
git fetch origin "refs/replace/*:refs/replace/*" && |
|
|
|
|
git log --pretty=oneline parallel3 > output.txt && |
|
|
|
|
git log --pretty=oneline parallel3 >output.txt && |
|
|
|
|
grep $PARA3 output.txt && |
|
|
|
|
git show $PARA3 > para3.txt && |
|
|
|
|
git show $PARA3 >para3.txt && |
|
|
|
|
grep "O Thor" para3.txt |
|
|
|
|
) |
|
|
|
|
' |
|
|
|
@ -302,7 +302,7 @@ test_expect_success 'test --format medium' '
@@ -302,7 +302,7 @@ test_expect_success 'test --format medium' '
|
|
|
|
|
echo "$PARA3 -> $S" && |
|
|
|
|
echo "$MYTAG -> $HASH1" |
|
|
|
|
} | sort >expected && |
|
|
|
|
git replace -l --format medium | sort > actual && |
|
|
|
|
git replace -l --format medium | sort >actual && |
|
|
|
|
test_cmp expected actual |
|
|
|
|
' |
|
|
|
|
|
|
|
|
@ -314,7 +314,7 @@ test_expect_success 'test --format long' '
@@ -314,7 +314,7 @@ test_expect_success 'test --format long' '
|
|
|
|
|
echo "$PARA3 (commit) -> $S (commit)" && |
|
|
|
|
echo "$MYTAG (tag) -> $HASH1 (commit)" |
|
|
|
|
} | sort >expected && |
|
|
|
|
git replace --format=long | sort > actual && |
|
|
|
|
git replace --format=long | sort >actual && |
|
|
|
|
test_cmp expected actual |
|
|
|
|
' |
|
|
|
|
|
|
|
|
|