brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [35/50] [abbrv] brooklyn-client git commit: fix bug where some files "ever" were not getting picked up
Date Mon, 01 Feb 2016 18:01:33 GMT
fix bug where some files "ever" were not getting picked up


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/34ae71d4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/34ae71d4
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/34ae71d4

Branch: refs/heads/master
Commit: 34ae71d49a75d776cc598c6d8824395122ae3df2
Parents: 19d67fa
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Wed Jan 27 22:39:26 2016 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Wed Jan 27 22:45:16 2016 +0000

----------------------------------------------------------------------
 3-create-full-whitelists.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/34ae71d4/3-create-full-whitelists.sh
----------------------------------------------------------------------
diff --git a/3-create-full-whitelists.sh b/3-create-full-whitelists.sh
index c2f4698..f28c2cb 100755
--- a/3-create-full-whitelists.sh
+++ b/3-create-full-whitelists.sh
@@ -15,7 +15,11 @@ done
 
 pushd incubator-brooklyn
 
-git log --pretty=format: --name-only --diff-filter=A | sort -u > ../all-files-ever.gen.txt

+git log --pretty=format: --name-only --diff-filter=A > ../TMP-all-files-ever.gen.txt
+# the above leaves out files added during merge commits, so also do the following
+git log --pretty=format:%H --merges | xargs git show --pretty=format: --name-only --diff-filter=A
>> ../TMP-all-files-ever.gen.txt
+sort -u ../TMP-all-files-ever.gen.txt > ../all-files-ever.gen.txt 
+rm ../TMP-all-files-ever.gen.txt
 
 popd
 


Mime
View raw message