git-for-windows
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md‎
Lines changed: 3 additions & 0 deletions b/‎.github/PULL_REQUEST_TEMPLATE.md‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎.github/workflows/main.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/main.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎Documentation/RelNotes/2.43.2.txt‎
Lines changed: 37 additions & 0 deletions b/‎Documentation/RelNotes/2.43.2.txt‎
Lines changed: 37 additions & 0 deletions
diff --git a/‎Documentation/RelNotes/2.44.0.txt‎
Lines changed: 33 additions & 14 deletions b/‎Documentation/RelNotes/2.44.0.txt‎
Lines changed: 33 additions & 14 deletions
diff --git a/‎Documentation/config/feature.txt‎
Lines changed: 3 additions & 0 deletions b/‎Documentation/config/feature.txt‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎Documentation/git-bisect.txt‎
Lines changed: 6 additions & 4 deletions b/‎Documentation/git-bisect.txt‎
Lines changed: 6 additions & 4 deletions
diff --git a/‎Documentation/git-for-each-ref.txt‎
Lines changed: 5 additions & 3 deletions b/‎Documentation/git-for-each-ref.txt‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎GIT-VERSION-GEN‎
Lines changed: 1 addition & 1 deletion b/‎GIT-VERSION-GEN‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎builtin/pack-objects.c‎
Lines changed: 2 additions & 0 deletions b/‎builtin/pack-objects.c‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎builtin/show-ref.c‎
Lines changed: 1 addition & 1 deletion b/‎builtin/show-ref.c‎
Lines changed: 1 addition & 1 deletion
@@ -16,4 +16,7 @@ to the spam folder).
 Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
 to conveniently send your Pull Requests commits to our mailing list.
 
+For a single-commit pull request, please *leave the pull request description
+empty*: your commit message itself should describe your changes.
+
 Please read the "guidelines for contributing" linked above!
@@ -343,7 +343,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       if: matrix.vector.jobname != 'linux32'
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v1 # cannot be upgraded because Node.js Actions aren't supported in this container
       if: matrix.vector.jobname == 'linux32'
     - run: ci/install-docker-dependencies.sh
     - run: ci/run-build-and-tests.sh
@@ -358,7 +358,7 @@ jobs:
         path: ${{env.FAILED_TEST_ARTIFACTS}}
     - name: Upload failed tests' directories
       if: failure() && env.FAILED_TEST_ARTIFACTS != '' && matrix.vector.jobname == 'linux32'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v1 # cannot be upgraded because Node.js Actions aren't supported in this container
       with:
         name: failed-tests-${{matrix.vector.jobname}}
         path: ${{env.FAILED_TEST_ARTIFACTS}}
 
@@ -0,0 +1,37 @@
+Git 2.43.2 Release Notes
+========================
+
+Relative to Git 2.43.1, this release has two important fixes to allow
+"git imap-send" to be built with NO_CURL defined, and to restore the
+forced flushing behaviour when GIT_FLUSH=1 is set.  It also contains
+other, unexciting, fixes that have already been merged to the 'master'
+branch of the development towards the next major release.
+
+Fixes since Git 2.43.1
+----------------------
+
+ * Update to a new feature recently added, "git show-ref --exists".
+
+ * Rename detection logic ignored the final line of a file if it is an
+   incomplete line.
+
+ * "git diff --no-rename A B" did not disable rename detection but did
+   not trigger an error from the command line parser.
+
+ * "git diff --no-index file1 file2" segfaulted while invoking the
+   external diff driver, which has been corrected.
+
+ * Rewrite //-comments to /* comments */ in files whose comments
+   prevalently use the latter.
+
+ * A failed "git tag -s" did not necessarily result in an error
+   depending on the crypto backend, which has been corrected.
+
+ * "git stash" sometimes was silent even when it failed due to
+   unwritable index file, which has been corrected.
+
+ * Recent conversion to allow more than 0/1 in GIT_FLUSH broke the
+   mechanism by flipping what yes/no means by mistake, which has been
+   corrected.
+
+Also contains documentation updates, code clean-ups and minor fixups.
@@ -91,6 +91,14 @@ UI, Workflows & Features
    refresh token the same way as credential-cache and
    credential-libsecret backends.
 
+ * Command line completion support (in contrib/) has been
+   updated for "git bisect".
+
+ * "git branch" and friends learned to use the formatted text as
+   sorting key, not the underlying timestamp value, when the --sort
+   option is used with author or committer timestamp with a format
+   specifier (e.g., "--sort=creatordate:format:%H:%M:%S").
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -151,6 +159,18 @@ Performance, Internal Implementation, Development Support etc.
  * The priority queue test has been migrated to the unit testing
    framework.
 
