Junio C Hamano 3d8f81f21b Merge branch 'sa/credential-store-timeout' ...

Multiple "credential-store" backends can race to lock the same
file, causing everybody else but one to fail---reattempt locking
with some timeout to reduce the rate of the failure.

* sa/credential-store-timeout:
  crendential-store: use timeout when locking file

2020-11-30 14:49:45 -08:00

..

add.c

drop unused argc parameters

2020-09-30 12:53:47 -07:00

am.c

Merge branch 'jk/committer-date-is-author-date-fix-simplify'

2020-11-09 14:06:28 -08:00

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

Merge branch 'mr/bisect-in-c-3'

2020-11-09 14:06:25 -08:00

blame.c

blame: simplify 'setup_blame_bloom_data' interface

2020-11-01 15:54:15 -08:00

branch.c

ref-filter: allow merged and no-merged filters

2020-09-16 12:38:10 -07:00

bugreport.c

…

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

checkout-index: propagate errors to exit code

2020-10-27 12:41:56 -07:00

checkout.c

Merge branch 'rs/clear-commit-marks-in-repo'

2020-11-11 13:18:37 -08:00

clean.c

quote_path: give flags parameter to quote_path()

2020-09-10 10:49:19 -07:00

clone.c

Merge branch 'sb/clone-origin'

2020-10-27 15:09:50 -07:00

column.c

…

commit-graph.c

assert PARSE_OPT_NONEG in parse-options callbacks

2020-09-30 12:53:47 -07:00

commit-tree.c

…

commit.c

Documentation: stylistically normalize references to Signed-off-by:

2020-10-20 11:57:40 -07:00

config.c

Merge branch 'ls/mergetool-meld-auto-merge'

2020-09-22 12:36:29 -07:00

count-objects.c

…

credential-cache--daemon.c

…

credential-cache.c

Merge branch 'jc/undash-in-tree-git-callers'

2020-09-03 12:37:03 -07:00

credential-store.c

crendential-store: use timeout when locking file

2020-11-25 12:30:18 -08:00

credential.c

credential: load default config

2020-10-16 12:30:45 -07:00

describe.c

…

diff-files.c

…

diff-index.c

builtin/diff-index: learn --merge-base

2020-09-20 21:30:26 -07:00

diff-tree.c

builtin/diff-tree: learn --merge-base

2020-09-21 13:37:03 -07:00

diff.c

Merge branch 'dl/diff-merge-base'

2020-11-02 13:17:39 -08:00

difftool.c

Use new HASHMAP_INIT macro to simplify hashmap initialization

2020-11-11 12:55:27 -08:00

env--helper.c

assert PARSE_OPT_NONEG in parse-options callbacks

2020-09-30 12:53:47 -07:00

fast-export.c

Merge branch 'js/default-branch-name-part-2'

2020-10-05 14:01:50 -07:00

fast-import.c

Merge branch 'jk/fast-import-marks-cleanup'

2020-11-02 13:17:40 -08:00

fetch-pack.c

…

fetch.c

hashmap: provide deallocation function names

2020-11-02 12:15:50 -08:00

fmt-merge-msg.c

…

for-each-ref.c

ref-filter: allow merged and no-merged filters

2020-09-16 12:38:10 -07:00

for-each-repo.c

for-each-repo: run subcommands on configured repos

2020-09-25 10:59:44 -07:00

fsck.c

…

gc.c

Merge branch 'ab/gc-keep-base-option'

2020-11-30 14:49:43 -08:00

get-tar-commit-id.c

…

grep.c

grep: handle deref_tag() returning NULL

2020-10-12 12:25:14 -07:00

hash-object.c

…

help.c

…

index-pack.c

compute pack .idx byte offsets using size_t

2020-11-16 13:41:35 -08:00

init-db.c

builtin/clone: avoid failure with GIT_DEFAULT_HASH

2020-09-22 09:22:32 -07:00

interpret-trailers.c

…

log.c

Merge branch 'jc/format-patch-name-max'

2020-11-21 15:14:38 -08:00

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-base, xdiff: zero out xpparam_t structures

2020-10-20 12:53:26 -07:00

merge.c

Merge branch 'en/merge-ort-api-null-impl'

2020-11-18 13:32:53 -08:00

mktag.c

…

mktree.c

…

multi-pack-index.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

…

pack-redundant.c

use size_t to store pack .idx byte offsets

2020-11-16 13:41:35 -08:00

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

pull.c

Merge branch 'js/pull-rebase-use-advise'

2020-11-30 14:49:42 -08:00

push.c

Merge branch 'sk/force-if-includes'

2020-10-27 15:09:49 -07:00

range-diff.c

…

read-tree.c

…

rebase.c

Merge branch 'en/merge-ort-api-null-impl'

2020-11-18 13:32:53 -08:00

receive-pack.c

receive-pack: use default version 0 for proc-receive

2020-11-11 12:46:56 -08:00

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'ab/git-remote-exit-code'

2020-11-09 14:06:26 -08:00

repack.c

Merge branch 'tb/repack-clearing-midx'

2020-09-09 13:53:06 -07:00

replace.c

…

rerere.c

…

reset.c

…

rev-list.c

…

rev-parse.c

rev-parse: handle --end-of-options

2020-11-10 13:46:27 -08:00

revert.c

Merge branch 'en/merge-ort-api-null-impl'

2020-11-18 13:32:53 -08:00

rm.c

…

send-pack.c

push: parse and set flag for "--force-if-includes"

2020-10-03 09:59:19 -07:00

shortlog.c

shortlog: use strset from strmap.h

2020-11-11 12:55:27 -08:00

show-branch.c

Merge branch 'jt/interpret-branch-name-fallback'

2020-09-09 13:53:09 -07:00

show-index.c

…

show-ref.c

…

sparse-checkout.c

sparse-checkout: fill in some options boilerplate

2020-09-30 12:53:48 -07:00

stash.c

Merge branch 'km/stash-error-message-fix'

2020-11-30 14:49:45 -08:00

stripspace.c

…

submodule--helper.c

doc: fix the bnf like style of some commands

2020-10-08 14:01:19 -07:00

symbolic-ref.c

…

tag.c

ref-filter: allow merged and no-merged filters

2020-09-16 12:38:10 -07:00

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

upload-pack.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

Merge branch 'mt/worktree-error-message-fix'

2020-11-30 14:49:43 -08:00

write-tree.c

…