Commit 42418641 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by The Qt Project
Browse files

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: default avatarSergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: default avatarTony Sarajärvi <tony.sarajarvi@digia.com>
No related merge requests found
Showing with 2 additions and 0 deletions
...@@ -731,11 +731,13 @@ sub set_module_refs ...@@ -731,11 +731,13 @@ sub set_module_refs
my ($self, %module_to_ref) = @_; my ($self, %module_to_ref) = @_;
my $qt_dir = $self->{ 'qt.dir' }; 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 # 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. # Also, this code assumes that init-repository always uses `origin' as the remote.
while ( my ($module, $ref) = each %module_to_ref ) { while ( my ($module, $ref) = each %module_to_ref ) {
local $CWD = catfile( $qt_dir, $module ); local $CWD = catfile( $qt_dir, $module );
$ref = $qt_ref if ($ref eq '@same');
# FIXME how do we guarantee we have this SHA1? # 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 it's not reachable from a branch obtained from a default `clone', it could be missing.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment