ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [3/3] incubator-ignite git commit: # gg-9869
Date Thu, 05 Mar 2015 12:05:08 GMT
# gg-9869


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/840b9c30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/840b9c30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/840b9c30

Branch: refs/heads/gg-9869
Commit: 840b9c302402db6b16ad6c0ffffbbbb31ba30900
Parents: 98a5a2c
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Thu Mar 5 15:05:02 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Thu Mar 5 15:05:02 2015 +0300

----------------------------------------------------------------------
 scripts/git-format-patch.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/840b9c30/scripts/git-format-patch.sh
----------------------------------------------------------------------
diff --git a/scripts/git-format-patch.sh b/scripts/git-format-patch.sh
index b3c32ff..f046fa0 100644
--- a/scripts/git-format-patch.sh
+++ b/scripts/git-format-patch.sh
@@ -34,17 +34,17 @@ if [ -f ${IGNITE_HOME}/scripts/git-patch-prop-local.sh ] # Whether a local
user
     then . ${IGNITE_HOME}/scripts/git-patch-prop-local.sh # Import user properties (it will
rewrite global properties).
 fi
 
-CURRENT_BRANCH=$( determineCurrentBranch ${IGNITE_HOME} )
+IGNITE_CURRENT_BRANCH=$( determineCurrentBranch ${IGNITE_HOME} )
 
 echo 'Usage: scripts/git-format-patch.sh.'
 echo "It should be called from IGNITE_HOME directory."
 echo "Patch will be created at PATCHES_HOME between Master branch (IGNITE_DEFAULT_BRANCH)
and Current branch."
 echo "Note: you can use ${IGNITE_HOME}/scripts/git-patch-prop-local.sh to set your own local
properties (to rewrite settings at git-patch-prop-local.sh). "
 echo
-echo "IGNITE_HOME: ${IGNITE_HOME}"
-echo "PATCHES_HOME: ${PATCHES_HOME}"
-echo "Master branch: ${IGNITE_DEFAULT_BRANCH}"
-echo "Current branch: ${CURRENT_BRANCH}"
+echo "Master branch  : ${IGNITE_DEFAULT_BRANCH}"
+echo "IGNITE_HOME    : ${IGNITE_HOME}"
+echo "Current branch : ${IGNITE_CURRENT_BRANCH}"
+echo "PATCHES_HOME   : ${PATCHES_HOME}"
 echo
 
 #
@@ -53,4 +53,4 @@ echo
 
 requireCleanWorkTree ${IGNITE_HOME}
 
-formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${CURRENT_BRANCH} _ignite.patch
\ No newline at end of file
+formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_CURRENT_BRANCH} _ignite.patch
\ No newline at end of file


Mime
View raw message