Teach git-remote add to fetch and track

This adds three options to 'git-remote add'.

* -f (or --fetch) option tells it to also run the initial "git
fetch" using the newly created remote shorthand.

* -t (or --track) option tells it not to use the default
wildcard to track all branches.

* -m (or --master) option tells it to make the
remote/$name/HEAD point at a remote tracking branch other
than master.

For example, with this I can say:

$ git remote add -f -t master -t quick-start -m master \
jbf-um git://linux-nfs.org/~bfields/git.git/

to

(1) create remote.jbf-um.url;

(2) track master and quick-start branches (and no other); the
two -t options create these two lines:

fetch = +refs/heads/master:refs/remotes/jbf-um/master
fetch = +refs/heads/quick-start:refs/remotes/jbf-um/quick-start

(3) set up remotes/jbf-um/HEAD to point at jbf-um/master so
that later I can say "git log jbf-um"

Or I could do

$ git remote add -t 'ap/*' andy /home/andy/git.git

to make Andy's topic branches kept track of under refs/remotes/andy/ap/.

Other possible improvements I considered but haven't implemented
(hint, hint) are:

* reject wildcard letters other than a trailing '*' to the -t
parameter;

* make -m optional and when the first -t parameter does not
have the trailing '*' default to that value (so the above
example does not need to say "-m master");

* if -m is not given, and -t parameter ends with '*' (i.e. the
above defaulting did not tell us where to point HEAD at), and
if we did the fetch with -f, check if 'master' was fetched
and make HEAD point at it.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-remote.perl b/git-remote.perl
index f16ff21b8bed7fe4bc250a2489267ec8bb6ae00c..c56c5a84a4ac67648efd3c5ccf690e9cb21dd54f 100755 (executable)
--- a/git-remote.perl
+++ b/git-remote.perl
@@ -253,14 +253,30 @@ sub show_remote {
 }
 
 sub add_remote {
 }
 
 sub add_remote {

-       my ($name, $url) = @_;
+       my ($name, $url, $opts) = @_;

        if (exists $remote->{$name}) {
                print STDERR "remote $name already exists.\n";
                exit(1);
        }
        $git->command('config', "remote.$name.url", $url);
        if (exists $remote->{$name}) {
                print STDERR "remote $name already exists.\n";
                exit(1);
        }
        $git->command('config', "remote.$name.url", $url);

-       $git->command('config', "remote.$name.fetch",
-                     "+refs/heads/*:refs/remotes/$name/*");
+       my $track = $opts->{'track'} || ["*"];
+
+       for (@$track) {
+               $git->command('config', '--add', "remote.$name.fetch",
+                             "+refs/heads/$_:refs/remotes/$name/$_");
+       }
+       if ($opts->{'fetch'}) {
+               $git->command('fetch', $name);
+       }
+       if (exists $opts->{'master'}) {
+               $git->command('symbolic-ref', "refs/remotes/$name/HEAD",
+                             "refs/remotes/$name/$opts->{'master'}");
+       }
+}
+
+sub add_usage {
+       print STDERR "Usage: git remote add [-f] [-t track]* [-m master] <name> <url>\n";
+       exit(1);

 }
 
 if (!@ARGV) {
 }
 
 if (!@ARGV) {


@@ -307,11 +323,37 @@ sub add_remote {
        }
 }
 elsif ($ARGV[0] eq 'add') {
        }
 }
 elsif ($ARGV[0] eq 'add') {

+       my %opts = ();
+       while (1 < @ARGV && $ARGV[1] =~ /^-/) {
+               my $opt = $ARGV[1];
+               shift @ARGV;
+               if ($opt eq '-f' || $opt eq '--fetch') {
+                       $opts{'fetch'} = 1;
+                       next;
+               }
+               if ($opt eq '-t' || $opt eq '--track') {
+                       if (@ARGV < 1) {
+                               add_usage();
+                       }
+                       $opts{'track'} ||= [];
+                       push @{$opts{'track'}}, $ARGV[1];
+                       shift @ARGV;
+                       next;
+               }
+               if ($opt eq '-m' || $opt eq '--master') {
+                       if ((@ARGV < 1) || exists $opts{'master'}) {
+                               add_usage();
+                       }
+                       $opts{'master'} = $ARGV[1];
+                       shift @ARGV;
+                       next;
+               }
+               add_usage();
+       }

        if (@ARGV != 3) {
        if (@ARGV != 3) {

-               print STDERR "Usage: git remote add <name> <url>\n";
-               exit(1);
+               add_usage();

        }
        }

-       add_remote($ARGV[1], $ARGV[2]);
+       add_remote($ARGV[1], $ARGV[2], \%opts);

 }
 else {
        print STDERR "Usage: git remote\n";
 }
 else {
        print STDERR "Usage: git remote\n";