development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 14:03:28 +00:00
Code Issues Projects Releases Packages Wiki Activity
71475 commits 6 branches 956 tags 486 MiB
Commit graph

71475 commits

This branch
This branch
All branches
Author SHA1 Message Date
Junio C Hamano
840bd1c9ef Merge branch 'es/bugreport-no-extra-arg' 
"git bugreport" learned to complain when it received a command line
argument that it will not use.

* es/bugreport-no-extra-arg:
  bugreport: reject positional arguments
  t0091-bugreport: stop using i18ngrep
 2023-11-07 10:26:44 +09:00
Junio C Hamano
9f7fbe07dc Merge branch 'js/my-first-contribution-update' 
Documentation update.

* js/my-first-contribution-update:
  Include gettext.h in MyFirstContribution tutorial
 2023-11-07 10:26:44 +09:00
Junio C Hamano
00f372e2a4 Merge branch 'ms/send-email-validate-fix' 
"git send-email" did not have certain pieces of data computed yet
when it tried to validate the outging messages and its recipient
addresses, which has been sorted out.

* ms/send-email-validate-fix:
  send-email: move validation code below process_address_list
 2023-11-07 10:26:44 +09:00
Junio C Hamano
dbffe54f8a Merge branch 'rs/reflog-expire-single-worktree-fix' 
"git reflog expire --single-worktree" has been broken for the past
20 months or so, which has been corrected.

* rs/reflog-expire-single-worktree-fix:
  reflog: fix expire --single-worktree
 2023-11-07 10:26:44 +09:00
Junio C Hamano
c0329432ac Merge branch 'rs/fix-arghelp' 
Doc and help update.

* rs/fix-arghelp:
  am, rebase: fix arghelp syntax of --empty
 2023-11-07 10:26:43 +09:00
Junio C Hamano
5f11becce0 Merge branch 'rs/parse-options-cmdmode' 
parse-options improvements for OPT_CMDMODE options.

* rs/parse-options-cmdmode:
  am: simplify --show-current-patch handling
  parse-options: make CMDMODE errors more precise
 2023-11-07 10:26:43 +09:00
Junio C Hamano
2d2cd0a1bc Merge branch 'jc/grep-f-relative-to-cwd' 
"cd sub && git grep -f patterns" tried to read "patterns" file at
the top level of the working tree; it has been corrected to read
"sub/patterns" instead.

* jc/grep-f-relative-to-cwd:
  grep: -f <path> is relative to $cwd
 2023-11-07 10:26:43 +09:00
Junio C Hamano
e6bb35d996 Merge branch 'ar/submitting-patches-doc-update' 
Doc update.

* ar/submitting-patches-doc-update:
  SubmittingPatches: call gitk's command "Copy commit reference"
 2023-11-07 10:26:42 +09:00
Junio C Hamano
bc5204569f Git 2.42.1 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAmVDVt8ACgkQsLXohpav
 5svFow/8DwSD3XRp4aBjC3u9N2mvAMlZY5afUDHyVF2IuaE6dwOLadcRPlCYe3Xk
 L3x7Spi+ozfHN9I9I2toERidJQHPd5Ld+xrs+qcM/EM0mqAhETEcz5t8vUyKjpE5
 rEAOrQ2tf2DMxfkvAZHguXjJzlulsXetTkPmM0lYDOgQLPvpoalnRpt9mRQobGV5
 X96gm/hML73VYc3twIuoF8GAQvV0x1cW3e9Hn+6KwnpIJEwjhwRZAT3IvEuoxIFE
 Lzb16+f2SmD4mJscuBiGCbCoFzQ/C5yinKkQwwepA/v3lh+/e3dnqAfyH3Rlsy56
 iN5AekzkVa0vZukJgG2xeLtxo3XQBx6N8zrJuTFRXv2IpPK4xLJU8rXUB9YVpjEX
 OR+kBuYFPZqjrZYCJce1XCj0nUlU9J/fRpktqCNfHUccVcwpM+QHRDK6SohJKIXC
 klqZsTXlBR1cZIlTr1XhlHmLH84lKB7ofa1saZgLv1DCHUhzt7lcMmoJTRDCslW8
 EHXQUXcoymfUcEZczmdI+piVfsEU8ZHhuax4jzDn1DzumHmiQDNrAGcZBKSO7pFS
 YyVF4rXoK67dPrHKjYb12v4CkFSoVSzDyzcAXn5FcBmG742MBa2beCYcrt7RbL1A
 Wyx12kAk29Bg0P9kXT/XwwqLayFS4w7XS9/kHMlo0NR+wfQxyOo=
 =8HJo
 -----END PGP SIGNATURE-----

