summaryrefslogtreecommitdiff
path: root/parse-options.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-11 22:33:51 -0700
committerJunio C Hamano <gitster@pobox.com>2008-03-11 22:33:51 -0700
commitae90e16a3a7586bc25b7c7de50e4c3ba4806b3b9 (patch)
treeb868ef92c090819f91ced2de2c179f40030934ae /parse-options.c
parentb85997d14d1873a4baa3d04966cd5947e6134acd (diff)
parent3000658f7c15c880f976aac0ade73efd3b1e9790 (diff)
downloadgit-ae90e16a3a7586bc25b7c7de50e4c3ba4806b3b9.tar.gz
Merge branch 'js/remote'
* 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
Diffstat (limited to 'parse-options.c')
-rw-r--r--parse-options.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/parse-options.c b/parse-options.c
index b32c9ea66c..8e64316fe0 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -259,6 +259,8 @@ int parse_options(int argc, const char **argv, const struct option *options,
const char *arg = args.argv[0];
if (*arg != '-' || !arg[1]) {
+ if (flags & PARSE_OPT_STOP_AT_NON_OPTION)
+ break;
args.out[args.cpidx++] = args.argv[0];
continue;
}