> I'm finding myself wanting to delete all local branch heads that are
> already present on a remote.
Something like this.
Subject: [PATCH] git-remote: implement prune -c
It would be nice to prune local refs which are irrelevant; add an
option to git-remote prune, with documentation.
Signed-off-by: Sam Vilain <sam@xxxxxxxxxx>
---
Documentation/git-remote.txt | 4 ++++
git-remote.perl | 33 +++++++++++++++++++++++++++++++--
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index ab04b86..7381b08 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -63,6 +63,10 @@ referenced by <name>, but are still locally available in
With `-n` option, the remote heads are not confirmed first with `git
ls-remote <name>`; cached information is used instead. Use with
caution.
++
+With `-c` option, all *local* branches that can be found via this
+remote are removed. Useful for cleaning up old style remote branches,
+or temporary branches.
'fetch'::
diff --git a/git-remote.perl b/git-remote.perl
index 20f9f54..e74bce2 100755
--- a/git-remote.perl
+++ b/git-remote.perl
@@ -210,7 +210,7 @@ sub show_mapping {
}
sub prune_remote {
- my ($name, $ls_remote) = @_;
+ my ($name, $ls_remote, $clean_local) = @_;
if (!exists $remote->{$name}) {
print STDERR "No such remote $name\n";
return;
@@ -224,6 +224,32 @@ sub prune_remote {
my @v = $git->command(qw(rev-parse --verify), "$prefix/$to_prune");
$git->command(qw(update-ref -d), "$prefix/$to_prune", $v[0]);
}
+ if ( $clean_local ) {
+ my @refs = map { (split " ")[0] }
+ $git->command(qw(for-each-ref), $prefix);
+ print "Saw ".@refs." remote refs\n";
+ my %r = map { ($_ => undef) }
+ $git->command("rev-list", @refs);
+ print "Saw ".(keys %r)." revs\n";
+ my %l = map { (split " ")[2,0] }
+ $git->command(qw(for-each-ref refs/heads));
+ print "Saw ".(keys %l)." local heads\n";
+
+ # don't delete the current branch, but there must be a
+ # better way to find it out
+ chomp(my ($checked_out) = map { /^\* (.*)/ }
+ $git->command("branch"));
+ $checked_out = "refs/heads/$checked_out"
+ if $checked_out;
+
+ while ( my ($ref, $rev) = each %l ) {
+ next if $checked_out and $ref eq $checked_out;
+ if ( exists $r{$rev} ) {
+ print "$ref is obsolete\n";
+ $git->command(qw(update-ref -d), $ref, $rev);
+ }
+ }
+ }
}
sub show_remote {
@@ -344,6 +370,9 @@ elsif ($ARGV[0] eq 'prune') {
if ($ARGV[$i] eq '-n') {
$ls_remote = 0;
}
+ elsif ($ARGV[$i] eq '-c') {
+ $clean_local = 1;
+ }
else {
last;
}
@@ -353,7 +382,7 @@ elsif ($ARGV[0] eq 'prune') {
exit(1);
}
for (; $i < @ARGV; $i++) {
- prune_remote($ARGV[$i], $ls_remote);
+ prune_remote($ARGV[$i], $ls_remote, $clean_local);
}
}
elsif ($ARGV[0] eq 'add') {
--
1.5.0.4.210.gf8a7c-dirty
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html