Git 2.43-rc0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-11-02 17:09:48 +09:00
Junio C Hamano
61a22ddaf0 Git 2.42.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2023-11-02 16:59:16 +09:00
Junio C Hamano
b8e45c5aa2 Merge branch 'ms/doc-push-fix' into maint-2.42 
Docfix.

* ms/doc-push-fix:
  git-push doc: more visibility for -q option
 2023-11-02 16:53:28 +09:00
Junio C Hamano
fdb233cefb Merge branch 'jc/commit-new-underscore-index-fix' into maint-2.42 
Message fix.

* jc/commit-new-underscore-index-fix:
  commit: do not use cryptic "new_index" in end-user facing messages
 2023-11-02 16:53:28 +09:00
Junio C Hamano
d373ec0723 Merge branch 'wx/merge-ort-comment-typofix' into maint-2.42 
Typofix.

* wx/merge-ort-comment-typofix:
  merge-ort.c: fix typo 'neeed' to 'needed'
 2023-11-02 16:53:27 +09:00
Junio C Hamano
8a26aaa91e Merge branch 'ps/git-repack-doc-fixes' into maint-2.42 
Doc updates.

* ps/git-repack-doc-fixes:
  doc/git-repack: don't mention nonexistent "--unpacked" option
  doc/git-repack: fix syntax for `-g` shorthand option
 2023-11-02 16:53:27 +09:00
Junio C Hamano
382d55a9d3 Merge branch 'ni/die-message-fix-for-git-add' into maint-2.42 
Message updates.

* ni/die-message-fix-for-git-add:
  builtin/add.c: clean up die() messages
 2023-11-02 16:53:27 +09:00
Junio C Hamano
f8685969f5 Merge branch 'jc/am-doc-whitespace-action-fix' into maint-2.42 
Docfix.

* jc/am-doc-whitespace-action-fix:
  am: align placeholder for --whitespace option with apply
 2023-11-02 16:53:27 +09:00
Junio C Hamano
a40b8e9197 Merge branch 'jc/update-list-references-to-lore' into maint-2.42 
Doc update.

* jc/update-list-references-to-lore:
  doc: update list archive reference to use lore.kernel.org
 2023-11-02 16:53:27 +09:00
Junio C Hamano
3a16179bfb Merge branch 'ps/rewritten-is-per-worktree-doc' into maint-2.42 
Doc update.

* ps/rewritten-is-per-worktree-doc:
  doc/git-worktree: mention "refs/rewritten" as per-worktree refs
 2023-11-02 16:53:26 +09:00
Junio C Hamano
f6a567638b Merge branch 'sn/cat-file-doc-update' into maint-2.42 
"git cat-file" documentation updates.

* sn/cat-file-doc-update:
  doc/cat-file: make synopsis and description less confusing
 2023-11-02 16:53:26 +09:00
Junio C Hamano
f92cea12c9 Merge branch 'jk/decoration-and-other-leak-fixes' into maint-2.42 
Leakfix.

* jk/decoration-and-other-leak-fixes:
  daemon: free listen_addr before returning
  revision: clear decoration structs during release_revisions()
  decorate: add clear_decoration() function
 2023-11-02 16:53:26 +09:00
Junio C Hamano
1e315cab44 Merge branch 'rs/parse-opt-ctx-cleanup' into maint-2.42 
Code clean-up.

* rs/parse-opt-ctx-cleanup:
  parse-options: drop unused parse_opt_ctx_t member
 2023-11-02 16:53:26 +09:00
Junio C Hamano
fa5799cd34 Merge branch 'ob/am-msgfix' into maint-2.42 
The parameters to generate an error message have been corrected.

* ob/am-msgfix:
  am: fix error message in parse_opt_show_current_patch()
 2023-11-02 16:53:25 +09:00
Junio C Hamano
8a5b2e1157 Merge branch 'hy/doc-show-is-like-log-not-diff-tree' into maint-2.42 
Doc update.

* hy/doc-show-is-like-log-not-diff-tree:
  show doc: redirect user to git log manual instead of git diff-tree
 2023-11-02 16:53:25 +09:00
