[PATCH v2 3/3] rebase: rebasing can also be done when HEAD is detached

From

Kaartic Sivaraam <kaartic.sivaraam@gmail.com>

Date

Nov 27, 2017, 17:21 UTC

Message-ID

<20171127172104.5796-4-kaartic.sivaraam@gmail.com>

In-Reply-To

<20171127172104.5796-1-kaartic.sivaraam@gmail.com>

        Current branch HEAD is up to date.

which is clearly wrong as HEAD is not a branch.

Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
---

 git-rebase.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/git-rebase.sh b/git-rebase.sh
index 3f8d99e99..9cce1483a 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -602,11 +602,23 @@ then
 		test -z "$switch_to" ||
 		GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" \
 			git checkout -q "$switch_to" --
-		say "$(eval_gettext "Current branch \$branch_or_commit is up to date.")"
+		if test "$branch_or_commit" = "HEAD" &&
+			 !(git symbolic-ref -q HEAD)
+		then
+			say "$(eval_gettext "HEAD is up to date.")"
+		else
+			say "$(eval_gettext "Current branch \$branch_or_commit is up to date.")"
+		fi
 		finish_rebase
 		exit 0
 	else
-		say "$(eval_gettext "Current branch \$branch_or_commit is up to date, rebase forced.")"
+		if test "$branch_or_commit" = "HEAD" &&
+			 !(git symbolic-ref -q HEAD)
+		then
+			say "$(eval_gettext "HEAD is up to date, rebase forced.")"
+		else
+			say "$(eval_gettext "Current branch \$branch_or_commit is up to date, rebase forced.")"
+		fi
 	fi
 fi
 

-- 
2.15.0.345.gf926f18f3