admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f27c170f645e6b8ed642c49c503964893ee26a4f
git/builtin
History
Victoria Dye f27c170f64 read-tree: make three-way merge sparse-aware 
Enable use of 'merged_sparse_dir' in 'threeway_merge'. As with two-way
merge, the contents of each conflicted sparse directory are merged without
referencing the index, avoiding sparse index expansion.

As with two-way merge, the 't/t1092-sparse-checkout-compatibility.sh' test
'read-tree --merge with edit/edit conflicts in sparse directories' confirms
that three-way merges with edit/edit changes (both with and without
conflicts) inside a sparse directory result in the correct index state or
error message. To ensure the index is not unnecessarily expanded, add
three-way merge cases to 'sparse index is not expanded: read-tree'.

Signed-off-by: Victoria Dye <vdye@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-01 12:36:01 -08:00
..
add.c
add: remove support for git-legacy-stash
2022-01-27 18:00:15 -08:00
am.c
Merge branch 'ab/config-based-hooks-2'
2022-02-09 14:21:00 -08:00
annotate.c
…
apply.c
…
archive.c
use xopen() to handle fatal open(2) failures
2021-08-25 14:39:08 -07:00
bisect--helper.c
bisect--helper: add space between colon and following sentence
2021-10-01 15:47:53 -07:00
blame.c
log: add a --no-graph option
2022-02-11 10:06:41 -08:00
branch.c
Merge branch 'gc/branch-recurse-submodules'
2022-02-18 13:53:29 -08:00
bugreport.c
hook-list.h: add a generated list of hooks, like config-list.h
2021-09-27 09:44:54 -07:00
bundle.c
Merge branch 'ab/bundle-remove-verbose-option'
2021-10-03 21:49:20 -07:00
cat-file.c
cat-file: s/_/-/ in typo'd usage_msg_optf() message
2022-01-12 10:12:39 -08:00
check-attr.c
…
check-ignore.c
dir.[ch]: replace dir_init() with DIR_INIT
2021-07-01 12:32:22 -07:00
check-mailmap.c
…
check-ref-format.c
…
checkout--worker.c
pkt-line.[ch]: remove unused packet_read_line_buf()
2021-10-15 13:09:40 -07:00
checkout-index.c
checkout-index: integrate with sparse index
2022-01-13 13:49:45 -08:00
checkout.c
Merge branch 'js/short-help-outside-repo-fix'
2022-02-18 13:53:30 -08:00
clean.c
Merge branch 'vd/sparse-clean-etc'
2022-02-17 16:25:05 -08:00
clone.c
Merge branch 'ab/release-transport-ls-refs-options'
2022-02-18 13:53:29 -08:00
column.c
column: fix parsing of the '--nl' option
2021-08-26 14:36:27 -07:00
commit-graph.c
Merge branch 'ab/ignore-replace-while-working-on-commit-graph'
2021-11-01 13:48:08 -07:00
commit-tree.c
use xopen() to handle fatal open(2) failures
2021-08-25 14:39:08 -07:00
commit.c
i18n: turn even more messages into "cannot be used together" ones
2022-01-05 13:31:00 -08:00
config.c
urlmatch.[ch]: add and use URLMATCH_CONFIG_INIT
2021-10-01 14:22:51 -07:00
count-objects.c
…
credential-cache--daemon.c
…
credential-cache.c
credential-cache: check for windows specific errors
2021-09-14 09:30:54 -07:00
credential-store.c
Use a better name for the function interpolating paths
2021-07-26 12:17:16 -07:00
credential.c
doc: fix git credential synopsis
2021-10-28 09:57:09 -07:00
describe.c
i18n: turn even more messages into "cannot be used together" ones
2022-01-05 13:31:00 -08:00
diff-files.c
…
diff-index.c
diff-index: restore -c/--cc options handling
2021-09-07 11:11:35 -07:00
diff-tree.c
i18n: refactor "foo and bar are mutually exclusive"
2022-01-05 13:29:23 -08:00
diff.c
builtin/diff.c: fix "git-diff" usage string typo
2022-02-02 11:30:53 -08:00
difftool.c
i18n: turn "options are incompatible" into "cannot be used together"
2022-01-05 13:29:23 -08:00
env--helper.c
…
fast-export.c
Merge branch 'ja/i18n-similar-messages'
2022-01-10 11:52:56 -08:00
fast-import.c
usage.c API users: use die_message() for "fatal :" + exit 128
2021-12-07 13:25:15 -08:00
fetch-pack.c
…
fetch.c
Merge branch 'ps/fetch-optim-with-commit-graph'
2022-02-23 16:58:03 -08:00
fmt-merge-msg.c
merge: allow to pretend a merge is made into a different branch
2021-12-20 14:55:02 -08:00
for-each-ref.c
for-each-ref: delay parsing of --sort=<atom> options
2021-10-20 14:33:07 -07:00
for-each-repo.c
builtin/for-each-repo: remove unnecessary argv copy to plug leak
2021-07-26 12:19:20 -07:00
fsck.c
run-command API users: use strvec_pushl(), not argv construction
2021-11-25 22:15:07 -08:00
gc.c
Merge branch 'ab/config-based-hooks-2'
2022-02-09 14:21:00 -08:00
get-tar-commit-id.c
…
grep.c
grep: fix a "path_list" memory leak
2021-10-23 10:45:25 -07:00
hash-object.c
hash-object: fix a trivial leak in --path
2022-02-06 17:55:55 -08:00
help.c
run-command API users: use strvec_pushl(), not argv construction
2021-11-25 22:15:07 -08:00
hook.c
git hook run: add an --ignore-missing flag
2022-01-07 15:19:34 -08:00
index-pack.c
i18n: factorize "--foo requires --bar" and the like
2022-01-05 13:31:00 -08:00
init-db.c
i18n: refactor "foo and bar are mutually exclusive"
2022-01-05 13:29:23 -08:00
interpret-trailers.c
…
log.c
Merge branch 'en/remerge-diff'
2022-02-16 15:14:29 -08:00
ls-files.c
Merge branch 'ja/i18n-similar-messages'
2022-01-10 11:52:56 -08:00
ls-remote.c
ls-remote & transport API: release "struct transport_ls_refs_options"
2022-02-06 18:02:34 -08:00
ls-tree.c
tree.h API: simplify read_tree_recursive() signature
2021-03-20 16:09:26 -07:00
mailinfo.c
mailinfo: allow squelching quoted CRLF warning
2021-05-10 15:06:22 +09:00
mailsplit.c
use xopen() to handle fatal open(2) failures
2021-08-25 14:39:08 -07:00
merge-base.c
…
merge-file.c
xdiff: implement a zealous diff3, or "zdiff3"
2021-12-01 14:45:58 -08:00
merge-index.c
merge-index: ensure full index
2021-04-14 13:47:21 -07:00
merge-ours.c
builtins + test helpers: use return instead of exit() in cmd_*
2021-06-09 09:15:58 +09:00
merge-recursive.c
…
merge-tree.c
xdiff users: use designated initializers for out_line
2021-05-11 12:47:31 +09:00
merge.c
Merge branch 'pw/use-in-process-checkout-in-rebase'
2022-02-18 13:53:27 -08:00
mktag.c
fsck: report invalid object type-path combinations
2021-10-01 15:06:01 -07:00
mktree.c
builtins + test helpers: use return instead of exit() in cmd_*
2021-06-09 09:15:58 +09:00
multi-pack-index.c
builtin/multi-pack-index.c: don't leak concatenated options
2021-10-28 15:32:14 -07:00
mv.c
mv: refuse to move sparse paths
2021-09-28 10:31:02 -07:00
name-rev.c
name-rev.c: use strbuf_getline instead of limited size buffer
2022-01-10 09:39:26 -08:00
notes.c
Merge branch 'ab/usage-die-message'
2022-01-10 11:52:53 -08:00
pack-objects.c
checkout/fetch/pull/pack-objects: allow -h outside a repository
2022-02-08 09:54:44 -08:00
pack-redundant.c
builtin/pack-redundant: avoid casting buffers to struct object_id
2021-04-27 16:31:38 +09:00
pack-refs.c
…
patch-id.c
patch-id: fix scan_hunk_header on diffs with 1 line of before/after
2022-02-02 11:24:23 -08:00
prune-packed.c
…
prune.c
Merge branch 'ns/tmp-objdir'
2022-01-03 16:24:15 -08:00
pull.c
Merge branch 'js/short-help-outside-repo-fix'
2022-02-18 13:53:30 -08:00
push.c
i18n: turn "options are incompatible" into "cannot be used together"
2022-01-05 13:29:23 -08:00
range-diff.c
column, range-diff: downcase option description
2021-03-29 14:06:08 -07:00
read-tree.c
read-tree: make three-way merge sparse-aware
2022-03-01 12:36:01 -08:00
rebase.c
Merge branch 'pw/use-in-process-checkout-in-rebase'
2022-02-18 13:53:27 -08:00
receive-pack.c
Merge branch 'cb/clear-quarantine-early-on-all-ref-update-errors'
2022-02-18 13:53:27 -08:00
reflog.c
builtin/reflog.c: use parse-options api for expire, delete subcommands
2022-01-10 14:13:06 -08:00
remote-ext.c
…
remote-fd.c
…
remote.c
Merge branch 'ab/designated-initializers-more'
2021-10-18 15:47:57 -07:00
repack.c
Merge branch 'ja/i18n-similar-messages'
2022-01-10 11:52:56 -08:00
replace.c
run-command API users: use strvec_pushl(), not argv construction
2021-11-25 22:15:07 -08:00
rerere.c
xdiff users: use designated initializers for out_line
2021-05-11 12:47:31 +09:00
reset.c
Merge branch 'vd/sparse-clean-etc'
2022-02-17 16:25:05 -08:00
rev-list.c
i18n: turn even more messages into "cannot be used together" ones
2022-01-05 13:31:00 -08:00
rev-parse.c
refs: drop "broken" flag from for_each_fullref_in()
2021-09-27 12:36:45 -07:00
revert.c
Merge branch 'ds/mergies-with-sparse-index'
2021-09-20 15:20:45 -07:00
rm.c
Merge branch 'ja/i18n-similar-messages'
2022-01-10 11:52:56 -08:00
send-pack.c
Merge branch 'jk/http-push-status-fix'
2021-10-29 15:43:12 -07:00
shortlog.c
log: add a --no-graph option
2022-02-11 10:06:41 -08:00
show-branch.c
i18n: turn "options are incompatible" into "cannot be used together"
2022-01-05 13:29:23 -08:00
show-index.c
builtin/show-index: set the algorithm for object IDs
2021-04-27 16:31:39 +09:00
show-ref.c
…
sparse-checkout.c
Merge branch 'en/sparse-checkout-leakfix'
2022-02-11 16:56:01 -08:00
stash.c
Merge branch 'js/no-more-legacy-stash'
2022-02-16 15:14:30 -08:00
stripspace.c
…
submodule--helper.c
Merge branch 'gc/branch-recurse-submodules'
2022-02-18 13:53:29 -08:00
symbolic-ref.c
…
tag.c
i18n: tag.c factorize i18n strings
2022-01-05 13:31:00 -08:00
unpack-file.c
…
unpack-objects.c
hash: provide per-algorithm null OIDs
2021-04-27 16:31:39 +09:00
update-index.c
Merge branch 'vd/sparse-clean-etc'
2022-02-17 16:25:05 -08:00
update-ref.c
update-ref: fix streaming of status updates
2021-09-03 11:35:15 -07:00
update-server-info.c
…
upload-archive.c
upload-archive: use regular "struct child_process" pattern
2021-11-25 22:15:07 -08:00
upload-pack.c
upload-pack: document and rename --advertise-refs
2021-08-05 08:59:37 -07:00
var.c
var: add GIT_DEFAULT_BRANCH variable
2021-11-03 13:25:36 -07:00
verify-commit.c
…
verify-pack.c
…
verify-tag.c
…
worktree.c
Merge branch 'ab/config-based-hooks-2'
2022-02-09 14:21:00 -08:00
write-tree.c
…