You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 19:01:43 UTC
[45/50] [abbrv] brooklyn-client git commit: fix bug where we were
dropping non-master branches
fix bug where we were dropping non-master branches
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/783a54f8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/783a54f8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/783a54f8
Branch: refs/heads/master
Commit: 783a54f836d9fab2f7b6a0c74e7c4964a56bd8af
Parents: 47d26ff
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Jan 28 12:42:06 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Jan 28 12:42:06 2016 +0000
----------------------------------------------------------------------
2-clean-history.sh | 2 +-
4-make-new-repos.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/783a54f8/2-clean-history.sh
----------------------------------------------------------------------
diff --git a/2-clean-history.sh b/2-clean-history.sh
index 779bc17..aaefc0b 100755
--- a/2-clean-history.sh
+++ b/2-clean-history.sh
@@ -16,7 +16,7 @@ git checkout master
# now make master reorganised, if reorg branch exists
git reset --hard reorg
-git filter-branch -f --index-filter "git rm -r -q --cached --ignore-unmatch $(echo $( cat ${basedir}/big-files-to-remove.txt ))" master
+git filter-branch -f --index-filter "git rm -r -q --cached --ignore-unmatch $(echo $( cat ${basedir}/big-files-to-remove.txt ))" master ${branches}
## above is slightly faster than below, because (compared w step 3) we have fewer patterns and (compared w step 4) we are benefitting from rm's native pattern matching
# git filter-branch -f --index-filter \
# "git ls-files > /tmp/TMP-clean-history-LS ; ${basedir}/grep-lines-starting.sh ${basedir}/big-files-to-remove.txt /tmp/TMP-clean-history-LS | git update-index --force-remove --stdin" \
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/783a54f8/4-make-new-repos.sh
----------------------------------------------------------------------
diff --git a/4-make-new-repos.sh b/4-make-new-repos.sh
index d37544b..0259ec7 100755
--- a/4-make-new-repos.sh
+++ b/4-make-new-repos.sh
@@ -12,7 +12,7 @@ function new_repo() {
repodir=new-repos/${REPO_PREFIX}$1
git clone incubator-brooklyn $repodir
# for quick tests:
-# git clone --depth 10 file://`pwd`/incubator-brooklyn $repodir && ( cd $repodir && git fetch --depth 10 )
+# git clone --depth 10 --no-single-branch file://`pwd`/incubator-brooklyn $repodir && ( cd $repodir && git fetch --depth 10 )
( cd $repodir &&
for branch in ${branches}; do git branch --track ${branch} origin/${branch}; done &&
git remote rm origin &&