git.oblomov.eu Git - git/blob - t/t5515-fetch-merge-logic.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2007 Santi Béjar, based on t4013 by Junio C Hamano
   4 #
   5 #
   6
   7 test_description='Merge logic in fetch'
   8
   9 # NEEDSWORK: If the overspecification of the expected result is reduced, we
  10 # might be able to run this test in all protocol versions.
  11 GIT_TEST_PROTOCOL_VERSION=0
  12 export GIT_TEST_PROTOCOL_VERSION
  13
  14 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
  15 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
  16
  17 . ./test-lib.sh
  18
  19 build_script () {
  20         script="$1" &&
  21         for i in one three_file main topic_2 one_tree three two two2 three2
  22         do
  23                 echo "s/$(test_oid --hash=sha1 "$i")/$(test_oid "$i")/g" >>"$script"
  24         done
  25 }
  26
  27 convert_expected () {
  28         file="$1" &&
  29         script="$2" &&
  30         sed -f "$script" "$file" >"$file.tmp" &&
  31         mv "$file.tmp" "$file"
  32 }
  33
  34 test_expect_success setup '
  35         GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
  36         GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
  37         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  38
  39         test_oid_cache <<-EOF &&
  40         one sha1:8e32a6d901327a23ef831511badce7bf3bf46689
  41         one sha256:8739546433ab1ac72ee93088dce611210effee072b2b586ceac6dde43ebec9ce
  42
  43         three_file sha1:0e3b14047d3ee365f4f2a1b673db059c3972589c
  44         three_file sha256:bc4447d50c07497a8bfe6eef817f2364ecca9d471452e43b52756cc1a908bd32
  45
  46         main sha1:ecf3b3627b498bdcb735cc4343bf165f76964e9a
  47         main sha256:fff666109892bb4b1c80cd1649d2d8762a0663db8b5d46c8be98360b64fbba5f
  48
  49         one_tree sha1:22feea448b023a2d864ef94b013735af34d238ba
  50         one_tree sha256:6e4743f4ef2356b881dda5e91f5c7cdffe870faf350bf7b312f80a20935f5d83
  51
  52         three sha1:c61a82b60967180544e3c19f819ddbd0c9f89899
  53         three sha256:0cc6d1eda617ded715170786e31ba4e2d0185404ec5a3508dd0d73b324860c6a
  54
  55         two sha1:525b7fb068d59950d185a8779dc957c77eed73ba
  56         two sha256:3b21de3440cd38c2a9e9b464adb923f7054949ed4c918e1a0ac4c95cd52774db
  57
  58         topic_2 sha1:b4ab76b1a01ea602209932134a44f1e6bd610832
  59         topic_2 sha256:380ebae0113f877ce46fcdf39d5bc33e4dc0928db5c5a4d5fdc78381c4d55ae3
  60
  61         two2 sha1:6134ee8f857693b96ff1cc98d3e2fd62b199e5a8
  62         two2 sha256:87a2d3ee29c83a3dc7afd41c0606b11f67603120b910a7be7840accdc18344d4
  63
  64         three2 sha1:0567da4d5edd2ff4bb292a465ba9e64dcad9536b
  65         three2 sha256:cceb3e8eca364fa9a0a39a1efbebecacc664af86cbbd8070571f5faeb5f0e8c3
  66         EOF
  67
  68         echo >file original &&
  69         git add file &&
  70         git commit -a -m One &&
  71         git tag tag-one &&
  72         git tag tag-one-tree HEAD^{tree} &&
  73         git branch one &&
  74
  75         echo two >> file &&
  76         git commit -a -m Two &&
  77         git tag -a -m "Tag Two" tag-two &&
  78         git branch two &&
  79
  80         echo three >> file &&
  81         git commit -a -m Three &&
  82         git tag -a -m "Tag Three" tag-three &&
  83         git tag -a -m "Tag Three file" tag-three-file HEAD^{tree}:file &&
  84         git branch three &&
  85
  86         echo main >> file &&
  87         git commit -a -m Main &&
  88         git tag -a -m "Tag Main" tag-main &&
  89
  90         git checkout three &&
  91
  92         git clone . cloned &&
  93         cd cloned &&
  94         git config remote.origin.url ../.git/ &&
  95
  96         git config remote.config-explicit.url ../.git/ &&
  97         git config remote.config-explicit.fetch refs/heads/main:remotes/rem/main &&
  98         git config --add remote.config-explicit.fetch refs/heads/one:remotes/rem/one &&
  99         git config --add remote.config-explicit.fetch two:remotes/rem/two &&
 100         git config --add remote.config-explicit.fetch refs/heads/three:remotes/rem/three &&
 101         remotes="config-explicit" &&
 102
 103         git config remote.config-glob.url ../.git/ &&
 104         git config remote.config-glob.fetch refs/heads/*:refs/remotes/rem/* &&
 105         remotes="$remotes config-glob" &&
 106
 107         mkdir -p .git/remotes &&
 108         {
 109                 echo "URL: ../.git/"
 110                 echo "Pull: refs/heads/main:remotes/rem/main"
 111                 echo "Pull: refs/heads/one:remotes/rem/one"
 112                 echo "Pull: two:remotes/rem/two"
 113                 echo "Pull: refs/heads/three:remotes/rem/three"
 114         } >.git/remotes/remote-explicit &&
 115         remotes="$remotes remote-explicit" &&
 116
 117         {
 118                 echo "URL: ../.git/"
 119                 echo "Pull: refs/heads/*:refs/remotes/rem/*"
 120         } >.git/remotes/remote-glob &&
 121         remotes="$remotes remote-glob" &&
 122
 123         mkdir -p .git/branches &&
 124         echo "../.git" > .git/branches/branches-default &&
 125         remotes="$remotes branches-default" &&
 126
 127         echo "../.git#one" > .git/branches/branches-one &&
 128         remotes="$remotes branches-one" &&
 129
 130         for remote in $remotes ; do
 131                 git config branch.br-$remote.remote $remote &&
 132                 git config branch.br-$remote-merge.remote $remote &&
 133                 git config branch.br-$remote-merge.merge refs/heads/three &&
 134                 git config branch.br-$remote-octopus.remote $remote &&
 135                 git config branch.br-$remote-octopus.merge refs/heads/one &&
 136                 git config --add branch.br-$remote-octopus.merge two
 137         done &&
 138         build_script sed_script
 139 '
 140
 141 # Merge logic depends on branch properties and Pull: or .fetch lines
 142 for remote in $remotes ; do
 143     for branch in "" "-merge" "-octopus" ; do
 144 cat <<EOF
 145 br-$remote$branch
 146 br-$remote$branch $remote
 147 EOF
 148     done
 149 done > tests
 150
 151 # Merge logic does not depend on branch properties,
 152 # but does depend on Pull: or fetch lines.
 153 # Use two branches completely unrelated from the arguments,
 154 # the clone default and one without branch properties
 155 for branch in main br-unconfig ; do
 156     echo $branch
 157     for remote in $remotes ; do
 158         echo $branch $remote
 159     done
 160 done >> tests
 161
 162 # Merge logic does not depend on branch properties
 163 # neither in the Pull: or .fetch config
 164 for branch in main br-unconfig ; do
 165     cat <<EOF
 166 $branch ../.git
 167 $branch ../.git one
 168 $branch ../.git one two
 169 $branch --tags ../.git
 170 $branch ../.git tag tag-one tag tag-three
 171 $branch ../.git tag tag-one-tree tag tag-three-file
 172 $branch ../.git one tag tag-one tag tag-three-file
 173 EOF
 174 done >> tests
 175
 176 while read cmd
 177 do
 178         case "$cmd" in
 179         '' | '#'*) continue ;;
 180         esac
 181         test=$(echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g')
 182         pfx=$(printf "%04d" $test_count)
 183         expect_f="$TEST_DIRECTORY/t5515/fetch.$test"
 184         actual_f="$pfx-fetch.$test"
 185         expect_r="$TEST_DIRECTORY/t5515/refs.$test"
 186         actual_r="$pfx-refs.$test"
 187
 188         test_expect_success "$cmd" '
 189                 cp "$expect_f" expect_f &&
 190                 convert_expected expect_f sed_script &&
 191                 cp "$expect_r" expect_r &&
 192                 convert_expected expect_r sed_script &&
 193                 {
 194                         echo "# $cmd"
 195                         set x $cmd; shift
 196                         git symbolic-ref HEAD refs/heads/$1 ; shift
 197                         rm -f .git/FETCH_HEAD
 198                         git for-each-ref \
 199                                 refs/heads refs/remotes/rem refs/tags |
 200                         while read val type refname
 201                         do
 202                                 git update-ref -d "$refname" "$val"
 203                         done
 204                         git fetch "$@" >/dev/null
 205                         cat .git/FETCH_HEAD
 206                 } >"$actual_f" &&
 207                 git show-ref >"$actual_r" &&
 208                 if test -f "expect_f"
 209                 then
 210                         test_cmp "expect_f" "$actual_f" &&
 211                         rm -f "$actual_f"
 212                 else
 213                         # this is to help developing new tests.
 214                         cp "$actual_f" "$expect_f"
 215                         false
 216                 fi &&
 217                 if test -f "expect_r"
 218                 then
 219                         test_cmp "expect_r" "$actual_r" &&
 220                         rm -f "$actual_r"
 221                 else
 222                         # this is to help developing new tests.
 223                         cp "$actual_r" "$expect_r"
 224                         false
 225                 fi
 226         '
 227 done < tests
 228
 229 test_done