summaryrefslogtreecommitdiff
path: root/parse-options.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-03 18:01:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-03 18:01:17 (GMT)
commit5f02274e4c4506b923b510a24da7991656f4db14 (patch)
tree83e695ab1d81730b494bcf4ae7a6aeee6a6ff023 /parse-options.h
parent0b9ce18ede8343116f4e5f008c05169f69cafc07 (diff)
parentb1456605c26eb6bd991b70b0ca0a3ce0f02473e9 (diff)
downloadgit-5f02274e4c4506b923b510a24da7991656f4db14.zip
git-5f02274e4c4506b923b510a24da7991656f4db14.tar.gz
git-5f02274e4c4506b923b510a24da7991656f4db14.tar.bz2
Merge branch 'pt/pull-builtin'
Reimplement 'git pull' in C. * pt/pull-builtin: pull: remove redirection to git-pull.sh pull --rebase: error on no merge candidate cases pull --rebase: exit early when the working directory is dirty pull: configure --rebase via branch.<name>.rebase or pull.rebase pull: teach git pull about --rebase pull: set reflog message pull: implement pulling into an unborn branch pull: fast-forward working tree if head is updated pull: check if in unresolved merge state pull: support pull.ff config pull: error on no merge candidates pull: pass git-fetch's options to git-fetch pull: pass git-merge's options to git-merge pull: pass verbosity, --progress flags to fetch and merge pull: implement fetch + merge pull: implement skeletal builtin pull argv-array: implement argv_array_pushv() parse-options-cb: implement parse_opt_passthru_argv() parse-options-cb: implement parse_opt_passthru()
Diffstat (limited to 'parse-options.h')
-rw-r--r--parse-options.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/parse-options.h b/parse-options.h
index ca865f6..6ca8388 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -227,6 +227,8 @@ extern int parse_opt_with_commit(const struct option *, const char *, int);
extern int parse_opt_tertiary(const struct option *, const char *, int);
extern int parse_opt_string_list(const struct option *, const char *, int);
extern int parse_opt_noop_cb(const struct option *, const char *, int);
+extern int parse_opt_passthru(const struct option *, const char *, int);
+extern int parse_opt_passthru_argv(const struct option *, const char *, int);
#define OPT__VERBOSE(var, h) OPT_COUNTUP('v', "verbose", (var), (h))
#define OPT__QUIET(var, h) OPT_COUNTUP('q', "quiet", (var), (h))
@@ -245,5 +247,9 @@ extern int parse_opt_noop_cb(const struct option *, const char *, int);
OPT_COLOR_FLAG(0, "color", (var), (h))
#define OPT_COLUMN(s, l, v, h) \
{ OPTION_CALLBACK, (s), (l), (v), N_("style"), (h), PARSE_OPT_OPTARG, parseopt_column_callback }
+#define OPT_PASSTHRU(s, l, v, a, h, f) \
+ { OPTION_CALLBACK, (s), (l), (v), (a), (h), (f), parse_opt_passthru }
+#define OPT_PASSTHRU_ARGV(s, l, v, a, h, f) \
+ { OPTION_CALLBACK, (s), (l), (v), (a), (h), (f), parse_opt_passthru_argv }
#endif