Merge pull request #9 from linkyard/put-branch

Support push to branch for multibranch

Author: jhunt

assets/out

@@ -38,6 +38,11 @@ if [ -z "$uri" ]; then
   exit 1
 fi
 
+cd $source
+
+if [ -z "$branch" ]; then
+  branch=$(git -C $repository config --local concourse-ci.branch-name)
+fi
 if [ -z "$branch" ]; then
   echo "invalid payload (missing branch)"
   exit 1
@@ -48,8 +53,6 @@ if [ -z "$repository" ]; then
   exit 1
 fi
 
-cd $source
-
 if [ -n "$tag" ] && [ ! -f "$tag" ]; then
   echo "tag file '$tag' does not exist"
   exit 1
@@ -125,6 +128,6 @@ else
 fi
 
 jq -n "{
-  version: {ref: $(git rev-parse HEAD | jq -R .)},
+  version: {ref: $(echo $(git rev-parse HEAD):$branch | jq -R .)},
   metadata: $(git_metadata)
 }" >&3

test/helpers.sh

@@ -446,3 +446,16 @@ put_uri_with_rebase_with_tag_and_prefix() {
     }
   }" | ${resource_dir}/out "$2" | tee /dev/stderr
 }
+
+put_uri_with_multibranch() {
+  jq -n "{
+    source: {
+      uri: $(echo $1 | jq -R .),
+      branches: $(echo $4 | jq -R .)
+    },
+    params: {
+      repository: $(echo $3 | jq -R .),
+      multibranch: true
+    }
+  }" | ${resource_dir}/out "$2" | tee /dev/stderr
+}

test/put.sh

@@ -20,7 +20,7 @@ it_can_put_to_url() {
   git -C $repo1 checkout refs/heads/master
 
   put_uri $repo1 $src repo | jq -e "
-    .version == {ref: $(echo $ref | jq -R .)}
+    .version == {ref: $(echo $ref:master | jq -R .)}
   "
 
   # switch back to master
@@ -46,7 +46,7 @@ it_can_put_to_url_with_tag() {
   git -C $repo1 checkout refs/heads/master
 
   put_uri_with_tag $repo1 $src some-tag-file repo | jq -e "
-    .version == {ref: $(echo $ref | jq -R .)}
+    .version == {ref: $(echo $ref:master | jq -R .)}
   "
 
   # switch back to master
@@ -72,7 +72,7 @@ it_can_put_to_url_with_tag_and_prefix() {
   git -C $repo1 checkout refs/heads/master
 
   put_uri_with_tag_and_prefix $repo1 $src some-tag-file v repo | jq -e "
-    .version == {ref: $(echo $ref | jq -R .)}
+    .version == {ref: $(echo $ref:master | jq -R .)}
   "
 
   # switch back to master
@@ -105,7 +105,7 @@ it_can_put_to_url_with_rebase() {
   local rebased_ref=$(git -C $repo2 rev-parse HEAD)
 
   jq -e "
-    .version == {ref: $(echo $rebased_ref | jq -R .)}
+    .version == {ref: $(echo $rebased_ref:master | jq -R .)}
   " < $response
 
   # switch back to master
@@ -139,7 +139,7 @@ it_can_put_to_url_with_rebase_with_tag() {
   local rebased_ref=$(git -C $repo2 rev-parse HEAD)
 
   jq -e "
-    .version == {ref: $(echo $rebased_ref | jq -R .)}
+    .version == {ref: $(echo $rebased_ref:master | jq -R .)}
   " < $response
 
   # switch back to master
@@ -174,7 +174,7 @@ it_can_put_to_url_with_rebase_with_tag_and_prefix() {
   local rebased_ref=$(git -C $repo2 rev-parse HEAD)
 
   jq -e "
-    .version == {ref: $(echo $rebased_ref | jq -R .)}
+    .version == {ref: $(echo $rebased_ref:master | jq -R .)}
   " < $response
 
   # switch back to master
@@ -201,7 +201,7 @@ it_can_put_to_url_with_only_tag() {
   git -C $repo1 checkout refs/heads/master
 
   put_uri_with_only_tag $repo1 $src repo | jq -e "
-    .version == {ref: $(echo $ref | jq -R .)}
+    .version == {ref: $(echo $ref:master | jq -R .)}
   "
 
   # switch back to master
@@ -212,10 +212,40 @@ it_can_put_to_url_with_only_tag() {
   test "$(git -C $repo1 rev-parse some-only-tag)" = $ref
 }
 
+it_can_put_to_url_when_multibranch() {
+  local repo=$(init_repo)
+  local ref1=$(make_commit $repo)
+  local ref2=$(make_commit $repo)
+  local ref3=$(make_commit_to_file_on_branch $repo some-other-file branch-a)
+  local ref4=$(make_commit $repo)
+
+  git -C $repo checkout refs/heads/master
+
+  local dest=$TMPDIR/destination
+
+  test_get $dest uri $repo ref "$ref3:branch-a $ref2:master" | jq -e "
+    .version == {ref: $(echo "$ref3:branch-a $ref2:master" | jq -R .)}
+  "
+
+  test -e $dest/some-other-file
+  test "$(git -C $dest rev-parse HEAD)" = $ref3
+  test "$(git -C $dest rev-parse branch-a)" = $ref3
+
+  put_uri_with_multibranch $repo $repo $dest "(branch-a)" | jq -e "
+    .version == {ref: $(echo $ref3:branch-a | jq -R .)}
+  "
+
+  git -C $repo checkout branch-a
+  test -e $repo/some-other-file
+  test "$(git -C $repo rev-parse master)" = $ref4
+  test "$(git -C $repo rev-parse branch-a)" = $ref3
+}
+
 run it_can_put_to_url
 run it_can_put_to_url_with_tag
 run it_can_put_to_url_with_tag_and_prefix
 run it_can_put_to_url_with_rebase
 run it_can_put_to_url_with_rebase_with_tag
 run it_can_put_to_url_with_rebase_with_tag_and_prefix
 run it_can_put_to_url_with_only_tag
+run it_can_put_to_url_when_multibranch