Junio C Hamano e61304f21d Merge branch 'en/stash-df-fix' into maint ...

"git stash", where the tentative change involves changing a
directory to a file (or vice versa), was confused, which has been
corrected.

* en/stash-df-fix:
  stash: restore untracked files AFTER restoring tracked files
  stash: avoid feeding directories to update-index
  t3903: document a pair of directory/file bugs

2021-10-12 13:51:47 -07:00

..

add.c

use xopen() to handle fatal open(2) failures

2021-08-25 14:39:08 -07:00

am.c

am: fix incorrect exit status on am fail to abort

2021-09-10 15:51:15 -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

*.c static functions: add missing __attribute__((format))

2021-07-13 15:20:20 -07:00

blame.c

Merge branch 'rs/blame-optim'

2021-02-25 16:43:29 -08:00

branch.c

branch: allow deleting dangling branches with --force

2021-08-27 15:11:18 -07:00

bugreport.c

use xopen() to handle fatal open(2) failures

2021-08-25 14:39:08 -07:00

bundle.c

bundle: remove "ref_list" in favor of string-list.c API

2021-07-06 12:10:17 -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

checkout: make delayed checkout respect --quiet and --no-progress

2021-08-26 23:15:33 -07:00

clean.c

dir.[ch]: replace dir_init() with DIR_INIT

2021-07-01 12:32:22 -07:00

clone.c

Merge branch 'jk/clone-clean-upon-transport-error'

2021-06-14 13:33:26 +09:00

column.c

column: fix parsing of the '--nl' option

2021-08-26 14:36:27 -07:00

commit-graph.c

builtin/*: update usage format

2021-01-06 15:10:49 -08:00

commit-tree.c

use xopen() to handle fatal open(2) failures

2021-08-25 14:39:08 -07:00

commit.c

commit: restore --edit when combined with --fixup

2021-08-15 09:44:08 -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

unix-socket: disallow chdir() when creating unix domain sockets

2021-03-15 14:32:51 -07:00

credential-store.c

…

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 'ab/cmd-foo-should-return'

2021-07-08 13:15:04 -07:00

env--helper.c

…

fast-export.c

Merge branch 'tk/fast-export-anonymized-tag-fix' into maint

2021-10-12 13:51:43 -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 'jt/push-negotiation-fixes' into maint

2021-10-12 13:51:36 -07:00

fmt-merge-msg.c

…

for-each-ref.c

Merge branch 'ah/plugleaks'

2021-05-07 12:47:41 +09: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-log-rephrase' into maint

2021-10-12 13:51:30 -07:00

get-tar-commit-id.c

…

grep.c

dir.[ch]: replace dir_init() with DIR_INIT

2021-07-01 12:32:22 -07:00

hash-object.c

Merge branch 'jc/prefix-filename-allocates' into maint

2021-10-12 13:51:32 -07:00

help.c

help: convert git_cmd to page in one place

2021-07-06 13:09:20 -07:00

index-pack.c

Merge branch 'tb/pack-finalize-ordering' into maint

2021-10-12 13:51:46 -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

Merge branch 'jk/log-decorate-optim'

2021-07-28 13:17:58 -07:00

ls-files.c

dir.[ch]: replace dir_init() with DIR_INIT

2021-07-01 12:32:22 -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/pull-conflicting-options' into maint

2021-10-12 13:51:36 -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

multi-pack-index: fix potential segfault without sub-command

2021-07-19 15:24:01 -07:00

mv.c

builtin/mv: free or UNLEAK multiple pointers at end of cmd_mv

2021-07-26 12:19:20 -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' into maint

2021-10-12 13:51:46 -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

…

pull.c

pull: fix handling of multiple heads

2021-07-22 11:54:30 -07:00

push.c

push: don't get a full remote object

2021-06-02 10:12:03 +09:00

range-diff.c

column, range-diff: downcase option description

2021-03-29 14:06:08 -07:00

read-tree.c

…

rebase.c

Merge branch 'ab/rebase-fatal-fatal-fix' into maint

2021-10-12 13:51:27 -07:00

receive-pack.c

*.c static functions: don't forward-declare __attribute__

2021-07-12 12:09:53 -07:00

reflog.c

reflog expire --stale-fix: be generous about missing objects

2021-02-11 09:21:52 -08:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'ah/plugleaks'

2021-04-07 16:54:08 -07:00

repack.c

builtin/repack.c: move .idx files into place last

2021-09-09 18:23:11 -07:00

replace.c

…

rerere.c

xdiff users: use designated initializers for out_line

2021-05-11 12:47:31 +09:00

reset.c

reset: free instead of leaking unneeded ref

2021-03-14 15:57:59 -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

rev-parse: mark die() messages for translation

2021-05-17 18:39:53 +09:00

revert.c

sequencer: fix edit handling for cherry-pick and revert messages

2021-03-31 14:10:50 -07:00

rm.c

Merge branch 'ah/plugleaks'

2021-05-07 12:47:41 +09: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

use fspathhash() everywhere

2021-07-30 12:14:27 -07:00

stash.c

stash: restore untracked files AFTER restoring tracked files

2021-09-10 15:46:34 -07:00

stripspace.c

…

submodule--helper.c

Merge branch 'ah/plugleaks'

2021-08-04 13:28:52 -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

use xopen() to handle fatal open(2) failures

2021-08-25 14:39:08 -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

…

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

…