diff options
| author | Kalle Juhani Lehtonen <kalle.ju.lehtonen@nokia.com> | 2012-08-21 10:57:27 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-21 03:05:21 +0200 |
| commit | 0d416ebca4014e884e4ade700da93b7002e0ff31 (patch) | |
| tree | ad8f714fc1edeec2c00103050e7066bdaa6f78c8 | |
| parent | a6b7c0024930881e3067ac1769ebab2042df471a (diff) | |
Fix error in fetch when testing referencev5.0.0-beta1
Fetch to checked out branch fails. Use '--update-head-ok' to address
the problem.
Change-Id: I495ec82ff0629798443a5dfe946624dc7b752064
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rwxr-xr-x | scripts/qt/qtmod_test.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl index 96596b87..ea33c308 100755 --- a/scripts/qt/qtmod_test.pl +++ b/scripts/qt/qtmod_test.pl @@ -727,7 +727,7 @@ sub set_module_refs # FIXME how do we guarantee we have this SHA1? # If it's not reachable from a branch obtained from a default `clone', it could be missing. if ( $ref !~ /^[0-9a-f]{40}$/) { # Not a SHA1, fetch origin to ensure using correct SHA-1 - $self->exe( 'git', 'fetch', '--verbose', 'origin', "+$ref:$ref" ); + $self->exe( 'git', 'fetch', '--verbose', '--update-head-ok', 'origin', "+$ref:$ref" ); } $self->exe( 'git', 'reset', '--hard', $ref ); |