yetus-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject yetus git commit: YETUS-55. fix recovery of broken rebase code (aw)
Date Fri, 25 Sep 2015 20:11:17 GMT
Repository: yetus
Updated Branches:
  refs/heads/master 388bbfba7 -> 0d7441ebb


YETUS-55. fix recovery of broken rebase code (aw)


Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/0d7441eb
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/0d7441eb
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/0d7441eb

Branch: refs/heads/master
Commit: 0d7441ebba3645ff659d0c3f173674f522a1c4fe
Parents: 388bbfb
Author: Allen Wittenauer <aw@apache.org>
Authored: Fri Sep 25 13:11:12 2015 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Fri Sep 25 13:11:12 2015 -0700

----------------------------------------------------------------------
 dev-support/test-patch.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/yetus/blob/0d7441eb/dev-support/test-patch.sh
----------------------------------------------------------------------
diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index 444031a..60caedc 100755
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -1227,6 +1227,12 @@ function git_checkout
   fi
 
   if [[ ${RESETREPO} == "true" ]] ; then
+
+    if [[ -d .git/rebase-apply ]]; then
+      yetus_error "ERROR: a previous rebase failed. Aborting it."
+      ${GIT} rebase --abort
+    fi
+
     ${GIT} reset --hard
     if [[ $? != 0 ]]; then
       yetus_error "ERROR: git reset is failing"
@@ -1263,11 +1269,6 @@ function git_checkout
     # git ref hasn't been brought in tree yet
     if [[ ${OFFLINE} == false ]]; then
 
-      if [[ -f .git/rebase-apply ]]; then
-        yetus_error "ERROR: previous rebase failed. Aborting it."
-        ${GIT} rebase --abort
-      fi
-
       ${GIT} pull --rebase
       if [[ $? != 0 ]]; then
         yetus_error "ERROR: git pull is failing"


Mime
View raw message