git/builtin
Derrick Stolee e24fde6bf1 fixup! reset: fix mixed reset when using virtual filesystem
This should fix #490, at least in the case that I've been able to
verify.

The issue is that reset was setting the skip-worktree bit more
frequently than it should have. The previous fix in #494 was focused on
the case where a file is added or removed across the diff. However, when
the file exists on both sides but still needs to be staged in a mixed
reset then we should avoid the skip-worktree bit.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
2024-06-03 21:17:10 +02:00
..
add.c add/rm: allow adding sparse entries when virtual 2024-05-14 20:10:10 +02:00
am.c
annotate.c
apply.c
archive.c
bisect.c
blame.c
branch.c
bugreport.c
bundle.c
cat-file.c
check-attr.c
check-ignore.c
check-mailmap.c
check-ref-format.c
checkout--worker.c
checkout-index.c
checkout.c Trace2:gvfs:experiment: capture more 'tracking' details 2024-05-14 20:10:00 +02:00
clean.c clean: suggest using `core.longPaths` if paths are too long to remove 2024-04-29 21:48:10 +02:00
clone.c Sync with 2.44.1 2024-04-29 20:42:30 +02:00
column.c
commit-graph.c
commit-tree.c
commit.c gvfs:trace2:data: status deserialization information 2024-05-14 20:09:59 +02:00
config.c
count-objects.c
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
describe.c
diagnose.c
diff-files.c
diff-index.c
diff-tree.c
diff.c
difftool.c Introduce helper to create symlinks that knows about index_state 2024-04-29 21:48:13 +02:00
fast-export.c
fast-import.c
fetch-pack.c
fetch.c fetch: reprepare packs before checking connectivity 2024-05-14 20:10:03 +02:00
fmt-merge-msg.c
for-each-ref.c
for-each-repo.c for-each-repo: optionally keep going on an error 2024-05-14 19:59:13 +02:00
fsck.c
fsmonitor--daemon.c
gc.c maintenance: add custom config to background jobs 2024-05-14 20:10:18 +02:00
get-tar-commit-id.c
grep.c
hash-object.c
help.c
hook.c
index-pack.c index-pack: disable rev-index if index file has non .idx suffix 2024-05-14 20:10:18 +02:00
init-db.c
interpret-trailers.c
log.c
ls-files.c
ls-remote.c
ls-tree.c
mailinfo.c
mailsplit.c
merge-base.c
merge-file.c
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c
merge.c
mktag.c
mktree.c
multi-pack-index.c
mv.c
name-rev.c
notes.c
pack-objects.c
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c
prune.c
pull.c
push.c
range-diff.c
read-tree.c
rebase.c
receive-pack.c Merge branch 'ps/run-auto-maintenance-in-receive-pack' 2024-04-23 15:05:56 -07:00
reflog.c
remote-ext.c
remote-fd.c
remote.c
repack.c
replace.c
replay.c
rerere.c
reset.c fixup! reset: fix mixed reset when using virtual filesystem 2024-06-03 21:17:10 +02:00
rev-list.c
rev-parse.c
revert.c
rm.c add/rm: allow adding sparse entries when virtual 2024-05-14 20:10:10 +02:00
send-pack.c
shortlog.c
show-branch.c
show-index.c
show-ref.c
sparse-checkout.c sparse-checkout: add config to disable deleting dirs 2024-05-14 20:10:11 +02:00
stash.c
stripspace.c
submodule--helper.c Sync with 2.44.1 2024-04-29 20:42:30 +02:00
symbolic-ref.c
tag.c
unpack-file.c
unpack-objects.c
update-index.c gvfs: block unsupported commands when running in a GVFS repo 2024-05-14 20:09:56 +02:00
update-microsoft-git.c update-microsoft-git: use brew on macOS 2024-05-14 20:10:05 +02:00
update-ref.c
update-server-info.c
upload-archive.c
upload-pack.c Sync with 2.44.1 2024-04-29 20:42:30 +02:00
var.c
verify-commit.c
verify-pack.c
verify-tag.c
worktree.c worktree: allow in Scalar repositories 2024-05-14 20:09:56 +02:00
write-tree.c