Junio C Hamano
965d445b2d Merge branch 'ch/clean-docfix' into maint-2.42 
Typofix.

* ch/clean-docfix:
  git-clean doc: fix "without do cleaning" typo
 2023-11-02 16:53:25 +09:00
Junio C Hamano
905765bc5b Merge branch 'eg/config-type-path-docfix' into maint-2.42 
Typofix.

* eg/config-type-path-docfix:
  git-config: fix misworded --type=path explanation
 2023-11-02 16:53:25 +09:00
Junio C Hamano
71c614b9a2 Merge branch 'ob/t3404-typofix' into maint-2.42 
Code clean-up.

* ob/t3404-typofix:
  t3404-rebase-interactive.sh: fix typos in title of a rewording test
 2023-11-02 16:53:24 +09:00
Junio C Hamano
cd41f66b9d Merge branch 'ob/sequencer-remove-dead-code' into maint-2.42 
Code clean-up.

* ob/sequencer-remove-dead-code:
  sequencer: remove unreachable exit condition in pick_commits()
 2023-11-02 16:53:24 +09:00
Junio C Hamano
f76827da0e Merge branch 'rs/name-rev-use-opt-hidden-bool' into maint-2.42 
Simplify use of parse-options API a bit.

* rs/name-rev-use-opt-hidden-bool:
  name-rev: use OPT_HIDDEN_BOOL for --peel-tag
 2023-11-02 16:53:24 +09:00
Junio C Hamano
2fdfd7594f Merge branch 'rs/grep-parseopt-simplify' into maint-2.42 
Simplify use of parse-options API a bit.

* rs/grep-parseopt-simplify:
  grep: use OPT_INTEGER_F for --max-depth
 2023-11-02 16:53:24 +09:00
Junio C Hamano
18e0648b9b Merge branch 'ob/sequencer-reword-error-message' into maint-2.42 
Update an error message (which would probably never been seen).

* ob/sequencer-reword-error-message:
  sequencer: fix error message on failure to copy SQUASH_MSG
 2023-11-02 16:53:23 +09:00
Junio C Hamano
535b30eb58 Merge branch 'bc/more-git-var' into maint-2.42 
Fix-up for a topic that already has graduated.

* bc/more-git-var:
  var: avoid a segmentation fault when `HOME` is unset
 2023-11-02 16:53:23 +09:00
Junio C Hamano
0510d06b56 Merge branch 'jk/ci-retire-allow-ref' into maint-2.42 
CI update.

* jk/ci-retire-allow-ref:
  ci: deprecate ci/config/allow-ref script
  ci: allow branch selection through "vars"
 2023-11-02 16:53:23 +09:00
Junio C Hamano
1a3712f06b Merge branch 'ws/git-svn-retire-faketerm' into maint-2.42 
Code clean-up.

* ws/git-svn-retire-faketerm:
  git-svn: drop FakeTerm hack
 2023-11-02 16:53:22 +09:00
Junio C Hamano
43af21409e Merge branch 'ch/t6300-verify-commit-test-cleanup' into maint-2.42 
Test clean-up.

* ch/t6300-verify-commit-test-cleanup:
  t/t6300: drop magic filtering
  t/lib-gpg: forcibly run a trustdb update
 2023-11-02 16:53:22 +09:00
Junio C Hamano
7c7f6d828b Merge branch 'jc/mv-d-to-d-error-message-fix' into maint-2.42 
Typofix in an error message.

* jc/mv-d-to-d-error-message-fix:
  mv: fix error for moving directory to another
 2023-11-02 16:53:22 +09:00
Junio C Hamano
9d4a69f852 Merge branch 'ja/worktree-orphan' into maint-2.42 
Typofix in an error message.

* ja/worktree-orphan:
  builtin/worktree.c: fix typo in "forgot fetch" msg
 2023-11-02 16:53:21 +09:00
Junio C Hamano
8db7d2d6bd Merge branch 'ob/t9001-indent-fix' into maint-2.42 
Test style fix.

* ob/t9001-indent-fix:
  t9001: fix indentation in test_no_confirm()
 2023-11-02 16:53:21 +09:00
Junio C Hamano
b50a670153 Merge branch 'jk/function-pointer-mismatches-fix' into maint-2.42 
Code clean-up to please clang-18.

* jk/function-pointer-mismatches-fix:
  hashmap: use expected signatures for comparison functions
 2023-11-02 16:53:21 +09:00
