diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2012-04-16 18:08:44 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-04-16 18:09:58 +0200 |
| commit | c46221ee9a15d5b2d4b31f60f83839873584b1f6 (patch) | |
| tree | 762252fe929514dfa7494d1e3c4c5c5e320195f8 /scripts/mytasks.pl | |
| parent | aca66125defc98581e1b6473db84e58234383d63 (diff) | |
Fix git branch retrieval in mytasks.pl script
Change-Id: I86ddcff32e697d7bf02217a05e9f5a4e13cc1015
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'scripts/mytasks.pl')
| -rw-r--r-- | scripts/mytasks.pl | 4 |
1 files 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); |