feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix git branch retrieval in mytasks.pl script

Browse Source 
Change-Id: I86ddcff32e697d7bf02217a05e9f5a4e13cc1015
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2012-04-16 18:08:44 +02:00
parent aca66125de
commit c46221ee9a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/mytasks.pl
View File

@@ -64,7 +64,7 @@ my $pos = 0;
sub getDiffOrigin { sub getDiffOrigin {
my $currentBranch = `git branch | grep "^* "`; my $currentBranch = `git branch | grep "^* "`;
chop $currentBranch; chop $currentBranch;
$currentBranch =~ s/^* //; $currentBranch =~ s/^\s*\* //;
my $remoteRepo = `git config --local --get branch.$currentBranch.remote`; my $remoteRepo = `git config --local --get branch.$currentBranch.remote`;
chop $remoteRepo; chop $remoteRepo;
@@ -73,7 +73,7 @@ sub getDiffOrigin {
my $remoteBranch = `git config --local --get branch.$currentBranch.merge`; my $remoteBranch = `git config --local --get branch.$currentBranch.merge`;
chop $remoteBranch; chop $remoteBranch;
$remoteBranch =~ s!^refts/heads/!!; $remoteBranch =~ s!^refs/heads/!!;
return "HEAD" if (!$remoteBranch); return "HEAD" if (!$remoteBranch);