diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-02-14 17:53:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-14 17:53:48 -0800 |
| commit | 5785d9143bcb3ef19452a83bc2e870ff3d5ed95a (patch) | |
| tree | 03d6edd344fee12ea80680126b49700202fa5816 /parse-options.h | |
| parent | Merge branch 'bc/doc-adoc-not-txt' (diff) | |
| parent | builtin/clone: teach git-clone(1) the --revision= option (diff) | |
| download | git-5785d9143bcb3ef19452a83bc2e870ff3d5ed95a.tar.gz git-5785d9143bcb3ef19452a83bc2e870ff3d5ed95a.zip | |
Merge branch 'tc/clone-single-revision'
"git clone" learned to make a shallow clone for a single commit
that is not necessarily be at the tip of any branch.
* tc/clone-single-revision:
builtin/clone: teach git-clone(1) the --revision= option
parse-options: introduce die_for_incompatible_opt2()
clone: introduce struct clone_opts in builtin/clone.c
clone: add tags refspec earlier to fetch refspec
clone: refactor wanted_peer_refs()
clone: make it possible to specify --tags
clone: cut down on global variables in clone.c
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/parse-options.h b/parse-options.h index 39f0886254..fca944d9a9 100644 --- a/parse-options.h +++ b/parse-options.h @@ -436,6 +436,15 @@ static inline void die_for_incompatible_opt3(int opt1, const char *opt1_name, 0, ""); } +static inline void die_for_incompatible_opt2(int opt1, const char *opt1_name, + int opt2, const char *opt2_name) +{ + die_for_incompatible_opt4(opt1, opt1_name, + opt2, opt2_name, + 0, "", + 0, ""); +} + /* * Use these assertions for callbacks that expect to be called with NONEG and * NOARG respectively, and do not otherwise handle the "unset" and "arg" |