ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [4/5] incubator-ignite git commit: # gg-9869: format patch
Date Thu, 05 Mar 2015 11:35:06 GMT
# gg-9869: format patch


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

Branch: refs/heads/gg-9869
Commit: f8220c67216d2d30fc4b52cd3a8907653e0b3f00
Parents: f6cbc11
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Thu Mar 5 14:31:06 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Thu Mar 5 14:31:06 2015 +0300

----------------------------------------------------------------------
 scripts/git-format-patch.sh    |  2 +-
 scripts/git-patch-functions.sh | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f8220c67/scripts/git-format-patch.sh
----------------------------------------------------------------------
diff --git a/scripts/git-format-patch.sh b/scripts/git-format-patch.sh
index 6889a1a..112ea40 100644
--- a/scripts/git-format-patch.sh
+++ b/scripts/git-format-patch.sh
@@ -52,4 +52,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} ${CURRENT_BRANCH} _ignite.patch
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f8220c67/scripts/git-patch-functions.sh
----------------------------------------------------------------------
diff --git a/scripts/git-patch-functions.sh b/scripts/git-patch-functions.sh
index aa2c9f2..539d42f 100644
--- a/scripts/git-patch-functions.sh
+++ b/scripts/git-patch-functions.sh
@@ -31,21 +31,19 @@ formatPatch () {
 
     cd ${GIT_HOME}
 
-    echo ">>>>>> Checkout origin/${DEFAULT_BRANCH} as master_copy"
     git checkout ${DEFAULT_BRANCH}
     git checkout -b tmppatch
-#    git merge --squash ${PATCHED_BRANCH} # In one commit
-    git merge ${PATCHED_BRANCH}
-#    git commit -a -m ""
-
-    git checkout ${PATCHED_BRANCH}
+    
+    git merge --no-edit ${PATCHED_BRANCH}
+#    Or we can 'squashe' merge to make only one commit.
+#    git merge --squash ${PATCHED_BRANCH}
+#    git commit -a -m "# PATCHED_BRANCH"
 
-    echo '>>>>>> Format patch.'
     git format-patch ${DEFAULT_BRANCH}  --stdout > ${PATCHES_HOME}'/'${DEFAULT_BRANCH}_${PATCHED_BRANCH}${PATCH_SUFFIX}
 
-#    echo '>>>>>> Clean-up.'
-    git checkout ${DEFAULT_BRANCH}
-#    git branch -D tmpsquash # Delete tmp branch.
+    git checkout ${PATCHED_BRANCH}
+    
+    git branch -D tmppatch # Delete tmp branch.
 }
 
 updateBranches () {


Mime
View raw message