Merge tag 'v0.5' into dpkg

1 files changed, 24 insertions, 10 deletions

diff --git a/pmwg-ci-integ b/pmwg-ci-integ
index df4474f..db5c9f0 100755
--- a/pmwg-ci-integ
+++ b/pmwg-ci-integ
@@ -12,14 +12,13 @@
 # first place, it is up to the user to purge the rerere cache and redo
 # a clean resolution conflict.
 #
-# The merge common point is *always the latest tag*.
+# The merge common point is by default the latest tag, or the latest
+# commit id specified in the command line option.
 #
 # 1. How to use it
 #
 #  - Create a Linux clean tree
 #
-#  - Create one 'baseline' branch
-#
 #  - Create one configuration file located at (topmost priority):
 #    - <linux>/.pmwg-ci/config
 #    - $HOME/.pmwg-ci/config
@@ -34,13 +33,19 @@
 # 
 #    <user> <url> <branch>
 #
-#  - Comments are allowed
+#  - Comments are allowed with '#' format
 # 
+#  - The baseline *must* be specified
+#
 # eg.
 #
+# baseline git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
 # ulf.hansson http://git.linaro.org/people/ulf.hansson/linux-pm.git next
 # andy.gross https://git.linaro.org/people/andy.gross/linux-pm.git for-pm-int
-# 
+#
+# By default the baseline name is 'baseline' but its name can be changed
+# via the options in the command line parameters.
+#
 # 3. Conflict resolution
 #
 # As soon as there is a conflict detected, the merge tool is invoked,
@@ -96,10 +101,6 @@ BASELINE_BRANCH=master
 # Track the tag or HEAD changes
 TRACK=tag
 
-# Use pushd here so when the script exits, the CWD will automatically
-# be the initial one before calling this script.
-pushd $LOCAL_REPO
-
 # Global variable to test if a change occured during the last merge
 # or not. If one branch is added, deleted or updated, this variable
 # will be different from zero and will lead to the merge operation
@@ -126,7 +127,7 @@ Help() {
     echo "	 -r|--remote <url>	: URL to the remote repository [$REMOTE_REPO]"
     echo "	 -b|--baseline <name>	: Baseline name [$BASELINE]"
     echo "	 -i|--integ <name>	: Integration branch name [$INTEG_BRANCH]"
-    echo "	 -t|--track tag|head	 changes on the latest tag or HED on branc [$TRACK]"
+    echo "	 -t|--track tag|head	: Changes on the latest tag or HEAD on branch [$TRACK]"
 
     echo
 }
@@ -232,6 +233,17 @@ config_setup() {
 
 ######################################################################
 #
+# Setup path after options and config is done
+#
+path_setup() {
+
+    # Use pushd here so when the script exits, the CWD will
+    # automatically be the initial one before calling this script.
+    pushd $LOCAL_REPO
+}
+
+######################################################################
+#
 # Compute the remote branch name from the information we have from the
 # config file and the BASELINE name
 #
@@ -268,6 +280,8 @@ do_setup() {
 
     options_setup $@
 
+    path_setup
+
     git_rerere_setup
 
     config_setup