diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-23 11:50:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-24 07:42:53 +0200 |
| commit | 42418641f014e1a0e6276e806a4a7c306dc4a415 (patch) | |
| tree | 09ec496cab34562185234c4bc7fa368c7f2e944c /scripts/qt | |
| parent | 6c3a3fb3da4e43de26ea94d0cc383445a2d095ae (diff) | |
support @same for dependency references
this allows us to uniformly use the same value in all branches, which
simplifies merging.
Change-Id: I278617762c169814697b49f29b5e363c7a3901f9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qtmod_test.pl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl index 7b2035b9..94299fc3 100755 --- a/scripts/qt/qtmod_test.pl +++ b/scripts/qt/qtmod_test.pl @@ -731,11 +731,13 @@ sub set_module_refs my ($self, %module_to_ref) = @_; my $qt_dir = $self->{ 'qt.dir' }; + my $qt_ref = "refs/heads/".$self->{ 'qt.branch' }; # Checkout dependencies as specified in the sync.profile, which specifies the sha1s/refs within them # Also, this code assumes that init-repository always uses `origin' as the remote. while ( my ($module, $ref) = each %module_to_ref ) { local $CWD = catfile( $qt_dir, $module ); + $ref = $qt_ref if ($ref eq '@same'); # 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. |