t/t3501-revert-cherry-pick.sh

   1 #!/bin/sh
   2
   3 test_description='miscellaneous basic tests for cherry-pick and revert'
   4
   5 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
   6 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
   7
   8 TEST_PASSES_SANITIZE_LEAK=true
   9 . ./test-lib.sh
  10
  11 test_expect_success setup '
  12
  13         for l in a b c d e f g h i j k l m n o
  14         do
  15                 echo $l$l$l$l$l$l$l$l$l || return 1
  16         done >oops &&
  17
  18         test_tick &&
  19         git add oops &&
  20         git commit -m initial &&
  21         git tag initial &&
  22
  23         test_tick &&
  24         echo "Add extra line at the end" >>oops &&
  25         git commit -a -m added &&
  26         git tag added &&
  27
  28         test_tick &&
  29         git mv oops spoo &&
  30         git commit -m rename1 &&
  31         git tag rename1 &&
  32
  33         test_tick &&
  34         git checkout -b side initial &&
  35         git mv oops opos &&
  36         git commit -m rename2 &&
  37         git tag rename2
  38 '
  39
  40 test_expect_success 'cherry-pick --nonsense' '
  41
  42         pos=$(git rev-parse HEAD) &&
  43         git diff --exit-code HEAD &&
  44         test_must_fail git cherry-pick --nonsense 2>msg &&
  45         git diff --exit-code HEAD "$pos" &&
  46         test_grep "[Uu]sage:" msg
  47 '
  48
  49 test_expect_success 'revert --nonsense' '
  50
  51         pos=$(git rev-parse HEAD) &&
  52         git diff --exit-code HEAD &&
  53         test_must_fail git revert --nonsense 2>msg &&
  54         git diff --exit-code HEAD "$pos" &&
  55         test_grep "[Uu]sage:" msg
  56 '
  57
  58 # the following two test cherry-pick and revert with renames
  59 #
  60 # --
  61 #  + rename2: renames oops to opos
  62 # +  rename1: renames oops to spoo
  63 # +  added:   adds extra line to oops
  64 # ++ initial: has lines in oops
  65
  66 test_expect_success 'cherry-pick after renaming branch' '
  67
  68         git checkout rename2 &&
  69         git cherry-pick added &&
  70         test_cmp_rev rename2 HEAD^ &&
  71         grep "Add extra line at the end" opos &&
  72         git reflog -1 | grep cherry-pick
  73
  74 '
  75
  76 test_expect_success 'revert after renaming branch' '
  77
  78         git checkout rename1 &&
  79         git revert added &&
  80         test_cmp_rev rename1 HEAD^ &&
  81         test_path_is_file spoo &&
  82         test_cmp_rev initial:oops HEAD:spoo &&
  83         git reflog -1 | grep revert
  84
  85 '
  86
  87 test_expect_success 'cherry-pick on stat-dirty working tree' '
  88         git clone . copy &&
  89         (
  90                 cd copy &&
  91                 git checkout initial &&
  92                 test-tool chmtime +40 oops &&
  93                 git cherry-pick added
  94         )
  95 '
  96
  97 test_expect_success 'revert forbidden on dirty working tree' '
  98
  99         echo content >extra_file &&
 100         git add extra_file &&
 101         test_must_fail git revert HEAD 2>errors &&
 102         test_grep "your local changes would be overwritten by " errors
 103
 104 '
 105
 106 test_expect_success 'cherry-pick on unborn branch' '
 107         git checkout --orphan unborn &&
 108         git rm --cached -r . &&
 109         rm -rf * &&
 110         git cherry-pick initial &&
 111         git diff --quiet initial &&
 112         test_cmp_rev ! initial HEAD
 113 '
 114
 115 test_expect_success 'cherry-pick "-" to pick from previous branch' '
 116         git checkout unborn &&
 117         test_commit to-pick actual content &&
 118         git checkout main &&
 119         git cherry-pick - &&
 120         echo content >expect &&
 121         test_cmp expect actual
 122 '
 123
 124 test_expect_success 'cherry-pick "-" is meaningless without checkout' '
 125         test_create_repo afresh &&
 126         (
 127                 cd afresh &&
 128                 test_commit one &&
 129                 test_commit two &&
 130                 test_commit three &&
 131                 test_must_fail git cherry-pick -
 132         )
 133 '
 134
 135 test_expect_success 'cherry-pick "-" works with arguments' '
 136         git checkout -b side-branch &&
 137         test_commit change actual change &&
 138         git checkout main &&
 139         git cherry-pick -s - &&
 140         echo "Signed-off-by: C O Mitter <committer@example.com>" >expect &&
 141         git cat-file commit HEAD | grep ^Signed-off-by: >signoff &&
 142         test_cmp expect signoff &&
 143         echo change >expect &&
 144         test_cmp expect actual
 145 '
 146
 147 test_expect_success 'cherry-pick works with dirty renamed file' '
 148         test_commit to-rename &&
 149         git checkout -b unrelated &&
 150         test_commit unrelated &&
 151         git checkout @{-1} &&
 152         git mv to-rename.t renamed &&
 153         test_tick &&
 154         git commit -m renamed &&
 155         echo modified >renamed &&
 156         git cherry-pick refs/heads/unrelated &&
 157         test $(git rev-parse :0:renamed) = $(git rev-parse HEAD~2:to-rename.t) &&
 158         grep -q "^modified$" renamed
 159 '
 160
 161 test_expect_success 'advice from failed revert' '
 162         test_when_finished "git reset --hard" &&
 163         test_commit --no-tag "add dream" dream dream &&
 164         dream_oid=$(git rev-parse --short HEAD) &&
 165         cat <<-EOF >expected &&
 166         error: could not revert $dream_oid... add dream
 167         hint: After resolving the conflicts, mark them with
 168         hint: "git add/rm <pathspec>", then run
 169         hint: "git revert --continue".
 170         hint: You can instead skip this commit with "git revert --skip".
 171         hint: To abort and get back to the state before "git revert",
 172         hint: run "git revert --abort".
 173         hint: Disable this message with "git config advice.mergeConflict false"
 174         EOF
 175         test_commit --append --no-tag "double-add dream" dream dream &&
 176         test_must_fail git revert HEAD^ 2>actual &&
 177         test_cmp expected actual
 178 '
 179
 180 test_expect_subject () {
 181         echo "$1" >expect &&
 182         git log -1 --pretty=%s >actual &&
 183         test_cmp expect actual
 184 }
 185
 186 test_expect_success 'titles of fresh reverts' '
 187         test_commit --no-tag A file1 &&
 188         test_commit --no-tag B file1 &&
 189         git revert --no-edit HEAD &&
 190         test_expect_subject "Revert \"B\"" &&
 191         git revert --no-edit HEAD &&
 192         test_expect_subject "Reapply \"B\"" &&
 193         git revert --no-edit HEAD &&
 194         test_expect_subject "Revert \"Reapply \"B\"\""
 195 '
 196
 197 test_expect_success 'title of legacy double revert' '
 198         test_commit --no-tag "Revert \"Revert \"B\"\"" file1 &&
 199         git revert --no-edit HEAD &&
 200         test_expect_subject "Revert \"Revert \"Revert \"B\"\"\""
 201 '
 202
 203 test_expect_success 'identification of reverted commit (default)' '
 204         test_commit to-ident &&
 205         test_when_finished "git reset --hard to-ident" &&
 206         git checkout --detach to-ident &&
 207         git revert --no-edit HEAD &&
 208         git cat-file commit HEAD >actual.raw &&
 209         grep "^This reverts " actual.raw >actual &&
 210         echo "This reverts commit $(git rev-parse HEAD^)." >expect &&
 211         test_cmp expect actual
 212 '
 213
 214 test_expect_success 'identification of reverted commit (--reference)' '
 215         git checkout --detach to-ident &&
 216         git revert --reference --no-edit HEAD &&
 217         git cat-file commit HEAD >actual.raw &&
 218         grep "^This reverts " actual.raw >actual &&
 219         echo "This reverts commit $(git show -s --pretty=reference HEAD^)." >expect &&
 220         test_cmp expect actual
 221 '
 222
 223 test_expect_success 'identification of reverted commit (revert.reference)' '
 224         git checkout --detach to-ident &&
 225         git -c revert.reference=true revert --no-edit HEAD &&
 226         git cat-file commit HEAD >actual.raw &&
 227         grep "^This reverts " actual.raw >actual &&
 228         echo "This reverts commit $(git show -s --pretty=reference HEAD^)." >expect &&
 229         test_cmp expect actual
 230 '
 231
 232 test_expect_success 'cherry-pick is unaware of --reference (for now)' '
 233         test_when_finished "git reset --hard" &&
 234         test_must_fail git cherry-pick --reference HEAD 2>actual &&
 235         grep "^usage: git cherry-pick" actual
 236 '
 237
 238 test_done