+ * Setting `feature.experimental` opts the user into multi-pack reuse
+   experiment
+
+ * Squelch node.js 16 deprecation warnings from GitHub Actions CI
+   by updating actions/github-script and actions/checkout that use
+   node.js 20.
+
+ * The mechanism to report the filename in the source code, used by
+   the unit-test machinery, assumed that the compiler expanded __FILE__
+   to the path to the source given to the $(CC), but some compilers
+   give full path, breaking the output.  This has been corrected.
+
 
 Fixes since v2.43
 -----------------
@@ -234,21 +254,18 @@ Fixes since v2.43
    data from commit-graph too early, which has been corrected.
 
  * Update to a new feature recently added, "git show-ref --exists".
-   (merge 0aabeaa562 tc/show-ref-exists-fix later to maint).
 
  * oss-fuzz tests are built and run in CI.
    (merge c4a9cf1df3 js/oss-fuzz-build-in-ci later to maint).
 
  * Rename detection logic ignored the final line of a file if it is an
    incomplete line.
-   (merge 1c5bc6971e en/diffcore-delta-final-line-fix later to maint).
 
  * GitHub CI update.
    (merge 0188b2c8e0 pb/ci-github-skip-logs-for-broken-tests later to maint).
 
  * "git diff --no-rename A B" did not disable rename detection but did
    not trigger an error from the command line parser.
-   (merge 457f96252f rs/parse-options-with-keep-unknown-abbrev-fix later to maint).
 
  * "git archive --remote=<remote>" learned to talk over the smart
    http (aka stateless) transport.
@@ -265,11 +282,9 @@ Fixes since v2.43
 
  * "git diff --no-index file1 file2" segfaulted while invoking the
    external diff driver, which has been corrected.
-   (merge 85a9a63c92 jk/diff-external-with-no-index later to maint).
 
  * Rewrite //-comments to /* comments */ in files whose comments
    prevalently use the latter.
-   (merge de65079d7b jc/comment-style-fixes later to maint).
 
  * Cirrus CI jobs started breaking because we specified version of
    FreeBSD that is no longer available, which has been corrected.
@@ -279,17 +294,21 @@ Fixes since v2.43
    as <ptr, length> with a wrong length, which has been corrected.
    (merge 156e28b36d jh/sparse-index-expand-to-path-fix later to maint).
 
+ * A failed "git tag -s" did not necessarily result in an error
+   depending on the crypto backend, which has been corrected.
+
+ * "git stash" sometimes was silent even when it failed due to
+   unwritable index file, which has been corrected.
+
+ * "git show-ref --verify" did not show things like "CHERRY_PICK_HEAD",
+   which has been corrected.
+
+ * Recent conversion to allow more than 0/1 in GIT_FLUSH broke the
+   mechanism by flipping what yes/no means by mistake, which has been
+   corrected.
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 5aea3955bc rj/clarify-branch-doc-m later to maint).
    (merge 9cce3be2df bk/bisect-doc-fix later to maint).
-   (merge 8f50984cf4 ne/doc-filter-blob-limit-fix later to maint).
-   (merge f10b0989b8 la/strvec-comment-fix later to maint).
    (merge 8430b438f6 vd/fsck-submodule-url-test later to maint).
-   (merge f10031fadd nb/rebase-x-shell-docfix later to maint).
-   (merge af3d2c160f jc/majordomo-to-subspace later to maint).
-   (merge ee9895b0ff sd/negotiate-trace-fix later to maint).
-   (merge 976d0251ce jc/coc-whitespace-fix later to maint).
-   (merge 9023198280 jt/p4-spell-re-with-raw-string later to maint).
-   (merge 36c9c44fa4 tb/pack-bitmap-drop-unused-struct-member later to maint).
-   (merge 19ed0dff8f js/win32-retry-pipe-write-on-enospc later to maint).
    (merge 3cb4384683 jc/t0091-with-unknown-git later to maint).
@@ -17,6 +17,9 @@ skipping more commits at a time, reducing the number of round trips.
 +
 * `pack.useBitmapBoundaryTraversal=true` may improve bitmap traversal times by
 walking fewer objects.
++
+* `pack.allowPackReuse=multi` may improve the time it takes to create a pack by
+reusing objects from multiple packs instead of just one.
 
 feature.manyFiles::
 	Enable config options that optimize for repos with many files in the
 
@@ -16,11 +16,11 @@ DESCRIPTION
 The command takes various subcommands, and different options depending
 on the subcommand:
 
- git bisect start [--term-(new|bad)=<term-new> --term-(old|good)=<term-old>]
+ git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]
 		  [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]
  git bisect (bad|new|<term-new>) [<rev>]
  git bisect (good|old|<term-old>) [<rev>...]
