mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
1a66d8c6f658051a02b6d8f024e80e06fccdcd11
git/builtin
History
Elijah Newren 7d718c552b rebase: flag --apply and --merge as incompatible 
Previously, we flagged options which implied --apply as being
incompatible with options which implied --merge.  But if both options
were given explicitly, then we didn't flag the incompatibility.  The
same is true with --apply and --interactive.  Add the check, and add
some testcases to verify these are also caught.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-01-25 09:20:52 -08:00
..
add.c
Merge branch 'jk/unused-post-2.39'
2022-12-26 11:42:05 +09:00
am.c
Merge branch 'rs/dup-array'
2023-01-21 17:21:58 -08:00
annotate.c
…
apply.c
apply.c: remove unnecessary include
2022-04-06 09:42:14 -07:00
archive.c
parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options
2022-08-19 11:13:14 -07:00
bisect.c
bisect: remove Cogito-related code
2023-01-13 14:17:14 -08:00
blame.c
doc txt & -h consistency: make "annotate" consistent
2022-10-13 09:32:57 -07:00
branch.c
Merge branch 'rj/branch-copy-and-rename'
2022-12-19 11:46:18 +09:00
bugreport.c
built-ins: use free() not UNLEAK() if trivial, rm dead code
2022-11-21 12:32:48 +09:00
bundle.c
Merge branch 'ab/bundle-wo-args'
2023-01-05 15:07:22 +09:00
cat-file.c
Merge branch 'sa/cat-file-mailmap--batch-check'
2023-01-05 15:07:17 +09:00
check-attr.c
cocci: apply "pending" index-compatibility to some "builtin/*.c"
2022-11-21 12:06:15 +09:00
check-ignore.c
cocci: apply "pending" index-compatibility to some "builtin/*.c"
2022-11-21 12:06:15 +09:00
check-mailmap.c
…
check-ref-format.c
check-ref-format: fix trivial memory leak
2022-07-01 11:43:42 -07:00
checkout--worker.c
…
checkout-index.c
cocci: apply "pending" index-compatibility to some "builtin/*.c"
2022-11-21 12:06:15 +09:00
checkout.c
*: fix typos which duplicate a word
2023-01-08 10:28:34 +09:00
clean.c
cocci: apply "pending" index-compatibility to some "builtin/*.c"
2022-11-21 12:06:15 +09:00
clone.c
Merge branch 'ds/bundle-uri-4'
2023-01-02 21:37:18 +09:00
column.c
…
commit-graph.c
Merge branch 'ab/doc-synopsis-and-cmd-usage'
2022-10-28 11:26:54 -07:00
commit-tree.c
doc txt & -h consistency: add missing options
2022-10-13 09:32:57 -07:00
commit.c
Merge branch 'ab/various-leak-fixes'
2022-12-14 15:55:46 +09:00
config.c
built-ins: use free() not UNLEAK() if trivial, rm dead code
2022-11-21 12:32:48 +09:00
count-objects.c
i18n: remove from i18n strings that do not hold translatable parts
2022-02-04 13:58:28 -08:00
credential-cache--daemon.c
doc txt & -h consistency: use "git foo" form, not "git-foo"
2022-10-13 09:32:57 -07:00
credential-cache.c
…
credential-store.c
…
credential.c
…
describe.c
cocci: apply "pending" index-compatibility to some "builtin/*.c"
2022-11-21 12:06:15 +09:00
diagnose.c
Merge branch 'ab/doc-synopsis-and-cmd-usage'
2022-10-28 11:26:54 -07:00
diff-files.c
cocci: apply "pending" index-compatibility to some "builtin/*.c"
2022-11-21 12:06:15 +09:00
diff-index.c
cocci: apply "pending" index-compatibility to some "builtin/*.c"
2022-11-21 12:06:15 +09:00
diff-tree.c
cocci: apply "pending" index-compatibility to some "builtin/*.c"
2022-11-21 12:06:15 +09:00
diff.c
Merge branch 'ab/various-leak-fixes'
2022-12-14 15:55:46 +09:00
difftool.c
{builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"
2022-11-21 12:06:15 +09:00
env--helper.c
parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options
2022-08-19 11:13:14 -07:00
fast-export.c
diff: mark unused parameters in callbacks
2022-12-13 22:16:23 +09:00
fast-import.c
git-compat-util.h: use "UNUSED", not "UNUSED(var)"
2022-09-01 10:49:48 -07:00
fetch-pack.c
list-objects-filter: add and use initializers
2022-09-12 08:38:59 -07:00
fetch.c
Merge branch 'rs/no-more-run-command-v'
2022-11-08 17:15:12 -05:00
fmt-merge-msg.c
…
for-each-ref.c
…
for-each-repo.c
for-each-repo: interpolate repo path arguments
2022-11-14 22:39:25 -05:00
fsck.c
cocci: apply "pending" index-compatibility to some "builtin/*.c"
2022-11-21 12:06:15 +09:00
fsmonitor--daemon.c
Merge branch 'sx/pthread-error-check-fix'
2022-12-19 11:46:17 +09:00
gc.c
Merge branch 'rp/maintenance-qol'
2022-11-23 11:22:24 +09:00
get-tar-commit-id.c
…
grep.c
builtin/{grep,log}.: don't define "USE_THE_INDEX_COMPATIBILITY_MACROS"
2022-11-21 12:06:14 +09:00
hash-object.c
doc txt & -h consistency: add missing options
2022-10-13 09:32:57 -07:00
help.c
Merge branch 'ab/doc-synopsis-and-cmd-usage'
2022-10-28 11:26:54 -07:00
hook.c
builtin/hook.c: let parse-options parse subcommands
2022-08-19 11:13:15 -07:00
index-pack.c
i18n: fix mismatched camelCase config variables
2022-06-17 10:38:26 -07:00
init-db.c
doc txt & -h consistency: add missing options
2022-10-13 09:32:57 -07:00
interpret-trailers.c
doc txt & -h consistency: add missing options
2022-10-13 09:32:57 -07:00
log.c
format-patch: support format.mboxrd with --stdout
2022-12-25 16:32:45 +09:00
ls-files.c
ls-files: fix a --with-tree memory leak
2022-11-21 12:32:48 +09:00
ls-remote.c
doc txt & -h consistency: add missing options and labels
2022-10-13 09:32:56 -07:00
ls-tree.c
ls-tree: cleanup the redundant SPACE
2023-01-13 15:09:23 -08:00
mailinfo.c
…
mailsplit.c
Merge branch 'ep/maint-equals-null-cocci'
2022-05-20 15:26:59 -07:00
merge-base.c
doc txt & -h consistency: make output order consistent
2022-10-13 09:32:56 -07:00
merge-file.c
merge-file: fix memory leaks on error path
2022-07-01 11:43:43 -07:00
merge-index.c
cocci: apply "pending" index-compatibility to some "builtin/*.c"
2022-11-21 12:06:15 +09:00
merge-ours.c
cocci: apply "pending" index-compatibility to some "builtin/*.c"
2022-11-21 12:06:15 +09:00
merge-recursive.c
gettext API users: don't explicitly cast ngettext()'s "n"
2022-03-07 11:57:52 -08:00
merge-tree.c
Merge branch 'jk/unused-post-2.39'
2022-12-26 11:42:05 +09:00
merge.c
merge: break out of all_strategy loop when strategy is found
2023-01-13 10:24:57 -08:00
mktag.c
Merge branch 'ab/object-file-api-updates'
2022-03-16 17:53:08 -07:00
mktree.c
mktree: do not check type of remote objects
2022-06-21 10:12:15 -07:00
multi-pack-index.c
multi-pack-index: avoid writing to global in option callback
2022-10-06 09:56:51 -07:00
mv.c
cocci: apply "pending" index-compatibility to some "builtin/*.c"
2022-11-21 12:06:15 +09:00
name-rev.c
git-compat-util.h: use "UNUSED", not "UNUSED(var)"
2022-09-01 10:49:48 -07:00
notes.c
notes: avoid empty line in template
2022-11-16 14:57:32 -05:00
pack-objects.c
pack-objects: simplify --filter handling
2022-11-30 10:00:33 +09:00
pack-redundant.c
doc txt & -h consistency: fix mismatching labels
2022-10-13 09:32:56 -07:00
pack-refs.c
doc txt & -h consistency: add missing options and labels
2022-10-13 09:32:56 -07:00
patch-id.c
builtin: patch-id: remove unused diff-tree prefix
2022-10-24 15:44:20 -07:00
prune-packed.c
i18n: remove from i18n strings that do not hold translatable parts
2022-02-04 13:58:28 -08:00
prune.c
prune: quiet ENOENT on missing directories
2022-11-21 15:58:54 +09:00
pull.c
{builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"
2022-11-21 12:06:15 +09:00
push.c
Doc: document push.recurseSubmodules=only
2022-11-14 16:55:50 -05:00
range-diff.c
diff: factor out add_diff_options()
2022-12-02 08:25:29 +09:00
read-tree.c
read-tree: add "--super-prefix" option, eliminate global
2022-12-26 10:21:44 +09:00
rebase.c
rebase: flag --apply and --merge as incompatible
2023-01-25 09:20:52 -08:00
receive-pack.c
receive-pack: only use visible refs for connectivity check
2022-11-17 16:22:52 -05:00
reflog.c
refs: unify parse_worktree_ref() and ref_type()
2022-09-19 11:11:11 -07:00
remote-ext.c
convert trivial uses of strncmp() to skip_prefix()
2023-01-08 10:34:37 +09:00
remote-fd.c
convert trivial uses of strncmp() to starts_with()
2023-01-08 10:34:35 +09:00
remote.c
Merge branch 'rs/no-more-run-command-v'
2022-11-08 17:15:12 -05:00
repack.c
Merge branch 'ab/various-leak-fixes'
2022-12-14 15:55:46 +09:00
replace.c
refs: use ref_namespaces for replace refs base
2022-08-05 14:13:12 -07:00
rerere.c
diff: mark unused parameters in callbacks
2022-12-13 22:16:23 +09:00
reset.c
Merge branch 'jk/unused-post-2.39'
2022-12-26 11:42:05 +09:00
rev-list.c
Merge branch 'ps/receive-use-only-advertised'
2022-11-23 11:22:25 +09:00
rev-parse.c
Merge branch 'ab/various-leak-fixes'
2022-12-14 15:55:46 +09:00
revert.c
Merge branch 'ab/various-leak-fixes'
2022-12-14 15:55:46 +09:00
rm.c
submodule.c & submodule--helper: pass along "super_prefix" param
2022-12-26 10:21:43 +09:00
send-pack.c
doc txt & -h consistency: add missing options and labels
2022-10-13 09:32:56 -07:00
shortlog.c
shortlog: implement --group=committer in terms of --group=<format>
2022-10-24 14:48:05 -07:00
show-branch.c
Merge branch 'ab/doc-synopsis-and-cmd-usage'
2022-10-28 11:26:54 -07:00
show-index.c
…
show-ref.c
Merge branch 'ab/doc-synopsis-and-cmd-usage'
2022-10-28 11:26:54 -07:00
sparse-checkout.c
doc txt & -h consistency: use "<options>", not "<options>..."
2022-10-13 09:32:55 -07:00
stash.c
Merge branch 'ab/various-leak-fixes'
2022-12-14 15:55:46 +09:00
stripspace.c
i18n: remove from i18n strings that do not hold translatable parts
2022-02-04 13:58:28 -08:00
submodule--helper.c
*: fix typos which duplicate a word
2023-01-08 10:28:34 +09:00
symbolic-ref.c
Merge branch 'ab/doc-synopsis-and-cmd-usage'
2022-10-28 11:26:54 -07:00
tag.c
doc txt & -h consistency: add missing options and labels
2022-10-13 09:32:56 -07:00
unpack-file.c
unpack-file: fix ancient leak in create_temp_file()
2022-11-21 12:32:48 +09:00
unpack-objects.c
unpack-objects: use stream_loose_object() to unpack large objects
2022-06-13 10:22:36 -07:00
update-index.c
cocci: apply "pending" index-compatibility to some "builtin/*.c"
2022-11-21 12:06:15 +09:00
update-ref.c
…
update-server-info.c
doc txt & -h consistency: add missing options and labels
2022-10-13 09:32:56 -07:00
upload-archive.c
doc txt & -h consistency: fix mismatching labels
2022-10-13 09:32:56 -07:00
upload-pack.c
doc txt & -h consistency: add missing options and labels
2022-10-13 09:32:56 -07:00
var.c
var: add GIT_SEQUENCE_EDITOR variable
2022-12-18 11:48:26 +09:00
verify-commit.c
doc txt & -h consistency: add missing options and labels
2022-10-13 09:32:56 -07:00
verify-pack.c
doc txt & -h consistency: add or fix optional "--" syntax
2022-10-13 09:32:56 -07:00
verify-tag.c
doc txt & -h consistency: add missing options and labels
2022-10-13 09:32:56 -07:00
worktree.c
built-ins: use free() not UNLEAK() if trivial, rm dead code
2022-11-21 12:32:48 +09:00
write-tree.c
…