diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-14 14:12:50 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-25 10:07:06 +0000 |
| commit | 6d98fbe0f35d2d525541c532d9a758f46681fc19 (patch) | |
| tree | 33388137886dbae483cd1d28ce8200636c71343c | |
| parent | 8980e505b5cdc8b6b9beb397887dc743dfc845c4 (diff) | |
qt5_tool: Use fetch origin instead of fetch --all
This is faster and also works in the case of gerrit hickups.
Change-Id: Id990cc16731f4ef6543a1a55c416ebb84bbe0e5b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| -rwxr-xr-x | bin/qt5_tool | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/qt5_tool b/bin/qt5_tool index 8766b8b..b90aca6 100755 --- a/bin/qt5_tool +++ b/bin/qt5_tool @@ -371,7 +371,7 @@ sub winRemoveGitFromPath sub initTrackingBranch { my ($branchName, $remoteBranchName) = @_; - my $strc = execute($git, ('fetch', '--all')); + my $strc = execute($git, ('fetch', 'origin')); die 'fetch failed.' if $strc; print 'Switching to ', $branchName, ' from ', $remoteBranchName, "\n"; $strc = execute($git, ('branch', '--track', $branchName, $remoteBranchName)); @@ -515,7 +515,7 @@ sub checkoutBranch if (!grep(/^ $desiredBranch$/, @branches)) { my $remoteBranchName = 'origin/' . $desiredBranch; # Does the remote branch exist? - $rc = execute($git, ('fetch', '--all')); + $rc = execute($git, ('fetch', 'origin')); die 'fetch of ' . $mod . ' failed' if ($rc); my @availableRemoteBranches = split("\n", `"$git" branch -r`); if (!grep(/^ $remoteBranchName$/, @availableRemoteBranches)) { |