#!/bin/sh # # Copyright (c) 2008 Christian Couder # test_description='Tests replace refs functionality' exec </dev/null . ./test-lib.sh add_and_commit_file() { _file="$1" _msg="$2" git add $_file || return $? test_tick || return $? git commit --quiet -m "$_file: $_msg" } HASH1= HASH2= HASH3= HASH4= HASH5= 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 && 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 && 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 && add_and_commit_file hello "2 more lines" && HASH3=$(git rev-parse --verify HEAD) && 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 && 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 && 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 && add_and_commit_file hello "again 3 more lines" && HASH7=$(git rev-parse --verify HEAD) ' test_expect_success 'replace the author' ' git cat-file commit $HASH2 | grep "author A U Thor" && R=$(git cat-file commit $HASH2 | sed -e "s/A U/O/" | git hash-object -t commit --stdin -w) && git cat-file commit $R | grep "author O Thor" && git update-ref refs/replace/$HASH2 $R && git show HEAD~5 | grep "O Thor" && git show $HASH2 | grep "O Thor" ' test_expect_success 'test --no-replace-objects option' ' git cat-file commit $HASH2 | grep "author O Thor" && git --no-replace-objects cat-file commit $HASH2 | grep "author A U Thor" && git show $HASH2 | grep "O Thor" && git --no-replace-objects show $HASH2 | grep "A U Thor" ' test_expect_success 'test GIT_NO_REPLACE_OBJECTS env variable' ' GIT_NO_REPLACE_OBJECTS=1 git cat-file commit $HASH2 | grep "author A U Thor" && GIT_NO_REPLACE_OBJECTS=1 git show $HASH2 | grep "A U Thor" ' cat >tag.sig <<EOF object $HASH2 type commit tag mytag tagger T A Gger <> 0 +0000 EOF test_expect_success 'tag replaced commit' ' git mktag <tag.sig >.git/refs/tags/mytag 2>message ' test_expect_success '"git fsck" works' ' 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)" ' test_expect_success 'repack, clone and fetch work' ' git repack -a -d && git clone --no-hardlinks . clone_dir && cd clone_dir && git show HEAD~5 | grep "A U Thor" && git show $HASH2 | grep "A U Thor" && git cat-file commit $R && git repack -a -d && test_must_fail git cat-file commit $R && git fetch ../ "refs/replace/*:refs/replace/*" && git show HEAD~5 | grep "O Thor" && git show $HASH2 | grep "O Thor" && git cat-file commit $R && cd .. ' test_expect_success '"git replace" listing and deleting' ' test "$HASH2" = "$(git replace -l)" && test "$HASH2" = "$(git replace)" && aa=${HASH2%??????????????????????????????????????} && test "$HASH2" = "$(git replace -l "$aa*")" && test_must_fail git replace -d $R && test_must_fail git replace -d && test_must_fail git replace -l -d $HASH2 && git replace -d $HASH2 && git show $HASH2 | grep "A U Thor" && test -z "$(git replace -l)" ' test_expect_success '"git replace" replacing' ' git replace $HASH2 $R && git show $HASH2 | grep "O Thor" && test_must_fail git replace $HASH2 $R && git replace -f $HASH2 $R && test_must_fail git replace -f && test "$HASH2" = "$(git replace)" ' # This creates a side branch where the bug in H2 # does not appear because P2 is created by applying # H2 and squashing H5 into it. # P3, P4 and P6 are created by cherry-picking H3, H4 # and H6 respectively. # # At this point, we should have the following: # # P2--P3--P4--P6 # / # H1-H2-H3-H4-H5-H6-H7 # # Then we replace H6 with P6. # test_expect_success 'create parallel branch without the bug' ' git replace -d $HASH2 && git show $HASH2 | grep "A U Thor" && git checkout $HASH1 && git cherry-pick $HASH2 && git show $HASH5 | git apply && git commit --amend -m "hello: 4 more lines WITHOUT the bug" hello && PARA2=$(git rev-parse --verify HEAD) && git cherry-pick $HASH3 && PARA3=$(git rev-parse --verify HEAD) && git cherry-pick $HASH4 && PARA4=$(git rev-parse --verify HEAD) && git cherry-pick $HASH6 && PARA6=$(git rev-parse --verify HEAD) && git replace $HASH6 $PARA6 && git checkout master && cur=$(git rev-parse --verify HEAD) && test "$cur" = "$HASH7" && git log --pretty=oneline | grep $PARA2 && git remote add cloned ./clone_dir ' test_expect_success 'push to cloned repo' ' git push cloned $HASH6^:refs/heads/parallel && cd clone_dir && git checkout parallel && git log --pretty=oneline | grep $PARA2 && cd .. ' test_expect_success 'push branch with replacement' ' git cat-file commit $PARA3 | grep "author A U Thor" && S=$(git cat-file commit $PARA3 | sed -e "s/A U/O/" | git hash-object -t commit --stdin -w) && git cat-file commit $S | grep "author O Thor" && git replace $PARA3 $S && git show $HASH6~2 | grep "O Thor" && git show $PARA3 | grep "O Thor" && git push cloned $HASH6^:refs/heads/parallel2 && cd clone_dir && git checkout parallel2 && git log --pretty=oneline | grep $PARA3 && git show $PARA3 | grep "A U Thor" && cd .. ' test_expect_success 'fetch branch with replacement' ' git branch tofetch $HASH6 && cd clone_dir && git fetch origin refs/heads/tofetch:refs/heads/parallel3 git log --pretty=oneline parallel3 | grep $PARA3 git show $PARA3 | grep "A U Thor" cd .. ' test_expect_success 'bisect and replacements' ' git bisect start $HASH7 $HASH1 && test "$S" = "$(git rev-parse --verify HEAD)" && git bisect reset && GIT_NO_REPLACE_OBJECTS=1 git bisect start $HASH7 $HASH1 && test "$HASH4" = "$(git rev-parse --verify HEAD)" && git bisect reset && git --no-replace-objects bisect start $HASH7 $HASH1 && test "$HASH4" = "$(git rev-parse --verify HEAD)" && git bisect reset ' # # test_done