From c46221ee9a15d5b2d4b31f60f83839873584b1f6 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 16 Apr 2012 18:08:44 +0200 Subject: [PATCH] Fix git branch retrieval in mytasks.pl script Change-Id: I86ddcff32e697d7bf02217a05e9f5a4e13cc1015 Reviewed-by: Tobias Hunger --- scripts/mytasks.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/mytasks.pl b/scripts/mytasks.pl index a1ca52a2fcf..1e28a22162d 100644 --- a/scripts/mytasks.pl +++ b/scripts/mytasks.pl @@ -64,7 +64,7 @@ my $pos = 0; sub getDiffOrigin { my $currentBranch = `git branch | grep "^* "`; chop $currentBranch; - $currentBranch =~ s/^* //; + $currentBranch =~ s/^\s*\* //; my $remoteRepo = `git config --local --get branch.$currentBranch.remote`; chop $remoteRepo; @@ -73,7 +73,7 @@ sub getDiffOrigin { my $remoteBranch = `git config --local --get branch.$currentBranch.merge`; chop $remoteBranch; - $remoteBranch =~ s!^refts/heads/!!; + $remoteBranch =~ s!^refs/heads/!!; return "HEAD" if (!$remoteBranch);