You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/07/10 14:46:44 UTC
[08/12] isis git commit: ISIS-1052: more on github-pr.sh and docs
ISIS-1052: more on github-pr.sh and docs
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ff7c9d29
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ff7c9d29
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ff7c9d29
Branch: refs/heads/master
Commit: ff7c9d29d15a379fbb148d629ed1db868cbaf149
Parents: 579a1b1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jul 10 13:20:03 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jul 10 13:21:08 2015 +0100
----------------------------------------------------------------------
.../guides/_cg_committers_merging-a-pull-request.adoc | 7 ++-----
github-pr.sh | 7 +------
2 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ff7c9d29/adocs/documentation/src/main/asciidoc/guides/_cg_committers_merging-a-pull-request.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_merging-a-pull-request.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_merging-a-pull-request.adoc
index ddfd4af..d906248 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_merging-a-pull-request.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_merging-a-pull-request.adoc
@@ -16,6 +16,7 @@ The overall process is as follows:
* checkout branch from which PR was forked (usually just 'master')
* merge PR into temporary branch using the `github-pr.sh` script
* test the change locally (run the app, rebuild, manual regression tests etc)
+* if required, tidy up/refactor code as required
* merge temporary branch into mainline, and commit
@@ -91,13 +92,9 @@ The build now commences. Once done, the script continues:
[source,bash]
----
-Checkout out local branch 'master' ...
-Switched to branch 'master'
-...
-
If build successful and happy to merge, execute:
-git merge --ff-only ISIS-1162_pr-31 && git branch -d ISIS-1162_pr-31
+git checkout master && git merge --no-ff ISIS-1162_pr-31 && git branch -d ISIS-1162_pr-31
----
http://git-wip-us.apache.org/repos/asf/isis/blob/ff7c9d29/github-pr.sh
----------------------------------------------------------------------
diff --git a/github-pr.sh b/github-pr.sh
index 9c1cdf8..bbccc5a 100644
--- a/github-pr.sh
+++ b/github-pr.sh
@@ -132,13 +132,8 @@ mvn clean install -o
echo
echo
-echo "Checking out local branch '$branch_name_local' ..."
-git checkout $branch_name_local
-
-
-
echo
echo "If build successful and happy to merge, execute:"
echo
-echo "git merge --ff-only $branch_name_temp && git branch -d $branch_name_temp"
+echo "git checkout $branch_name_local && git merge --no-ff $branch_name_temp && git branch -d $branch_name_temp"
echo