You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/03/04 11:34:36 UTC
[1/2] incubator-ignite git commit: # gg-9869: add
determineCurrentBranch function
Repository: incubator-ignite
Updated Branches:
refs/heads/gg-9869 380a53da5 -> 03f890ad9
# gg-9869: add determineCurrentBranch function
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/13dc5a17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/13dc5a17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/13dc5a17
Branch: refs/heads/gg-9869
Commit: 13dc5a173955d40e8b7b7aa356bc2f6d8e0b5832
Parents: 380a53d
Author: Artem Shutak <as...@gridgain.com>
Authored: Wed Mar 4 13:26:27 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Wed Mar 4 13:26:27 2015 +0300
----------------------------------------------------------------------
scripts/git-format-patch.sh | 6 +++++-
scripts/git-patch-functions.sh | 10 ++++++++++
scripts/git-patch-prop.sh | 7 +------
3 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/13dc5a17/scripts/git-format-patch.sh
----------------------------------------------------------------------
diff --git a/scripts/git-format-patch.sh b/scripts/git-format-patch.sh
index 7df08dc..67e5c0f 100644
--- a/scripts/git-format-patch.sh
+++ b/scripts/git-format-patch.sh
@@ -34,13 +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
+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
+echo "IGNITE_HOME: ${IGNITE_HOME}"
echo "PATCHES_HOME: ${PATCHES_HOME}"
echo "Master branch: ${IGNITE_DEFAULT_BRANCH}"
-echo "Current branch: ${PATCHED_BRANCH}"
+echo "Current branch: ${CURRENT_BRANCH}"
+echo
#
# Main script logic.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/13dc5a17/scripts/git-patch-functions.sh
----------------------------------------------------------------------
diff --git a/scripts/git-patch-functions.sh b/scripts/git-patch-functions.sh
index 971db16..633553b 100644
--- a/scripts/git-patch-functions.sh
+++ b/scripts/git-patch-functions.sh
@@ -104,3 +104,13 @@ exitIfBranchDoesNotExist () {
exit
fi
}
+
+CURRENT_BRANCH=""
+
+determineCurrentBranch () {
+ GIT_HOME=$1
+
+ cd ${GIT_HOME}
+
+ CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/13dc5a17/scripts/git-patch-prop.sh
----------------------------------------------------------------------
diff --git a/scripts/git-patch-prop.sh b/scripts/git-patch-prop.sh
index 03bd534..9ba8e35 100644
--- a/scripts/git-patch-prop.sh
+++ b/scripts/git-patch-prop.sh
@@ -21,10 +21,5 @@
#
IGNITE_DEFAULT_BRANCH='sprint-2'
-GG_DEFAULT_BRANCH='ignite-sprint-2'
-if [ "${IGNITE_HOME}" = "" ];
- then IGNITE_HOME=${GG_HOME}/../incubator-ignite
-fi
-
-PATCHES_HOME=${GG_HOME}
\ No newline at end of file
+PATCHES_HOME=${IGNITE_HOME}
\ No newline at end of file
[2/2] incubator-ignite git commit: # gg-9869:
Posted by sb...@apache.org.
# 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/03f890ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/03f890ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/03f890ad
Branch: refs/heads/gg-9869
Commit: 03f890ad999a9fe1cebe7e3b9dea39654efebdc6
Parents: 13dc5a1
Author: Artem Shutak <as...@gridgain.com>
Authored: Wed Mar 4 13:35:02 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Wed Mar 4 13:35:02 2015 +0300
----------------------------------------------------------------------
scripts/git-format-patch.sh | 24 ++++++++++++------------
scripts/git-patch-functions.sh | 4 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03f890ad/scripts/git-format-patch.sh
----------------------------------------------------------------------
diff --git a/scripts/git-format-patch.sh b/scripts/git-format-patch.sh
index 67e5c0f..3e784db 100644
--- a/scripts/git-format-patch.sh
+++ b/scripts/git-format-patch.sh
@@ -34,7 +34,7 @@ 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
-determineCurrentBranch ${IGNITE_HOME}
+CURRENT_BRANCH=$( determineCurrentBranch ${IGNITE_HOME} )
echo 'Usage: scripts/git-format-patch.sh.'
echo "It should be called from IGNITE_HOME directory."
@@ -50,14 +50,14 @@ echo
# Main script logic.
#
-exitIfThereAreUncommittedChanges
-
-checkBranchExists ${IGNITE_HOME} ${CURRENT_BRANCH}
-
-if [ -n ${BRANCH_EXISTS} ]
-then
- exitIfBranchDoesNotExist ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH}
-
- updateBranches ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${CURRENT_BRANCH}
- formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${CURRENT_BRANCH} _ignite.patch
-fi
+#exitIfThereAreUncommittedChanges
+#
+#checkBranchExists ${IGNITE_HOME} ${CURRENT_BRANCH}
+#
+#if [ -n ${BRANCH_EXISTS} ]
+#then
+# exitIfBranchDoesNotExist ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH}
+#
+# updateBranches ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${CURRENT_BRANCH}
+# formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${CURRENT_BRANCH} _ignite.patch
+#fi
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03f890ad/scripts/git-patch-functions.sh
----------------------------------------------------------------------
diff --git a/scripts/git-patch-functions.sh b/scripts/git-patch-functions.sh
index 633553b..8f5b2bb 100644
--- a/scripts/git-patch-functions.sh
+++ b/scripts/git-patch-functions.sh
@@ -105,12 +105,12 @@ exitIfBranchDoesNotExist () {
fi
}
-CURRENT_BRANCH=""
-
determineCurrentBranch () {
GIT_HOME=$1
cd ${GIT_HOME}
CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
+
+ echo "$CURRENT_BRANCH"
}
\ No newline at end of file