Merge branch 'js/remote'
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Mar 2008 05:33:51 +0000 (22:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Mar 2008 05:33:51 +0000 (22:33 -0700)
* js/remote:
  "remote update": print remote name being fetched from
  builtin remote rm: remove symbolic refs, too
  remote: fix "update [group...]"
  remote show: Clean up connection correctly if object fetch wasn't done
  builtin-remote: prune remotes correctly that were added with --mirror
  Make git-remote a builtin
  Test "git remote show" and "git remote prune"
  parseopt: add flag to stop on first non option
  path-list: add functions to work with unsorted lists

Conflicts:

parse-options.c

1  2 
Makefile
contrib/examples/git-remote.perl
parse-options.c
parse-options.h

diff --cc Makefile
Simple merge
Simple merge
diff --cc parse-options.c
index b32c9ea66c7ae1e83564cd25d63d5cfd6c1589b5,be35785ce88e03d23ca5b0e5ffdc6142fb931060..8e64316fe002fe90c58de61e4d6558ee4ad87157
@@@ -259,7 -249,9 +259,9 @@@ int parse_options(int argc, const char 
                const char *arg = args.argv[0];
  
                if (*arg != '-' || !arg[1]) {
 -                      argv[j++] = args.argv[0];
+                       if (flags & PARSE_OPT_STOP_AT_NON_OPTION)
+                               break;
 +                      args.out[args.cpidx++] = args.argv[0];
                        continue;
                }
  
diff --cc parse-options.h
Simple merge