Find a file
Patrick Steinhardt d2058cb2f0 builtin/stash: report failure to write to index
The git-stash(1) command needs to write to the index for many of its
operations. When the index is locked by a concurrent writer it will thus
fail to operate, which is expected. What is not expected though is that
we do not print any error message at all in this case. The user can thus
easily miss the fact that the command didn't do what they expected it to
do and would be left wondering why that is.

Fix this bug and report failures to write to the index. Add tests for
the subcommands which hit the respective code paths.

While at it, unify error messages when writing to the index fails. The
chosen error message is already used in "builtin/stash.c".

Reported-by: moti sd <motisd8@gmail.com>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-02-06 12:08:38 -08:00
.github ci: upgrade to using macos-13 2023-11-03 18:52:02 +09:00
block-sha1
builtin builtin/stash: report failure to write to index 2024-02-06 12:08:38 -08:00
ci ci: upgrade to using macos-13 2023-11-03 18:52:02 +09:00
compat Merge branch 'jk/fsmonitor-unused-parameter' 2023-09-29 09:04:14 -07:00
contrib Merge branch 'jc/test-i18ngrep' 2023-11-08 11:04:02 +09:00
Documentation Git 2.43 2023-11-20 10:28:15 +09:00
ewah
git-gui Merge git-gui into ml/git-gui-exec-path-fix 2023-09-18 10:52:30 -07:00
gitk-git
gitweb
mergetools
negotiator negotiator/noop: mark unused callback parameters 2023-08-29 17:56:25 -07:00
oss-fuzz
perl
po Merge branch 'l10n/zh-TW/2023-11-19' of github.com:l10n-tw/git-po 2023-11-20 07:57:09 +08:00
refs files-backend.c: avoid stat in 'loose_fill_ref_dir' 2023-10-09 15:53:14 -07:00
reftable
sha1
sha1collisiondetection@855827c583
sha1dc
sha256 Merge branch 'ew/hash-with-openssl-evp' 2023-08-09 16:18:15 -07:00
t builtin/stash: report failure to write to index 2024-02-06 12:08:38 -08:00
templates
trace2 trace2: mark unused config callback parameter 2023-08-29 17:56:25 -07:00
xdiff
.cirrus.yml
.clang-format clang-format: fix typo in comment 2023-11-01 12:24:19 +09:00
.editorconfig
.gitattributes
.gitignore
.gitmodules
.mailmap mailmap: change primary address for Derrick Stolee 2023-10-12 10:59:36 -07:00
.tsan-suppressions
abspath.c
abspath.h
aclocal.m4
add-interactive.c Merge branch 'jk/unused-post-2.42' 2023-09-07 15:06:07 -07:00
add-interactive.h
add-patch.c
advice.c
advice.h
alias.c
alias.h
alloc.c
alloc.h
apply.c
apply.h
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c Merge branch 'jc/attr-tree-config' 2023-10-30 07:09:55 +09:00
attr.h attr: add attr.tree for setting the treeish to read attributes from 2023-10-13 11:43:29 -07:00
banned.h
base85.c
base85.h
bisect.c
bisect.h
blame.c
blame.h
blob.c
blob.h
bloom.c commit-graph: detect out-of-order BIDX offsets 2023-10-09 15:55:02 -07:00
bloom.h
branch.c branch: error message checking out a branch in use 2023-08-08 18:27:30 -07:00
branch.h
builtin.h
bulk-checkin.c Merge branch 'eb/limit-bulk-checkin-to-blobs' 2023-10-10 11:39:14 -07:00
bulk-checkin.h bulk-checkin: only support blobs in index_bulk_checkin 2023-09-26 10:17:56 -07:00
bundle-uri.c bundle-uri: mark unused parameters in callbacks 2023-08-29 17:56:26 -07:00
bundle-uri.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cbtree.c
cbtree.h
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c
checkout.h
chunk-format.c chunk-format: drop pair_chunk_unsafe() 2023-10-09 15:55:02 -07:00
chunk-format.h chunk-format: drop pair_chunk_unsafe() 2023-10-09 15:55:02 -07:00
CODE_OF_CONDUCT.md
color.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-graph.c Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence' 2023-11-08 11:03:59 +09:00
commit-graph.h Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence' 2023-11-08 11:03:59 +09:00
commit-reach.c commit-reach: free temporary list in get_octopus_merge_bases() 2023-10-03 14:28:23 -07:00
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c commit: detect commits that exist in commit-graph but not in the ODB 2023-11-01 12:04:06 +09:00
commit.h
common-main.c
config.c Merge branch 'jc/attr-tree-config' 2023-10-30 07:09:55 +09:00
config.h parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
config.mak.dev
config.mak.in
config.mak.uname win32: add a helper to run git.exe without a foreground window 2023-08-09 13:58:13 -07:00
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
copy.h
COPYING
credential.c credential: mark unused parameter in urlmatch callback 2023-08-29 17:56:26 -07:00
credential.h
csum-file.c Merge branch 'ew/hash-with-openssl-evp' 2023-09-13 10:07:57 -07:00
csum-file.h
ctype.c
daemon.c daemon: free listen_addr before returning 2023-10-05 14:54:58 -07:00
date.c
date.h
decorate.c decorate: add clear_decoration() function 2023-10-05 14:54:55 -07:00
decorate.h decorate: add clear_decoration() function 2023-10-05 14:54:55 -07:00
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diagnose.c dir.[ch]: add 'follow_symlink' arg to 'get_dtype' 2023-10-09 15:53:13 -07:00
diagnose.h
diff-delta.c
diff-lib.c Merge branch 'js/diff-cached-fsmonitor-fix' into maint-2.42 2023-11-02 16:53:19 +09:00
diff-merges.c diff-merges: introduce '--dd' option 2023-10-09 12:47:29 -07:00
diff-merges.h
diff-no-index.c Merge branch 'pw/diff-no-index-from-named-pipes' into maint-2.42 2023-11-02 16:53:18 +09:00
diff.c Merge branch 'jk/diff-result-code-cleanup' into maint-2.42 2023-11-02 16:53:16 +09:00
diff.h diff --stat: set the width defaults in a helper function 2023-09-29 15:46:06 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore-rotate.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c dir.[ch]: add 'follow_symlink' arg to 'get_dtype' 2023-10-09 15:53:13 -07:00
dir.h dir.[ch]: add 'follow_symlink' arg to 'get_dtype' 2023-10-09 15:53:13 -07:00
editor.c
editor.h
entry.c wrapper: reduce scope of remove_or_warn() 2023-09-29 15:14:56 -07:00
entry.h wrapper: reduce scope of remove_or_warn() 2023-09-29 15:14:56 -07:00
environment.c max_tree_depth: lower it for MSVC to avoid stack overflows 2023-11-02 08:58:28 +09:00
environment.h add core.maxTreeDepth config 2023-08-31 15:51:07 -07:00
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'ts/unpacklimit-config-fix' into maint-2.42 2023-11-02 16:53:16 +09:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c fsck: detect very large tree pathnames 2023-08-31 15:51:07 -07:00
fsck.h fsck: detect very large tree pathnames 2023-08-31 15:51:07 -07:00
fsmonitor--daemon.h doc: fix some typos, grammar and wording issues 2023-10-05 12:55:38 -07:00
fsmonitor-ipc.c fsmonitor: mark unused parameters in stub functions 2023-09-18 15:56:15 -07:00
fsmonitor-ipc.h
fsmonitor-ll.h
fsmonitor-path-utils.h
fsmonitor-settings.c fsmonitor: mark some maybe-unused parameters 2023-09-18 15:56:14 -07:00
fsmonitor-settings.h
fsmonitor.c
fsmonitor.h
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h
git-archimport.perl
git-compat-util.h Merge branch 'mp/rebase-label-length-limit' into maint-2.42 2023-11-02 16:53:14 +09:00
git-curl-compat.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py git-p4 shouldn't attempt to store symlinks in LFS 2023-10-19 10:57:44 -07:00
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl Merge branch 'tz/send-email-helpfix' 2023-11-20 09:57:22 +09:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl git-svn: drop FakeTerm hack 2023-08-30 17:20:31 -07:00
GIT-VERSION-GEN Git 2.43 2023-11-20 10:28:15 +09:00
git-web--browse.sh
git-zlib.c
git-zlib.h
git.c
git.rc
gpg-interface.c
gpg-interface.h
graph.c diff --stat: add config option to limit filename width 2023-09-18 09:39:07 -07:00
graph.h
grep.c grep: mark unused parmaeters in pcre fallbacks 2023-08-29 17:56:26 -07:00
grep.h
hash-ll.h Merge branch 'ew/hash-with-openssl-evp' 2023-08-09 16:18:15 -07:00
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c
help.h
hex-ll.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex-ll.h hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex.h hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hook.c
hook.h
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'jk/redact-h2h3-headers-fix' into maint-2.42 2023-11-02 16:53:19 +09:00
http.h
ident.c Merge branch 'bc/ident-dot-is-no-longer-crud-letter' 2023-08-09 16:18:15 -07:00
ident.h
imap-send.c imap-send: mark unused parameters with NO_OPENSSL 2023-08-29 17:56:26 -07:00
INSTALL
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c revision: clear decoration structs during release_revisions() 2023-10-05 14:54:57 -07:00
line-log.h revision: clear decoration structs during release_revisions() 2023-10-05 14:54:57 -07:00
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c
list-objects-filter-options.h
list-objects-filter.c
list-objects-filter.h
list-objects.c Merge branch 'tb/rev-list-unpacked-fix' 2023-11-08 15:04:42 +09:00
list-objects.h
list.h
lockfile.c
lockfile.h
log-tree.c decorate: use commit color for HEAD arrow 2023-08-21 11:40:10 -07:00
log-tree.h pretty: add pointer and tag options to %(decorate) 2023-08-21 11:40:10 -07:00
ls-refs.c
ls-refs.h
mailinfo.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
mailinfo.h
mailmap.c
mailmap.h
Makefile Merge branch 'bc/racy-4gb-files' 2023-10-23 13:56:37 -07:00
match-trees.c
match-trees.h
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ll.c
merge-ll.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c Merge branch 'wx/merge-ort-comment-typofix' into maint-2.42 2023-11-02 16:53:27 +09:00
merge-ort.h
merge-recursive.c merge: introduce {copy|clear}_merge_options() 2023-10-11 13:37:47 -07:00
merge-recursive.h merge: introduce {copy|clear}_merge_options() 2023-10-11 13:37:47 -07:00
merge.c
merge.h
mergesort.h
midx.c midx: check size of revindex chunk 2023-10-09 15:55:01 -07:00
midx.h midx: check size of revindex chunk 2023-10-09 15:55:01 -07:00
name-hash.c
name-hash.h
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-file.c bulk-checkin: only support blobs in index_bulk_checkin 2023-09-26 10:17:56 -07:00
object-file.h
object-name.c
object-name.h
object-store-ll.h
object-store.h
object.c
object.h
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c pack-bitmap-write: rebuild using new bitmap when remapping 2023-10-02 14:54:30 -07:00
pack-bitmap.c Merge branch 'tb/rev-list-unpacked-fix' 2023-11-08 15:04:42 +09:00
pack-bitmap.h
pack-check.c
pack-mtimes.c
pack-mtimes.h
pack-objects.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
pack-objects.h
pack-revindex.c Merge branch 'jk/chunk-bounds' 2023-10-23 13:56:36 -07:00
pack-revindex.h
pack-write.c
pack.h
packfile.c
packfile.h
pager.c
pager.h
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c parse-options: mark unused parameters in noop callback 2023-09-05 14:48:17 -07:00
parse-options.c parse-options: make CMDMODE errors more precise 2023-10-29 09:15:18 +09:00
parse-options.h parse-options: make CMDMODE errors more precise 2023-10-29 09:15:18 +09:00
parse.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
parse.h parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
path.h
pathspec.c grep: die gracefully when outside repository 2023-10-20 11:06:45 -07:00
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
preload-index.h
pretty.c pretty: fix ref filtering for %(decorate) formats 2023-10-09 11:25:13 -07:00
pretty.h
prio-queue.c
prio-queue.h
progress.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
progress.h
promisor-remote.c
promisor-remote.h
prompt.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
prompt.h
protocol-caps.c
protocol-caps.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
quote.c
quote.h
range-diff.c Merge branch 'kh/range-diff-notes' 2023-09-29 09:04:15 -07:00
range-diff.h
reachable.c
reachable.h
read-cache-ll.h
read-cache.c
read-cache.h
README.md
rebase-interactive.c
rebase-interactive.h
rebase.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
rebase.h
ref-filter.c ref-filter: add mailmap support 2023-09-25 14:52:34 -07:00
ref-filter.h
reflog-walk.c
reflog-walk.h
reflog.c
reflog.h
refs.c
refs.h
refspec.c
refspec.h
RelNotes Git 2.42.1 2023-11-02 16:59:16 +09:00
remote-curl.c
remote.c
remote.h
replace-object.c
replace-object.h
repo-settings.c
repository.c
repository.h
rerere.c Merge branch 'jc/unresolve-removal' 2023-10-02 11:20:00 -07:00
rerere.h
reset.c
reset.h
resolve-undo.c Merge branch 'jc/unresolve-removal' 2023-10-02 11:20:00 -07:00
resolve-undo.h
revision.c rev-list: add commit object support in --missing option 2023-11-01 12:07:18 +09:00
revision.h rev-list: add commit object support in --missing option 2023-11-01 12:07:18 +09:00
run-command.c Merge branch 'ma/locate-in-path-for-windows' 2023-08-09 16:18:16 -07:00
run-command.h
sane-ctype.h
scalar.c Merge branch 'ds/scalar-updates' into maint-2.42 2023-11-02 16:53:15 +09:00
SECURITY.md
send-pack.c
send-pack.h
sequencer.c Merge branch 'ob/sequencer-remove-dead-code' into maint-2.42 2023-11-02 16:53:24 +09:00
sequencer.h rebase -m: cleanup --strategy-option handling 2023-04-10 09:53:19 -07:00
serve.c
serve.h
server-info.c
server-info.h
setup.c setup: fix leaking repository format 2023-11-07 08:51:41 +09:00
setup.h Merge branch 'ds/scalar-updates' into maint-2.42 2023-11-02 16:53:15 +09:00
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c shallow: fix memory leak when registering shallow roots 2023-11-07 08:51:41 +09:00
shallow.h
shared.mak
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c read_tree(): respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
sparse-index.h
split-index.c
split-index.h
stable-qsort.c
statinfo.c Prevent git from rehashing 4GiB files 2023-10-13 13:33:35 -07:00
statinfo.h
strbuf.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
strbuf.h doc: fix some typos, grammar and wording issues 2023-10-05 12:55:38 -07:00
streaming.c
streaming.h
string-list.c
string-list.h
strmap.c
strmap.h
strvec.c strvec: drop unnecessary include of hex.h 2023-11-03 08:26:55 +09:00
strvec.h
sub-process.c
sub-process.h
submodule-config.c
submodule-config.h
submodule.c
submodule.h
symlinks.c
symlinks.h
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trace2.c
trace2.h
trailer.c trailer: split process_command_line_args into separate functions 2023-09-11 10:01:19 -07:00
trailer.h trailer: separate public from internal portion of trailer_iterator 2023-09-11 10:01:18 -07:00
transport-helper.c
transport-internal.h
transport.c
transport.h
tree-diff.c tree-diff: respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
tree-walk.c traverse_trees(): respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
tree-walk.h tree-walk: drop MAX_TRAVERSE_TREES macro 2023-08-31 15:51:07 -07:00
tree.c read_tree(): respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
tree.h read_tree(): respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
unicode-width.h unicode: update the width tables to Unicode 15.1 2023-09-25 16:17:28 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c Merge branch 'cw/prelim-cleanup' 2023-10-10 11:39:14 -07:00
unpack-trees.h tree-walk: drop MAX_TRAVERSE_TREES macro 2023-08-31 15:51:07 -07:00
upload-pack.c Merge branch 'ds/upload-pack-error-sequence-fix' into maint-2.42 2023-11-02 16:53:20 +09:00
upload-pack.h
url.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
url.h
urlmatch.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
versioncmp.h
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c worktree: mark unused parameters in noop repair callback 2023-08-29 17:56:25 -07:00
worktree.h
wrap-for-bin.sh
wrapper.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
wrapper.h wrapper: reduce scope of remove_or_warn() 2023-09-29 15:14:56 -07:00
write-or-die.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
write-or-die.h
ws.c
ws.h
wt-status.c Merge branch 'jk/diff-result-code-cleanup' into maint-2.42 2023-11-02 16:53:16 +09:00
wt-status.h
xdiff-interface.c
xdiff-interface.h

Build status

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-<commandname>.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be read with man gittutorial or git help tutorial, and the documentation of each command with man git-<commandname> or git help <commandname>.

CVS users may also want to read Documentation/gitcvs-migration.txt (man gitcvs-migration or git help cvs-migration if git is installed).

The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission and Documentation/CodingGuidelines).

Those wishing to help with error message, usage and informational message string translations (localization l10) should see po/README.md (a po file is a Portable Object file that holds the translations).

To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org (not the Git list). The mailing list archives are available at https://lore.kernel.org/git/, http://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (depending on your mood):

  • random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of "get" may or may not be relevant.
  • stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
  • "global information tracker": you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
  • "goddamn idiotic truckload of sh*t": when it breaks