projects
/
arvados-dev.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b40808
)
Make delete script a little more verbose. Update remote branches before deleting
author
Javier Bértoli <javier@curoverse.com>
Thu, 30 Mar 2017 21:27:07 +0000
(18:27 -0300)
committer
Javier Bértoli <javier@curoverse.com>
Thu, 30 Mar 2017 22:44:52 +0000
(19:44 -0300)
refs #11020
jenkins/run-delete-merged-branches.sh
patch
|
blob
|
history
diff --git
a/jenkins/run-delete-merged-branches.sh
b/jenkins/run-delete-merged-branches.sh
index f1dc2efe21eedf2badc67d9f77eb7d60caa7cd5e..175b14421a3b1bcfc917de45956a78d20e84bd5d 100755
(executable)
--- a/
jenkins/run-delete-merged-branches.sh
+++ b/
jenkins/run-delete-merged-branches.sh
@@
-1,4
+1,4
@@
-#!/
usr/bin/env bash
+#!/
bin/bash -x
# Copyright (C) The Arvados Authors. All rights reserved.
#
@@
-22,6
+22,7
@@
trap '_exit_handler $LINENO' EXIT ERR
# IE: "keep_this_branch|also_this_other|and_this_one"
branches_to_keep="master"
+git remote update --prune
git checkout master
git branch --remote --merged | \