Junio C Hamano
9ae84d2e7f Merge branch 'ds/upload-pack-error-sequence-fix' into maint-2.42 
Error message generation fix.

* ds/upload-pack-error-sequence-fix:
  upload-pack: fix exit code when denying fetch of unreachable object ID
  upload-pack: fix race condition in error messages
 2023-11-02 16:53:20 +09:00
Junio C Hamano
c78718c4b3 Merge branch 'ws/git-push-doc-grammofix' into maint-2.42 
Doc update.

* ws/git-push-doc-grammofix:
  git-push.txt: fix grammar
 2023-11-02 16:53:20 +09:00
Junio C Hamano
07011e1480 Merge branch 'jk/test-pass-ubsan-options-to-http-test' into maint-2.42 
UBSAN options were not propagated through the test framework to git
run via the httpd, unlike ASAN options, which has been corrected.

* jk/test-pass-ubsan-options-to-http-test:
  test-lib: set UBSAN_OPTIONS to match ASan
 2023-11-02 16:53:20 +09:00
Junio C Hamano
584cde766b Merge branch 'tb/send-email-extract-valid-address-error-message-fix' into maint-2.42 
An error message given by "git send-email" when given a malformed
address did not give correct information, which has been corrected.

* tb/send-email-extract-valid-address-error-message-fix:
  git-send-email.perl: avoid printing undef when validating addresses
 2023-11-02 16:53:20 +09:00
Junio C Hamano
2a6806140e Merge branch 'jk/redact-h2h3-headers-fix' into maint-2.42 
HTTP Header redaction code has been adjusted for a newer version of
cURL library that shows its traces differently from earlier
versions.

* jk/redact-h2h3-headers-fix:
  http: update curl http/2 info matching for curl 8.3.0
  http: factor out matching of curl http/2 trace lines
 2023-11-02 16:53:19 +09:00
Junio C Hamano
83442ded89 Merge branch 'pb/completion-aliases-doc' into maint-2.42 
Clarify how "alias.foo = : git cmd ; aliased-command-string" should
be spelled with necessary whitespaces around punctuation marks to
work.

* pb/completion-aliases-doc:
  completion: improve doc for complex aliases
 2023-11-02 16:53:19 +09:00
Junio C Hamano
2fd4378d64 Merge branch 'js/diff-cached-fsmonitor-fix' into maint-2.42 
"git diff --cached" codepath did not fill the necessary stat
information for a file when fsmonitor knows it is clean and ended
up behaving as if it is not clean, which has been corrected.

* js/diff-cached-fsmonitor-fix:
  diff-lib: fix check_removed when fsmonitor is on
 2023-11-02 16:53:19 +09:00
Junio C Hamano
56ee4a3578 Merge branch 'js/systemd-timers-wsl-fix' into maint-2.42 
Update "git maintainance" timers' implementation based on systemd
timers to work with WSL.

* js/systemd-timers-wsl-fix:
  maintenance(systemd): support the Windows Subsystem for Linux
 2023-11-02 16:53:18 +09:00
Junio C Hamano
bfb8376d68 Merge branch 'pw/diff-no-index-from-named-pipes' into maint-2.42 
"git diff --no-index -R <(one) <(two)" did not work correctly,
which has been corrected.

* pw/diff-no-index-from-named-pipes:
  diff --no-index: fix -R with stdin
 2023-11-02 16:53:18 +09:00
Junio C Hamano
d12df942ba Merge branch 'js/complete-checkout-t' into maint-2.42 
The completion script (in contrib/) has been taught to treat the
"-t" option to "git checkout" and "git switch" just like the
"--track" option, to complete remote-tracking branches.

* js/complete-checkout-t:
  completion(switch/checkout): treat --track and -t the same
 2023-11-02 16:53:18 +09:00
Junio C Hamano
17ab51ee8f Merge branch 'rs/grep-no-no-or' into maint-2.42 
"git grep -e A --no-or -e B" is accepted, even though the negation
of "or" did not mean anything, which has been tightened.

* rs/grep-no-no-or:
  grep: reject --no-or
 2023-11-02 16:53:18 +09:00
Junio C Hamano
9a4ae43f0b Merge branch 'so/diff-doc-for-patch-update' into maint-2.42 
References from description of the `--patch` option in various
manual pages have been simplified and improved.

* so/diff-doc-for-patch-update:
  doc/diff-options: fix link to generating patch section
 2023-11-02 16:53:17 +09:00