t / t6050-replace.shon commit add tests for git diff --submodule (86140d5)
   1#!/bin/sh
   2#
   3# Copyright (c) 2008 Christian Couder
   4#
   5test_description='Tests replace refs functionality'
   6
   7exec </dev/null
   8
   9. ./test-lib.sh
  10
  11add_and_commit_file()
  12{
  13    _file="$1"
  14    _msg="$2"
  15
  16    git add $_file || return $?
  17    test_tick || return $?
  18    git commit --quiet -m "$_file: $_msg"
  19}
  20
  21HASH1=
  22HASH2=
  23HASH3=
  24HASH4=
  25HASH5=
  26HASH6=
  27HASH7=
  28
  29test_expect_success 'set up buggy branch' '
  30     echo "line 1" >> hello &&
  31     echo "line 2" >> hello &&
  32     echo "line 3" >> hello &&
  33     echo "line 4" >> hello &&
  34     add_and_commit_file hello "4 lines" &&
  35     HASH1=$(git rev-parse --verify HEAD) &&
  36     echo "line BUG" >> hello &&
  37     echo "line 6" >> hello &&
  38     echo "line 7" >> hello &&
  39     echo "line 8" >> hello &&
  40     add_and_commit_file hello "4 more lines with a BUG" &&
  41     HASH2=$(git rev-parse --verify HEAD) &&
  42     echo "line 9" >> hello &&
  43     echo "line 10" >> hello &&
  44     add_and_commit_file hello "2 more lines" &&
  45     HASH3=$(git rev-parse --verify HEAD) &&
  46     echo "line 11" >> hello &&
  47     add_and_commit_file hello "1 more line" &&
  48     HASH4=$(git rev-parse --verify HEAD) &&
  49     sed -e "s/BUG/5/" hello > hello.new &&
  50     mv hello.new hello &&
  51     add_and_commit_file hello "BUG fixed" &&
  52     HASH5=$(git rev-parse --verify HEAD) &&
  53     echo "line 12" >> hello &&
  54     echo "line 13" >> hello &&
  55     add_and_commit_file hello "2 more lines" &&
  56     HASH6=$(git rev-parse --verify HEAD)
  57     echo "line 14" >> hello &&
  58     echo "line 15" >> hello &&
  59     echo "line 16" >> hello &&
  60     add_and_commit_file hello "again 3 more lines" &&
  61     HASH7=$(git rev-parse --verify HEAD)
  62'
  63
  64test_expect_success 'replace the author' '
  65     git cat-file commit $HASH2 | grep "author A U Thor" &&
  66     R=$(git cat-file commit $HASH2 | sed -e "s/A U/O/" | git hash-object -t commit --stdin -w) &&
  67     git cat-file commit $R | grep "author O Thor" &&
  68     git update-ref refs/replace/$HASH2 $R &&
  69     git show HEAD~5 | grep "O Thor" &&
  70     git show $HASH2 | grep "O Thor"
  71'
  72
  73cat >tag.sig <<EOF
  74object $HASH2
  75type commit
  76tag mytag
  77tagger T A Gger <> 0 +0000
  78
  79EOF
  80
  81test_expect_success 'tag replaced commit' '
  82     git mktag <tag.sig >.git/refs/tags/mytag 2>message
  83'
  84
  85test_expect_success '"git fsck" works' '
  86     git fsck master > fsck_master.out &&
  87     grep "dangling commit $R" fsck_master.out &&
  88     grep "dangling tag $(cat .git/refs/tags/mytag)" fsck_master.out &&
  89     test -z "$(git fsck)"
  90'
  91
  92test_expect_success 'repack, clone and fetch work' '
  93     git repack -a -d &&
  94     git clone --no-hardlinks . clone_dir &&
  95     cd clone_dir &&
  96     git show HEAD~5 | grep "A U Thor" &&
  97     git show $HASH2 | grep "A U Thor" &&
  98     git cat-file commit $R &&
  99     git repack -a -d &&
 100     test_must_fail git cat-file commit $R &&
 101     git fetch ../ "refs/replace/*:refs/replace/*" &&
 102     git show HEAD~5 | grep "O Thor" &&
 103     git show $HASH2 | grep "O Thor" &&
 104     git cat-file commit $R &&
 105     cd ..
 106'
 107
 108test_expect_success '"git replace" listing and deleting' '
 109     test "$HASH2" = "$(git replace -l)" &&
 110     test "$HASH2" = "$(git replace)" &&
 111     aa=${HASH2%??????????????????????????????????????} &&
 112     test "$HASH2" = "$(git replace -l "$aa*")" &&
 113     test_must_fail git replace -d $R &&
 114     test_must_fail git replace -d &&
 115     test_must_fail git replace -l -d $HASH2 &&
 116     git replace -d $HASH2 &&
 117     git show $HASH2 | grep "A U Thor" &&
 118     test -z "$(git replace -l)"
 119'
 120
 121test_expect_success '"git replace" replacing' '
 122     git replace $HASH2 $R &&
 123     git show $HASH2 | grep "O Thor" &&
 124     test_must_fail git replace $HASH2 $R &&
 125     git replace -f $HASH2 $R &&
 126     test_must_fail git replace -f &&
 127     test "$HASH2" = "$(git replace)"
 128'
 129
 130# This creates a side branch where the bug in H2
 131# does not appear because P2 is created by applying
 132# H2 and squashing H5 into it.
 133# P3, P4 and P6 are created by cherry-picking H3, H4
 134# and H6 respectively.
 135#
 136# At this point, we should have the following:
 137#
 138#    P2--P3--P4--P6
 139#   /
 140# H1-H2-H3-H4-H5-H6-H7
 141#
 142# Then we replace H6 with P6.
 143#
 144test_expect_success 'create parallel branch without the bug' '
 145     git replace -d $HASH2 &&
 146     git show $HASH2 | grep "A U Thor" &&
 147     git checkout $HASH1 &&
 148     git cherry-pick $HASH2 &&
 149     git show $HASH5 | git apply &&
 150     git commit --amend -m "hello: 4 more lines WITHOUT the bug" hello &&
 151     PARA2=$(git rev-parse --verify HEAD) &&
 152     git cherry-pick $HASH3 &&
 153     PARA3=$(git rev-parse --verify HEAD) &&
 154     git cherry-pick $HASH4 &&
 155     PARA4=$(git rev-parse --verify HEAD) &&
 156     git cherry-pick $HASH6 &&
 157     PARA6=$(git rev-parse --verify HEAD) &&
 158     git replace $HASH6 $PARA6 &&
 159     git checkout master &&
 160     cur=$(git rev-parse --verify HEAD) &&
 161     test "$cur" = "$HASH7" &&
 162     git log --pretty=oneline | grep $PARA2 &&
 163     git remote add cloned ./clone_dir
 164'
 165
 166test_expect_success 'push to cloned repo' '
 167     git push cloned $HASH6^:refs/heads/parallel &&
 168     cd clone_dir &&
 169     git checkout parallel &&
 170     git log --pretty=oneline | grep $PARA2 &&
 171     cd ..
 172'
 173
 174test_expect_success 'push branch with replacement' '
 175     git cat-file commit $PARA3 | grep "author A U Thor" &&
 176     S=$(git cat-file commit $PARA3 | sed -e "s/A U/O/" | git hash-object -t commit --stdin -w) &&
 177     git cat-file commit $S | grep "author O Thor" &&
 178     git replace $PARA3 $S &&
 179     git show $HASH6~2 | grep "O Thor" &&
 180     git show $PARA3 | grep "O Thor" &&
 181     git push cloned $HASH6^:refs/heads/parallel2 &&
 182     cd clone_dir &&
 183     git checkout parallel2 &&
 184     git log --pretty=oneline | grep $PARA3 &&
 185     git show $PARA3 | grep "A U Thor" &&
 186     cd ..
 187'
 188
 189test_expect_success 'fetch branch with replacement' '
 190     git branch tofetch $HASH6 &&
 191     cd clone_dir &&
 192     git fetch origin refs/heads/tofetch:refs/heads/parallel3
 193     git log --pretty=oneline parallel3 | grep $PARA3
 194     git show $PARA3 | grep "A U Thor"
 195     cd ..
 196'
 197
 198#
 199#
 200test_done