Bug 376988 - Cleanup auto tagging reports in 4.2 primary builds
switch order of what changed and what bugs mentioned.
diff --git a/org.eclipse.e4.builder/scripts/git-submission.sh b/org.eclipse.e4.builder/scripts/git-submission.sh
index a75ba0f..6c77550 100644
--- a/org.eclipse.e4.builder/scripts/git-submission.sh
+++ b/org.eclipse.e4.builder/scripts/git-submission.sh
@@ -7,7 +7,7 @@
ROOT=$1; shift
-rm -f /tmp/proj_changed_$$.txt /tmp/bug_list_$$.txt /tmp/bug_info_$$.txt
+rm -f /tmp/proj_changed_$$.txt /tmp/bug_list_$$.txt /tmp/bug_info_$$.txt /tmp/project_dirs_$$.txt
while [ $# -gt 0 ]; do
REPO="$1"; shift
@@ -15,7 +15,10 @@
LAST_TAG="$1"; shift
BUILD_TAG="$1"; shift
cd $ROOT/$REPO_DIR
- git diff --name-only ${LAST_TAG} ${BUILD_TAG} | cut -f2 -d/ | sort -u >>/tmp/proj_changed_$$.txt
+ find * -name .project | sed 's!/.project!!g' >/tmp/project_dirs_$$.txt
+ git diff --name-only ${LAST_TAG} ${BUILD_TAG} \
+ | grep -F -o -f /tmp/project_dirs_$$.txt \
+ | sort -u >>/tmp/proj_changed_$$.txt
git log --first-parent ${LAST_TAG}..${BUILD_TAG} \
@@ -36,8 +39,9 @@
echo + Bug $BUG - $TITLE \(${STATUS}\) >>/tmp/bug_info_$$.txt
done
-echo The build contains the following changes:
-cat /tmp/bug_info_$$.txt
-echo ""
echo The following projects have changed:
-cat /tmp/proj_changed_$$.txt | sort -u
\ No newline at end of file
+cat /tmp/proj_changed_$$.txt | sort -u
+echo ""
+echo The build contains commits that mentioned these bugs:
+cat /tmp/bug_info_$$.txt
+
