git/builtin, branch v2.43.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.43.22024-02-13T22:44:49ZMerge branch 'ps/report-failure-from-git-stash' into maint-2.432024-02-13T22:44:49ZJunio C Hamanogitster@pobox.com2024-02-13T22:44:49Zurn:sha1:bd10c45672068811cb13cb0edba78470f537f233
"git stash" sometimes was silent even when it failed due to
unwritable index file, which has been corrected.
* ps/report-failure-from-git-stash:
builtin/stash: report failure to write to index
Merge branch 'jc/sign-buffer-failure-propagation-fix' into maint-2.432024-02-13T22:44:48ZJunio C Hamanogitster@pobox.com2024-02-13T22:44:48Zurn:sha1:07fa3836158f267184bb5cebaa1390364cdb8702
A failed "git tag -s" did not necessarily result in an error
depending on the crypto backend, which has been corrected.
* jc/sign-buffer-failure-propagation-fix:
ssh signing: signal an error with a negative return value
tag: fix sign_buffer() call to create a signed tag
Merge branch 'jc/comment-style-fixes' into maint-2.432024-02-13T22:44:48ZJunio C Hamanogitster@pobox.com2024-02-13T22:44:48Zurn:sha1:a1cd814f1f2cba217a6f9dd2504139603e44822f
Rewrite //-comments to /* comments */ in files whose comments
prevalently use the latter.
* jc/comment-style-fixes:
reftable/pq_test: comment style fix
merge-ort.c: comment style fix
builtin/worktree: comment style fixes
Merge branch 'tc/show-ref-exists-fix' into maint-2.432024-02-13T22:44:47ZJunio C Hamanogitster@pobox.com2024-02-13T22:44:47Zurn:sha1:908fde12b0d59645cdb684ba9862e7665d89695e
Update to a new feature recently added, "git show-ref --exists".
* tc/show-ref-exists-fix:
builtin/show-ref: treat directory as non-existing in --exists
Merge branch 'jk/index-pack-lsan-false-positive-fix' into maint-2.432024-02-09T00:22:12ZJunio C Hamanogitster@pobox.com2024-02-09T00:22:12Zurn:sha1:a064af6ef4b3666e204176a7f92525593435e9c5
Fix false positive reported by leak sanitizer.
* jk/index-pack-lsan-false-positive-fix:
index-pack: spawn threads atomically
Merge branch 'rs/fast-import-simplify-mempool-allocation' into maint-2.432024-02-09T00:22:11ZJunio C Hamanogitster@pobox.com2024-02-09T00:22:10Zurn:sha1:232953b904c63fef02484d3505ead0496978d411
Code simplification.
* rs/fast-import-simplify-mempool-allocation:
fast-import: use mem_pool_calloc()
Merge branch 'en/header-cleanup' into maint-2.432024-02-09T00:22:10ZJunio C Hamanogitster@pobox.com2024-02-09T00:22:10Zurn:sha1:0f7a10a3aad344a28f0f30b32a979925a9629533
Remove unused header "#include".
* en/header-cleanup:
treewide: remove unnecessary includes in source files
treewide: add direct includes currently only pulled in transitively
trace2/tr2_tls.h: remove unnecessary include
submodule-config.h: remove unnecessary include
pkt-line.h: remove unnecessary include
line-log.h: remove unnecessary include
http.h: remove unnecessary include
fsmonitor--daemon.h: remove unnecessary includes
blame.h: remove unnecessary includes
archive.h: remove unnecessary include
treewide: remove unnecessary includes in source files
treewide: remove unnecessary includes from header files
Merge branch 'jc/orphan-unborn' into maint-2.432024-02-09T00:22:10ZJunio C Hamanogitster@pobox.com2024-02-09T00:22:09Zurn:sha1:974c9369aa98037b0059e4257144f01af62fae71
Doc updates to clarify what an "unborn branch" means.
* jc/orphan-unborn:
orphan/unborn: fix use of 'orphan' in end-user facing messages
orphan/unborn: add to the glossary and use them consistently
Merge branch 'la/trailer-cleanups' into maint-2.432024-02-09T00:22:09ZJunio C Hamanogitster@pobox.com2024-02-09T00:22:09Zurn:sha1:541d0d75e781fad5761414d7a5500b8840f3e5bb
Code clean-up.
* la/trailer-cleanups:
trailer: use offsets for trailer_start/trailer_end
trailer: find the end of the log message
commit: ignore_non_trailer computes number of bytes to ignore
Merge branch 'jc/retire-cas-opt-name-constant' into maint-2.432024-02-09T00:22:09ZJunio C Hamanogitster@pobox.com2024-02-09T00:22:09Zurn:sha1:edf4c0d42b75fb1a94a21db75d020472cc0a6cf2
Code clean-up.
* jc/retire-cas-opt-name-constant:
remote.h: retire CAS_OPT_NAME