You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/12 14:04:13 UTC
[2/5] git commit: updated refs/heads/master to bdaa60f
Show actual diff in commits after merge
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/52edbbb6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/52edbbb6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/52edbbb6
Branch: refs/heads/master
Commit: 52edbbb6cc2e2c58e360b737143c10adddc43880
Parents: 3515f57
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Dec 12 11:00:41 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Dec 12 11:22:32 2015 +0100
----------------------------------------------------------------------
tools/git/git-fwd-merge | 5 +++++
tools/git/git-pr | 3 +++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52edbbb6/tools/git/git-fwd-merge
----------------------------------------------------------------------
diff --git a/tools/git/git-fwd-merge b/tools/git/git-fwd-merge
index d0ce46a..44cbf0a 100755
--- a/tools/git/git-fwd-merge
+++ b/tools/git/git-fwd-merge
@@ -52,5 +52,10 @@ fi
# Clean up
rm -fr ${tmpMessageFile}
+apache_remote=$(git remote -v | grep -E "git-wip-us\.apache\.org" | head -n 1 | cut -f1)
+echo "INFO: Actual diff in commits is: (running git log --pretty=oneline --abbrev-commit ${apache_remote}/${currentBranch}..${currentBranch})"
+echo
+git log --pretty=oneline --abbrev-commit ${apache_remote}/${currentBranch}..${currentBranch}
+
# What's next
echo "We're done! Please double check using 'git log -p' and 'git push' when you're sure."
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52edbbb6/tools/git/git-pr
----------------------------------------------------------------------
diff --git a/tools/git/git-pr b/tools/git/git-pr
index 2bd58f6..696e0ad 100755
--- a/tools/git/git-pr
+++ b/tools/git/git-pr
@@ -179,6 +179,7 @@ elif [ "${prMergeableState}" != "clean" ] && [ ${force} -eq 1 ]; then
fi
github_remote=$(git remote -v | grep -E "apache/${repoName}(.git)?" | head -n 1 | cut -f1)
+apache_remote=$(git remote -v | grep -E "git-wip-us\.apache\.org" | head -n 1 | cut -f1)
if [ ${#github_remote} -eq 0 ]; then
echo "ERROR: We couldn't find a git remote pointing to 'apache/${repoName}.git' to merge the PR from."
echo "INFO: Currently, your configured remotes are:"
@@ -230,6 +231,8 @@ fi
echo "INFO: ***********************************************************************************"
echo "INFO: Merged successfully! Please double check using 'git log -p' and 'git push' when you're sure."
echo "INFO: About commits: there should be ${prCommits} from the PR plus 1 merge commit."
+echo "INFO: Actual diff in commits is: (running git log --pretty=oneline --abbrev-commit ${apache_remote}/${currentBranch}..${currentBranch})"
echo
+git log --pretty=oneline --abbrev-commit ${apache_remote}/${currentBranch}..${currentBranch}
clean_up_and_exit 0