One of the first things does is setting $curr_branch to
the target of HEAD and $curr_branch_short to the same but with the
leading "refs/heads/" removed.  Simplify the code by using
$curr_branch_short instead of setting $curr_branch to the same
shortened value.

The only other use of $curr_branch in that function doesn't have to
be replaced with $curr_branch_short because it just checks if the
string is empty.  That property is the same with or without the prefix
unless HEAD points to "refs/heads/" alone, which is invalid.

Noticed-by: Felipe Contreras <>
Signed-off-by: Rene Scharfe <>
Replacement patch.  Corrected the command in the summary and
changed the first part of the description slightly. | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ b/
index f0df41c..d8b2708 100755
--- a/
+++ b/
@@ -166,9 +166,8 @@ error_on_no_merge_candidates () {
-       curr_branch=${curr_branch#refs/heads/}
-       upstream=$(git config "branch.$curr_branch.merge")
-       remote=$(git config "branch.$curr_branch.remote")
+       upstream=$(git config "branch.$curr_branch_short.merge")
+       remote=$(git config "branch.$curr_branch_short.remote")
        if [ $# -gt 1 ]; then
                if [ "$rebase" = true ]; then
-- 1.8.4 
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to