ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/2] incubator-ignite git commit: # gg-9869
Date Thu, 05 Mar 2015 17:59:58 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/gg-9869 dbc73a102 -> d140244b4


# 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/7c436844
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7c436844
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7c436844

Branch: refs/heads/gg-9869
Commit: 7c436844edea0be75e04b882d2734307c3887a62
Parents: a38c7dd
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Thu Mar 5 20:58:41 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Thu Mar 5 20:58:41 2015 +0300

----------------------------------------------------------------------
 scripts/git-apply-patch.sh     | 2 +-
 scripts/git-patch-functions.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c436844/scripts/git-apply-patch.sh
----------------------------------------------------------------------
diff --git a/scripts/git-apply-patch.sh b/scripts/git-apply-patch.sh
index f2299b0..4f1e143 100644
--- a/scripts/git-apply-patch.sh
+++ b/scripts/git-apply-patch.sh
@@ -76,7 +76,7 @@ echo "PATCHES_HOME   : ${PATCHES_HOME}"
 echo
 
 #
-# Main script logic..
+# Main script logic.
 #
 
 currentAndDefaultBranchesShouldBeEqual ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c436844/scripts/git-patch-functions.sh
----------------------------------------------------------------------
diff --git a/scripts/git-patch-functions.sh b/scripts/git-patch-functions.sh
index 115fd4c..ab9bec3 100644
--- a/scripts/git-patch-functions.sh
+++ b/scripts/git-patch-functions.sh
@@ -120,12 +120,12 @@ currentAndDefaultBranchesShouldBeEqual () {
 
     cd ${GIT_HOME}
 
-    IGNITE_CURRENT_BRANCH=$( determineCurrentBranch ${IGNITE_HOME} )
+    CURRENT_BRANCH=$( determineCurrentBranch ${GIT_HOME} )
     
-    if [ "$IGNITE_CURRENT_BRANCH" != "$DEFAULT_BRANCH" ]
+    if [ "$CURRENT_BRANCH" != "$DEFAULT_BRANCH" ]
     then 
         echo $0", ERROR:"
-        echo "You are not on a expected branch. Your current branch is $IGNITE_CURRENT_BRANCH,
should be $DEFAULT_BRANCH."
+        echo "You are not on an expected branch. Your current branch at $GIT_HOME is $CURRENT_BRANCH,
should be $DEFAULT_BRANCH."
         
         exit 1
     fi


Mime
View raw message