From b9bb14ffe6a72f0275c6f4e0f63ba1aa8a68204e Mon Sep 17 00:00:00 2001 From: Calvin Spealman Date: Tue, 20 Nov 2007 13:02:22 -0500 Subject: [PATCH] Dont try to add a target branch to commit. only commitbranch on current branch. --- bin/commitbranch | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/bin/commitbranch b/bin/commitbranch index de51407..4d8e32c 100755 --- a/bin/commitbranch +++ b/bin/commitbranch @@ -2,13 +2,6 @@ # commitbranch CURBRANCH=`currentbranchname` -if [ "$1"="" ]; then - TARGET_BRANCH=$CURBRANCH -else - TARGET_BRANCH=$1 -fi - -changebranch $TARGET_BRANCH if ( echo $CURBRANCH|grep ".dirty_for_rebase" ); then echo @@ -22,6 +15,7 @@ if [[ $UPDATE_EXIT != "0" ]]; then exit -1 else PUSH_OK=0 + # Use the real current branch name not the current before the script started if ( test $CURBRANCH != "master" ); then mergefrommaster PUSH_OK=$? @@ -31,5 +25,3 @@ else git fetch fi fi - -changebranch $CURBRANCH \ No newline at end of file -- 2.11.4.GIT