ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/5] incubator-ignite git commit: # gg-9869: move function
Date Thu, 05 Mar 2015 11:35:04 GMT
# gg-9869: move 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/68736797
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/68736797
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/68736797

Branch: refs/heads/gg-9869
Commit: 68736797b7e55c36d845ad173bde17535fd4dc34
Parents: 46c33b2
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Thu Mar 5 14:10:20 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Thu Mar 5 14:10:20 2015 +0300

----------------------------------------------------------------------
 scripts/git-format-patch.sh    | 14 +++-----------
 scripts/git-patch-functions.sh | 17 +++++------------
 2 files changed, 8 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68736797/scripts/git-format-patch.sh
----------------------------------------------------------------------
diff --git a/scripts/git-format-patch.sh b/scripts/git-format-patch.sh
index b7642b0..6889a1a 100644
--- a/scripts/git-format-patch.sh
+++ b/scripts/git-format-patch.sh
@@ -50,14 +50,6 @@ echo
 # Main script logic.
 #
 
-require_clean_work_tree ${IGNITE_HOME}
-#
-#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
+requireCleanWorkTree ${IGNITE_HOME}
+
+#formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${CURRENT_BRANCH} _ignite.patch
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68736797/scripts/git-patch-functions.sh
----------------------------------------------------------------------
diff --git a/scripts/git-patch-functions.sh b/scripts/git-patch-functions.sh
index afc5d80..1edbba9 100644
--- a/scripts/git-patch-functions.sh
+++ b/scripts/git-patch-functions.sh
@@ -29,21 +29,14 @@ formatPatch () {
     PATCHED_BRANCH=$3
     PATCH_SUFFIX=$4
 
-    echo
-    echo '>>> FORMAT PATCH FOR BRANCHES '${DEFAULT_BRANCH}' AND '${PATCHED_BRANCH}'
AT '${GIT_HOME}
-    echo
-
     cd ${GIT_HOME}
 
-#    echo '>>>>>> Checkout '${DEFAULT_BRANCH}
-#    git checkout ${DEFAULT_BRANCH}
+    echo ">>>>>> Checkout origin/${DEFAULT_BRANCH} as master_copy"
+    git checkout -b master_copy origin/${DEFAULT_BRANCH}
 
-#    echo '>>>>>> Create tmpsquash.'
-#    git checkout -b tmpsquash
-#
 #    echo '>>>>>> Merge '${PATCHED_BRANCH}' at tmpsquash'
-#    git merge --squash ${PATCHED_BRANCH}
-#    git commit -a -m "My squashed commits"
+    git merge --squash ${PATCHED_BRANCH}
+    git commit -a -m "My squashed commits"
 
     git checkout ${PATCHED_BRANCH}
 
@@ -113,7 +106,7 @@ determineCurrentBranch () {
     echo "$CURRENT_BRANCH"
 }
 
-require_clean_work_tree () {
+requireCleanWorkTree () {
     cd $1 # At git home.
 
     # Update the index


Mime
View raw message