git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-21 05:20:18 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
a7c2daa06d6f7d8fd13a1d72f23741acbaeba522
git/builtin
History
Junio C Hamano a7c2daa06d Merge branch 'en/removing-untracked-fixes' 
Various fixes in code paths that move untracked files away to make room.

* en/removing-untracked-fixes:
  Documentation: call out commands that nuke untracked files/directories
  Comment important codepaths regarding nuking untracked files/dirs
  unpack-trees: avoid nuking untracked dir in way of locally deleted file
  unpack-trees: avoid nuking untracked dir in way of unmerged file
  Change unpack_trees' 'reset' flag into an enum
  Remove ignored files by default when they are in the way
  unpack-trees: make dir an internal-only struct
  unpack-trees: introduce preserve_ignored to unpack_trees_options
  read-tree, merge-recursive: overwrite ignored files by default
  checkout, read-tree: fix leak of unpack_trees_options.dir
  t2500: add various tests for nuking untracked files
2021-10-13 15:15:57 -07:00
..
add.c
Merge branch 'ds/add-rm-with-sparse-index'
2021-10-13 15:15:56 -07:00
am.c
Merge branch 'en/removing-untracked-fixes'
2021-10-13 15:15:57 -07: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
Merge branch 'rs/blame-optim'
2021-02-25 16:43:29 -08:00
branch.c
ref-filter: stop setting FILTER_REFS_INCLUDE_BROKEN
2021-09-27 12:36:45 -07:00
bugreport.c
use xopen() to handle fatal open(2) failures
2021-08-25 14:39:08 -07:00
bundle.c
Merge branch 'ab/bundle-remove-verbose-option'
2021-10-03 21:49:20 -07:00
cat-file.c
cat-file: merge two block into one
2021-06-04 07:50:26 +09: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
shortlog: remove unused(?) "repo-abbrev" feature
2021-01-12 14:04:42 -08:00
check-ref-format.c
…
checkout--worker.c
builtin/checkout--worker: zero-initialise struct to avoid MSAN complaints
2021-06-15 12:07:56 +09:00
checkout-index.c
Merge branch 'mt/parallel-checkout-part-3'
2021-05-16 21:05:23 +09:00
checkout.c
Change unpack_trees' 'reset' flag into an enum
2021-09-27 13:38:37 -07:00
clean.c
dir.[ch]: replace dir_init() with DIR_INIT
2021-07-01 12:32:22 -07:00
clone.c
Merge branch 'en/removing-untracked-fixes'
2021-10-13 15:15:57 -07:00
column.c
column: fix parsing of the '--nl' option
2021-08-26 14:36:27 -07:00
commit-graph.c
Merge branch 'tb/commit-graph-usage-fix'
2021-10-06 13:40:11 -07:00
commit-tree.c
use xopen() to handle fatal open(2) failures
2021-08-25 14:39:08 -07:00
commit.c
Merge branch 'ab/retire-advice-config'
2021-09-10 11:46:29 -07:00
config.c
config: unify code paths to get global config paths
2021-04-19 14:16:59 -07:00
count-objects.c
…
credential-cache--daemon.c
unix-socket: add backlog size option to unix_stream_listen()
2021-03-15 14:32:51 -07:00
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
…
describe.c
hash: provide per-algorithm null OIDs
2021-04-27 16:31:39 +09:00
diff-files.c
Merge branch 'jc/diffcore-rotate'
2021-02-25 16:43:30 -08:00
diff-index.c
diff-index: restore -c/--cc options handling
2021-09-07 11:11:35 -07:00
diff-tree.c
Merge branch 'jc/diffcore-rotate'
2021-02-25 16:43:30 -08:00
diff.c
Merge branch 'dl/diff-merge-base'
2021-07-28 13:17:59 -07:00
difftool.c
Merge branch 'da/difftool'
2021-10-11 10:21:48 -07:00
env--helper.c
…
fast-export.c
Merge branch 'tk/fast-export-anonymized-tag-fix'
2021-09-10 11:46:27 -07:00
fast-import.c
Use the final_oid_fn to finalize hashing of object IDs
2021-04-27 16:31:38 +09:00
fetch-pack.c
connect, transport: encapsulate arg in struct
2021-02-05 13:49:54 -08:00
fetch.c
Merge branch 'js/run-command-close-packs'
2021-09-20 15:20:45 -07:00
fmt-merge-msg.c
…
for-each-ref.c
ref-filter: stop setting FILTER_REFS_INCLUDE_BROKEN
2021-09-27 12:36:45 -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
Merge branch 'ab/fsck-api-cleanup'
2021-06-02 07:34:27 +09:00
gc.c
Merge branch 'ab/gc-remove-unused-call'
2021-09-23 13:44:46 -07:00
get-tar-commit-id.c
…
grep.c
repository: support unabsorbed in repo_submodule_init
2021-09-09 14:09:30 -07:00
hash-object.c
Merge branch 'jc/prefix-filename-allocates'
2021-09-15 13:15:28 -07:00
help.c
help: make sure local html page exists before calling external processes
2021-09-14 10:04:08 -07:00
index-pack.c
Merge branch 'rs/use-xopen-in-index-pack'
2021-09-23 13:44:50 -07:00
init-db.c
Merge branch 'mt/init-template-userpath-fix'
2021-05-25 16:21:20 +09:00
interpret-trailers.c
…
log.c
revision: separate walk and unsorted flags
2021-08-05 09:37:28 -07:00
ls-files.c
Merge branch 'jt/add-submodule-odb-clean-up'
2021-10-06 13:40:11 -07:00
ls-remote.c
ls-remote: set packet_trace_identity(<name>)
2021-08-24 14:47:07 -07: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
…
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 'en/removing-untracked-fixes'
2021-10-13 15:15:57 -07:00
mktag.c
fsck.c: add an fsck_set_msg_type() API that takes enums
2021-03-28 19:03:10 -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
Merge branch 'tb/midx-write-propagate-namehash'
2021-10-11 10:21:46 -07:00
mv.c
mv: refuse to move sparse paths
2021-09-28 10:31:02 -07:00
name-rev.c
oid_pos(): access table through const pointers
2021-01-28 12:03:26 -08:00
notes.c
use xopen() to handle fatal open(2) failures
2021-08-25 14:39:08 -07:00
pack-objects.c
Merge branch 'tb/pack-finalize-ordering'
2021-09-20 15:20:42 -07: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
…
prune-packed.c
…
prune.c
repack, prune: drop GIT_REF_PARANOIA settings
2021-09-27 12:36:45 -07:00
pull.c
Merge branch 'js/run-command-close-packs'
2021-09-20 15:20:45 -07:00
push.c
advice: remove read uses of most global advice_ variables
2021-08-25 12:07:52 -07:00
range-diff.c
column, range-diff: downcase option description
2021-03-29 14:06:08 -07:00
read-tree.c
Change unpack_trees' 'reset' flag into an enum
2021-09-27 13:38:37 -07:00
rebase.c
Merge branch 'pw/rebase-of-a-tag-fix'
2021-10-06 13:40:11 -07:00
receive-pack.c
Merge branch 'js/run-command-close-packs'
2021-09-20 15:20:45 -07:00
reflog.c
refs API: remove OID argument to reflog_expire()
2021-08-25 13:27:37 -07:00
remote-ext.c
…
remote-fd.c
…
remote.c
Merge branch 'ah/plugleaks'
2021-04-07 16:54:08 -07:00
repack.c
repack, prune: drop GIT_REF_PARANOIA settings
2021-09-27 12:36:45 -07:00
replace.c
advice: move advice.graftFileDeprecated squashing to commit.[ch]
2021-08-25 12:07:52 -07:00
rerere.c
xdiff users: use designated initializers for out_line
2021-05-11 12:47:31 +09:00
reset.c
Change unpack_trees' 'reset' flag into an enum
2021-09-27 13:38:37 -07:00
rev-list.c
rev-list: add option for --pretty=format without header
2021-07-12 10:12:31 -07: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 'ds/add-rm-with-sparse-index'
2021-10-13 15:15:56 -07:00
send-pack.c
send-pack: fix push.negotiate with remote helper
2021-07-15 11:58:52 -07:00
shortlog.c
Merge branch 'ab/mailmap'
2021-01-25 14:19:19 -08:00
show-branch.c
show-branch: simplify rev_is_head()
2021-08-27 14:12:15 -07:00
show-index.c
builtin/show-index: set the algorithm for object IDs
2021-04-27 16:31:39 +09:00
show-ref.c
refs: switch peel_ref() to peel_iterated_oid()
2021-01-21 15:51:31 -08:00
sparse-checkout.c
sparse-checkout: clear tracked sparse dirs
2021-09-07 22:41:10 -07:00
stash.c
Merge branch 'en/removing-untracked-fixes'
2021-10-13 15:15:57 -07:00
stripspace.c
…
submodule--helper.c
Merge branch 'en/removing-untracked-fixes'
2021-10-13 15:15:57 -07:00
symbolic-ref.c
symbolic-ref: don't leak shortened refname in check_symref()
2021-03-14 15:57:59 -07:00
tag.c
Merge branch 'rs/xopen-reports-open-failures'
2021-09-08 13:30:32 -07:00
unpack-file.c
…
unpack-objects.c
hash: provide per-algorithm null OIDs
2021-04-27 16:31:39 +09:00
update-index.c
use xopen() to handle fatal open(2) failures
2021-08-25 14:39:08 -07: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-pack.c
upload-pack: document and rename --advertise-refs
2021-08-05 08:59:37 -07:00
var.c
…
verify-commit.c
…
verify-pack.c
…
verify-tag.c
…
worktree.c
worktree: teach add to accept --reason <string> with --lock
2021-07-15 13:30:59 -07:00
write-tree.c
…