- git bisect terms [--term-good | --term-bad]
+ git bisect terms [--term-(good|old) | --term-(bad|new)]
  git bisect skip [(<rev>|<range>)...]
  git bisect reset [<commit>]
  git bisect (visualize|view)
@@ -165,8 +165,10 @@ To get a reminder of the currently used terms, use
 git bisect terms
 ------------------------------------------------
 
-You can get just the old (respectively new) term with `git bisect terms
---term-old` or `git bisect terms --term-good`.
+You can get just the old term with `git bisect terms --term-old`
+or `git bisect terms --term-good`; `git bisect terms --term-new`
+and `git bisect terms --term-bad` can be used to learn how to call
+the commits more recent than the sought change.
 
 If you would like to use your own terms instead of "bad"/"good" or
 "new"/"old", you can choose any names you like (except existing bisect
 
@@ -359,9 +359,11 @@ In any case, a field name that refers to a field inapplicable to
 the object referred by the ref does not cause an error.  It
 returns an empty string instead.
 
-As a special case for the date-type fields, you may specify a format for
-the date by adding `:` followed by date format name (see the
-values the `--date` option to linkgit:git-rev-list[1] takes).
+As a special case for the date-type fields, you may specify a format for the
+date by adding `:` followed by date format name (see the values the `--date`
+option to linkgit:git-rev-list[1] takes). If this formatting is provided in
+a `--sort` key, references will be sorted according to the byte-value of the
+formatted string rather than the numeric value of the underlying timestamp.
 
 Some atoms like %(align) and %(if) always require a matching %(end).
 We call them "opening atoms" and sometimes denote them as %($open).
 
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.44.0-rc0
+DEF_VER=v2.44.0-rc1
 
 LF='
 '
 
@@ -4396,6 +4396,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 		prepare_repo_settings(the_repository);
 		if (sparse < 0)
 			sparse = the_repository->settings.pack_use_sparse;
+		if (the_repository->settings.pack_use_multi_pack_reuse)
+			allow_pack_reuse = MULTI_PACK_REUSE;
 	}
 
 	reset_pack_idx_option(&pack_idx_opts);
 
@@ -172,7 +172,7 @@ static int cmd_show_ref__verify(const struct show_one_options *show_one_opts,
 	while (*refs) {
 		struct object_id oid;
 
-		if ((starts_with(*refs, "refs/") || !strcmp(*refs, "HEAD")) &&
+		if ((starts_with(*refs, "refs/") || refname_is_safe(*refs)) &&
 		    !read_ref(*refs, &oid)) {
 			show_one(show_one_opts, *refs, &oid);
 		}
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@ skipping more commits at a time, reducing the number of round trips.`
`17`	`17`	`+`
`18`	`18`	* `pack.useBitmapBoundaryTraversal=true` may improve bitmap traversal times by
`19`	`19`	`walking fewer objects.`
	`20`	`++`
	`21`	+* `pack.allowPackReuse=multi` may improve the time it takes to create a pack by
	`22`	`+reusing objects from multiple packs instead of just one.`
`20`	`23`
`21`	`24`	`feature.manyFiles::`
`22`	`25`	`Enable config options that optimize for repos with many files in the`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`	`3`	`GVF=GIT-VERSION-FILE`
`4`		`-DEF_VER=v2.44.0-rc0`
	`4`	`+DEF_VER=v2.44.0-rc1`
`5`	`5`
`6`	`6`	`LF='`
`7`	`7`	`'`
Original file line number	Diff line number	Diff line change
`@@ -4396,6 +4396,8 @@ int cmd_pack_objects(int argc, const char *argv, const char prefix)`
`4396`	`4396`	`prepare_repo_settings(the_repository);`
`4397`	`4397`	`if (sparse < 0)`
`4398`	`4398`	`sparse = the_repository->settings.pack_use_sparse;`
	`4399`	`+ if (the_repository->settings.pack_use_multi_pack_reuse)`
	`4400`	`+ allow_pack_reuse = MULTI_PACK_REUSE;`
`4399`	`4401`	`}`
`4400`	`4402`
`4401`	`4403`	`reset_pack_idx_option(&pack_idx_opts);`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ static int cmd_show_ref__verify(const struct show_one_options *show_one_opts,`
`172`	`172`	`while (*refs) {`
`173`	`173`	`struct object_id oid;`
`174`	`174`
`175`		`- if ((starts_with(refs, "refs/") \|\| !strcmp(refs, "HEAD")) &&`
	`175`	`+ if ((starts_with(refs, "refs/") \|\| refname_is_safe(refs)) &&`
`176`	`176`	`!read_ref(*refs, &oid)) {`
`177`	`177`	`show_one(show_one_opts, *refs, &oid);`
`178`	`178`	`}`