t/t5543-atomic-push.sh

   1 #!/bin/sh
   2
   3 test_description='pushing to a repository using the atomic push option'
   4
   5 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
   6 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
   7
   8 . ./test-lib.sh
   9
  10 mk_repo_pair () {
  11         rm -rf workbench upstream &&
  12         test_create_repo upstream &&
  13         test_create_repo workbench &&
  14         (
  15                 cd upstream &&
  16                 git config receive.denyCurrentBranch warn
  17         ) &&
  18         (
  19                 cd workbench &&
  20                 git remote add up ../upstream
  21         )
  22 }
  23
  24 # Compare the ref ($1) in upstream with a ref value from workbench ($2)
  25 # i.e. test_refs second HEAD@{2}
  26 test_refs () {
  27         test $# = 2 &&
  28         git -C upstream rev-parse --verify "$1" >expect &&
  29         git -C workbench rev-parse --verify "$2" >actual &&
  30         test_cmp expect actual
  31 }
  32
  33 fmt_status_report () {
  34         sed -n \
  35                 -e "/^To / { s/   */ /g; p; }" \
  36                 -e "/^ ! / { s/   */ /g; p; }"
  37 }
  38
  39 test_expect_success 'atomic push works for a single branch' '
  40         mk_repo_pair &&
  41         (
  42                 cd workbench &&
  43                 test_commit one &&
  44                 git push --mirror up &&
  45                 test_commit two &&
  46                 git push --atomic up master
  47         ) &&
  48         test_refs master master
  49 '
  50
  51 test_expect_success 'atomic push works for two branches' '
  52         mk_repo_pair &&
  53         (
  54                 cd workbench &&
  55                 test_commit one &&
  56                 git branch second &&
  57                 git push --mirror up &&
  58                 test_commit two &&
  59                 git checkout second &&
  60                 test_commit three &&
  61                 git push --atomic up master second
  62         ) &&
  63         test_refs master master &&
  64         test_refs second second
  65 '
  66
  67 test_expect_success 'atomic push works in combination with --mirror' '
  68         mk_repo_pair &&
  69         (
  70                 cd workbench &&
  71                 test_commit one &&
  72                 git checkout -b second &&
  73                 test_commit two &&
  74                 git push --atomic --mirror up
  75         ) &&
  76         test_refs master master &&
  77         test_refs second second
  78 '
  79
  80 test_expect_success 'atomic push works in combination with --force' '
  81         mk_repo_pair &&
  82         (
  83                 cd workbench &&
  84                 test_commit one &&
  85                 git branch second master &&
  86                 test_commit two_a &&
  87                 git checkout second &&
  88                 test_commit two_b &&
  89                 test_commit three_b &&
  90                 test_commit four &&
  91                 git push --mirror up &&
  92                 # The actual test is below
  93                 git checkout master &&
  94                 test_commit three_a &&
  95                 git checkout second &&
  96                 git reset --hard HEAD^ &&
  97                 git push --force --atomic up master second
  98         ) &&
  99         test_refs master master &&
 100         test_refs second second
 101 '
 102
 103 # set up two branches where master can be pushed but second can not
 104 # (non-fast-forward). Since second can not be pushed the whole operation
 105 # will fail and leave master untouched.
 106 test_expect_success 'atomic push fails if one branch fails' '
 107         mk_repo_pair &&
 108         (
 109                 cd workbench &&
 110                 test_commit one &&
 111                 git checkout -b second master &&
 112                 test_commit two &&
 113                 test_commit three &&
 114                 test_commit four &&
 115                 git push --mirror up &&
 116                 git reset --hard HEAD~2 &&
 117                 test_commit five &&
 118                 git checkout master &&
 119                 test_commit six &&
 120                 test_must_fail git push --atomic --all up
 121         ) &&
 122         test_refs master HEAD@{7} &&
 123         test_refs second HEAD@{4}
 124 '
 125
 126 test_expect_success 'atomic push fails if one tag fails remotely' '
 127         # prepare the repo
 128         mk_repo_pair &&
 129         (
 130                 cd workbench &&
 131                 test_commit one &&
 132                 git checkout -b second master &&
 133                 test_commit two &&
 134                 git push --mirror up
 135         ) &&
 136         # a third party modifies the server side:
 137         (
 138                 cd upstream &&
 139                 git checkout second &&
 140                 git tag test_tag second
 141         ) &&
 142         # see if we can now push both branches.
 143         (
 144                 cd workbench &&
 145                 git checkout master &&
 146                 test_commit three &&
 147                 git checkout second &&
 148                 test_commit four &&
 149                 git tag test_tag &&
 150                 test_must_fail git push --tags --atomic up master second
 151         ) &&
 152         test_refs master HEAD@{3} &&
 153         test_refs second HEAD@{1}
 154 '
 155
 156 test_expect_success 'atomic push obeys update hook preventing a branch to be pushed' '
 157         mk_repo_pair &&
 158         (
 159                 cd workbench &&
 160                 test_commit one &&
 161                 git checkout -b second master &&
 162                 test_commit two &&
 163                 git push --mirror up
 164         ) &&
 165         (
 166                 cd upstream &&
 167                 HOOKDIR="$(git rev-parse --git-dir)/hooks" &&
 168                 HOOK="$HOOKDIR/update" &&
 169                 mkdir -p "$HOOKDIR" &&
 170                 write_script "$HOOK" <<-\EOF
 171                         # only allow update to master from now on
 172                         test "$1" = "refs/heads/master"
 173                 EOF
 174         ) &&
 175         (
 176                 cd workbench &&
 177                 git checkout master &&
 178                 test_commit three &&
 179                 git checkout second &&
 180                 test_commit four &&
 181                 test_must_fail git push --atomic up master second
 182         ) &&
 183         test_refs master HEAD@{3} &&
 184         test_refs second HEAD@{1}
 185 '
 186
 187 test_expect_success 'atomic push is not advertised if configured' '
 188         mk_repo_pair &&
 189         (
 190                 cd upstream &&
 191                 git config receive.advertiseatomic 0
 192         ) &&
 193         (
 194                 cd workbench &&
 195                 test_commit one &&
 196                 git push --mirror up &&
 197                 test_commit two &&
 198                 test_must_fail git push --atomic up master
 199         ) &&
 200         test_refs master HEAD@{1}
 201 '
 202
 203 # References in upstream : master(1) one(1) foo(1)
 204 # References in workbench: master(2)        foo(1) two(2) bar(2)
 205 # Atomic push            : master(2)               two(2) bar(2)
 206 test_expect_success 'atomic push reports (reject by update hook)' '
 207         mk_repo_pair &&
 208         (
 209                 cd workbench &&
 210                 test_commit one &&
 211                 git branch foo &&
 212                 git push up master one foo &&
 213                 git tag -d one
 214         ) &&
 215         (
 216                 mkdir -p upstream/.git/hooks &&
 217                 cat >upstream/.git/hooks/update <<-EOF &&
 218                 #!/bin/sh
 219
 220                 if test "\$1" = "refs/heads/bar"
 221                 then
 222                         echo >&2 "Pusing to branch bar is prohibited"
 223                         exit 1
 224                 fi
 225                 EOF
 226                 chmod a+x upstream/.git/hooks/update
 227         ) &&
 228         (
 229                 cd workbench &&
 230                 test_commit two &&
 231                 git branch bar
 232         ) &&
 233         test_must_fail git -C workbench \
 234                 push --atomic up master two bar >out 2>&1 &&
 235         fmt_status_report <out >actual &&
 236         cat >expect <<-EOF &&
 237         To ../upstream
 238          ! [remote rejected] master -> master (atomic push failure)
 239          ! [remote rejected] two -> two (atomic push failure)
 240          ! [remote rejected] bar -> bar (hook declined)
 241         EOF
 242         test_cmp expect actual
 243 '
 244
 245 # References in upstream : master(1) one(1) foo(1)
 246 # References in workbench: master(2)        foo(1) two(2) bar(2)
 247 test_expect_success 'atomic push reports (mirror, but reject by update hook)' '
 248         (
 249                 cd workbench &&
 250                 git remote remove up &&
 251                 git remote add up ../upstream
 252         ) &&
 253         test_must_fail git -C workbench \
 254                 push --atomic --mirror up >out 2>&1 &&
 255         fmt_status_report <out >actual &&
 256         cat >expect <<-EOF &&
 257         To ../upstream
 258          ! [remote rejected] master -> master (atomic push failure)
 259          ! [remote rejected] one (atomic push failure)
 260          ! [remote rejected] bar -> bar (hook declined)
 261          ! [remote rejected] two -> two (atomic push failure)
 262         EOF
 263         test_cmp expect actual
 264 '
 265
 266 # References in upstream : master(2) one(1) foo(1)
 267 # References in workbench: master(1)        foo(1) two(2) bar(2)
 268 test_expect_success 'atomic push reports (reject by non-ff)' '
 269         rm upstream/.git/hooks/update &&
 270         (
 271                 cd workbench &&
 272                 git push up master &&
 273                 git reset --hard HEAD^
 274         ) &&
 275         test_must_fail git -C workbench \
 276                 push --atomic up master foo bar >out 2>&1 &&
 277         fmt_status_report <out >actual &&
 278         cat >expect <<-EOF &&
 279         To ../upstream
 280          ! [rejected] master -> master (non-fast-forward)
 281          ! [rejected] bar -> bar (atomic push failed)
 282         EOF
 283         test_cmp expect actual
 284 '
 285
 286 test_done