Author: jamessan
Date: 2009-01-13 17:29:02 +0000 (Tue, 13 Jan 2009)
New Revision: 1787
Modified:
trunk/debian/changelog
trunk/scripts/debcheckout.pl
Log:
debcheckout: Filter TopGit branches out of the list of branches given to
--git-track since "tg populate" already created them.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-01-11 15:52:39 UTC (rev 1786)
+++ trunk/debian/changelog 2009-01-13 17:29:02 UTC (rev 1787)
@@ -11,6 +11,10 @@
* debsign: Add further quoting around the use and generation of temporary
directory names, in case $TMPDIR contains spaces.
+ [ James Vega ]
+ * debcheckout: Filter TopGit branches out of the list of branches given to
+ --git-track since "tg populate" already created them.
+
-- Patrick Schoenfeld <[email protected]> Fri, 09 Jan 2009 23:01:08 +0100
devscripts (2.10.44) unstable; urgency=low
Modified: trunk/scripts/debcheckout.pl
===================================================================
--- trunk/scripts/debcheckout.pl 2009-01-11 15:52:39 UTC (rev 1786)
+++ trunk/scripts/debcheckout.pl 2009-01-13 17:29:02 UTC (rev 1787)
@@ -765,13 +765,14 @@
my %info;
$info{'topgit'} = 'no';
+ $info{'top-bases'} = '';
my @bases = git_ls_remote($url, 'refs/top-bases');
if (@bases) {
$info{'topgit'} = 'yes';
$info{'top-bases'} = join ' ', @bases;
}
return(\%info);
- }
+}
# Print details about a repository and quit.
sub print_details($$) {
@@ -920,8 +921,11 @@
} else {
@heads = split ' ', $git_track;
}
+ # Filter out any branches already populated via TopGit
+ my @tgheads = split ' ', $$tg_info{'top-bases'};
foreach my $head (@heads) {
next if $head eq 'master';
+ next if grep { $head eq $_ } @tgheads;
my $cmd = "cd $wcdir";
$cmd .= " && git branch --track $head remotes/origin/$head";
system($cmd);
--
To unsubscribe, send mail to [email protected].
