7 UI, Workflows & Features
9 * Userdiff for PHP update.
11 * Userdiff for Rust update.
13 * Userdiff for CSS update.
15 * The command line completion script (in contrib/) learned that "git
16 stash show" takes the options "git diff" takes.
18 * "git worktree list" now shows if each worktree is locked. This
19 possibly may open us to show other kinds of states in the future.
21 * "git maintenance", an extended big brother of "git gc", continues
24 * "git push --force-with-lease[=<ref>]" can easily be misused to lose
25 commits unless the user takes good care of their own "git fetch".
26 A new option "--force-if-includes" attempts to ensure that what is
27 being force-pushed was created after examining the commit at the
28 tip of the remote ref that is about to be force-replaced.
30 * "git clone" learned clone.defaultremotename configuration variable
31 to customize what nickname to use to call the remote the repository
34 * "git checkout" learned to use checkout.guess configuration variable
35 and enable/disable its "--[no-]guess" option accordingly.
37 * "git resurrect" script (in contrib/) learned that the object names
38 may be longer than 40-hex depending on the hash function in use.
40 * "git diff A...B" learned "git diff --merge-base A B", which is a
41 longer short-hand to say the same thing.
43 * A sample 'push-to-checkout' hook, that performs the same as
44 what the built-in default action does, has been added.
46 * "git diff" family of commands learned the "-I<regex>" option to
47 ignore hunks whose changed lines all match the given pattern.
49 * The userdiff pattern learned to identify the function definition in
50 POSIX shells and bash.
52 * "git checkout-index" did not consistently signal an error with its
53 exit status, but now it does.
55 * A commit and tag object may have CR at the end of each and
56 every line (you can create such an object with hash-object or
57 using --cleanup=verbatim to decline the default clean-up
58 action), but it would make it impossible to have a blank line
59 to separate the title from the body of the message. We are now
60 more lenient and accept a line with lone CR on it as a blank line,
63 * Exit codes from "git remote add" etc. were not usable by scripted
64 callers, but now they are.
66 * "git archive" now allows compression level higher than "-9"
67 when generating tar.gz output.
69 * Zsh autocompletion (in contrib/) update.
71 * The maximum length of output filenames "git format-patch" creates
72 has become configurable (used to be capped at 64).
74 * "git rev-parse" learned the "--end-of-options" to help scripts to
75 safely take a parameter that is supposed to be a revision, e.g.
76 "git rev-parse --verify -q --end-of-options $rev".
78 * The command line completion script (in contrib/) learned to expand
79 commands that are alias of alias.
82 Performance, Internal Implementation, Development Support etc.
84 * Use "git archive" more to produce the release tarball.
86 * GitHub Actions automated test improvement to skip tests on a tree
87 identical to what has already been tested.
89 * Test-coverage for running commit-graph task "git maintenance" has
92 * Our test scripts can be told to run only individual pieces while
93 skipping others with the "--run=..." option; they were taught to
94 take a substring of test title, in addition to numbers, to name the
97 * Adjust tests so that they won't scream when the default initial
98 branch name is changed to 'main'.
100 * Rewriting "git bisect" in C continues.
102 * More preliminary tests have been added to document desired outcome
103 of various "directory rename" situations.
105 * Micro clean-up of a couple of test scripts.
107 * "git diff" and other commands that share the same machinery to
108 compare with working tree files have been taught to take advantage
109 of the fsmonitor data when available.
111 * The code to detect premature EOF in the sideband demultiplexer has
114 * Test scripts are being prepared to transition of the default branch
117 * "git fetch --depth=<n>" over the stateless RPC / smart HTTP
118 transport handled EOF from the client poorly at the server end.
120 * A specialization of hashmap that uses a string as key has been
121 introduced. Hopefully it will see wider use over time.
123 * "git bisect start/next" in a large span of history spends a lot of
124 time trying to come up with exactly the half-way point; this can be
125 optimized by stopping when we see a commit that is close enough to
128 * A lazily defined test prerequisite can now be defined in terms of
129 another lazily defined test prerequisite.
131 * Expectation for the original contributor after responding to a
132 review comment to use the explanation in a patch update has been
135 * Multiple "credential-store" backends can race to lock the same
136 file, causing everybody else but one to fail---reattempt locking
137 with some timeout to reduce the rate of the failure.
139 * "git-parse-remote" shell script library outlived its usefulness.
145 * In 2.29, "--committer-date-is-author-date" option of "rebase" and
146 "am" subcommands lost the e-mail address by mistake, which has been
148 (merge 5f35edd9d7 jk/committer-date-is-author-date-fix later to maint).
150 * "git checkout -p A...B [-- <path>]" did not work, even though the
151 same command without "-p" correctly used the merge-base between
153 (merge 35166b1fb5 dl/checkout-p-merge-base later to maint).
155 * The side-band status report can be sent at the same time as the
156 primary payload multiplexed, but the demultiplexer on the receiving
157 end incorrectly split a single status report into two, which has
159 (merge 712b0377db js/avoid-split-sideband-message later to maint).
161 * "git fast-import" wasted a lot of memory when many marks were in use.
162 (merge 3f018ec716 jk/fast-import-marks-alloc-fix later to maint).
164 * A test helper "test_cmp A B" was taught to diagnose missing files A
165 or B as a bug in test, but some tests legitimately wanted to notice
166 a failure to even create file B as an error, in addition to leaving
167 the expected result in it, and were misdiagnosed as a bug. This
169 (merge 262d5ad5a5 es/test-cmp-typocatcher later to maint).
171 * When "git commit-graph" detects the same commit recorded more than
172 once while it is merging the layers, it used to die. The code now
173 ignores all but one of them and continues.
174 (merge 85102ac71b ds/commit-graph-merging-fix later to maint).
176 * The meaning of a Signed-off-by trailer can vary from project to
177 project; this and also what it means to this project has been
178 clarified in the documentation.
179 (merge 3abd4a67d9 bk/sob-dco later to maint).
181 * "git credential' didn't honor the core.askPass configuration
182 variable (among other things), which has been corrected.
183 (merge 567ad2c0f9 tk/credential-config later to maint).
185 * Dev support to catch a tentative definition of a variable in our C
187 (merge 5539183622 jk/no-common later to maint).
189 * "git rebase --rebase-merges" did not correctly pass --gpg-sign
190 command line option to underlying "git merge" when replaying a merge
191 using non-default merge strategy or when replaying an octopus merge
192 (because replaying a two-head merge with the default strategy was
193 done in a separate codepath, the problem did not trigger for most
194 users), which has been corrected.
195 (merge 43ad4f2eca sc/sequencer-gpg-octopus later to maint).
197 * "git apply -R" did not handle patches that touch the same path
198 twice correctly, which has been corrected. This is most relevant
199 in a patch that changes a path from a regular file to a symbolic
200 link (and vice versa).
201 (merge b0f266de11 jt/apply-reverse-twice later to maint).
203 * A recent oid->hash conversion missed one spot, breaking "git svn".
204 (merge 03bb366de4 bc/svn-hash-oid-fix later to maint).
206 * The documentation on the "--abbrev=<n>" option did not say the
207 output may be longer than "<n>" hexdigits, which has been
209 (merge cda34e0d0c jc/abbrev-doc later to maint).
211 * "git p4" now honors init.defaultBranch configuration.
212 (merge 1b09d1917f js/p4-default-branch later to maint).
214 * Recently the format of an internal state file "rebase -i" uses has
215 been tightened up for consistency, which would hurt those who start
216 "rebase -i" with old git and then continue with new git. Loosen
217 the reader side a bit (which we may want to tighten again in a year
219 (merge c779386182 jc/sequencer-stopped-sha-simplify later to maint).
221 * The code to see if "git stash drop" can safely remove refs/stash
222 has been made more carerful.
223 (merge 4f44c5659b rs/empty-reflog-check-fix later to maint).
225 * "git log -L<range>:<path>" is documented to take no pathspec, but
226 this was not enforced by the command line option parser, which has
228 (merge 39664cb0ac jc/line-log-takes-no-pathspec later to maint).
230 * "git format-patch --output=there" did not work as expected and
231 instead crashed. The option is now supported.
232 (merge dc1672dd10 jk/format-patch-output later to maint).
234 * Define ARM64 compiled with MSVC to be little-endian.
235 (merge 0c038fc65a dg/bswap-msvc later to maint).
237 * "git rebase -i" did not store ORIG_HEAD correctly.
238 (merge 8843302307 pw/rebase-i-orig-head later to maint).
240 * "git blame -L :funcname -- path" did not work well for a path for
241 which a userdiff driver is defined.
243 * "make DEVELOPER=1 sparse" used to run sparse and let it emit
244 warnings; now such warnings will cause an error.
245 (merge 521dc56270 jc/sparse-error-for-developer-build later to maint).
247 * "git blame --ignore-revs-file=<file>" learned to ignore a
248 non-existent object name in the input, instead of complaining.
249 (merge c714d05875 jc/blame-ignore-fix later to maint).
251 * Running "git diff" while allowing external diff in a state with
252 unmerged paths used to segfault, which has been corrected.
253 (merge d66851806f jk/diff-release-filespec-fix later to maint).
255 * Build configuration cleanup.
256 (merge b990f02fd8 ab/config-mak-uname-simplify later to maint).
258 * Fix regression introduced when nvimdiff support in mergetool was added.
259 (merge 12026f46e7 pd/mergetool-nvimdiff later to maint).
261 * The exchange between receive-pack and proc-receive hook did not
262 carefully check for errors.
264 * The code was not prepared to deal with pack .idx file that is
266 (merge 81c4c5cf2e jk/4gb-idx later to maint).
268 * Since jgit does not yet work with SHA-256 repositories, mark the
269 tests that uses it not to run unless we are testing with ShA-1
271 (merge ea699b4adc sg/t5310-jgit-wants-sha1 later to maint).
273 * Config parser fix for "git notes".
274 (merge 45fef1599a na/notes-displayref-is-not-boolean later to maint).
276 * Move a definition of compatibility wrapper from cache.h to
278 (merge a76b138daa hn/sleep-millisec-decl later to maint).
281 (merge eaf5341538 km/stash-error-message-fix later to maint).
283 * "git pull --rebase --recurse-submodules" checked for local changes
284 in a wrong range and failed to run correctly when it should.
285 (merge 5176f20ffe pb/pull-rebase-recurse-submodules later to maint).
287 * "git push" that is killed may leave a pack-objects process behind,
288 still computing to find a good compression, wasting cycles. This
290 (merge 8b59935114 jk/stop-pack-objects-when-push-is-killed later to maint).
292 * "git fetch" that is killed may leave a pack-objects process behind,
293 still computing to find a good compression, wasting cycles. This
295 (merge 309a4028e7 jk/stop-pack-objects-when-fetch-is-killed later to maint).
297 * Other code cleanup, docfix, build fix, etc.
298 (merge 3e0a5dc9af cc/doc-filter-branch-typofix later to maint).
299 (merge 32c83afc2c cw/ci-ghwf-check-ws-errors later to maint).
300 (merge 5eb2ed691b rs/tighten-callers-of-deref-tag later to maint).
301 (merge 6db29ab213 jk/fast-import-marks-cleanup later to maint).
302 (merge e5cf6d3df4 nk/dir-c-comment-update later to maint).
303 (merge 5710dcce74 jk/report-fn-typedef later to maint).
304 (merge 9a82db1056 en/sequencer-rollback-lock-cleanup later to maint).
305 (merge 4e1bee9a99 js/t7006-cleanup later to maint).
306 (merge f5bcde6c58 es/tutorial-mention-asciidoc-early later to maint).
307 (merge 714d491af0 so/format-patch-doc-on-default-diff-format later to maint).
308 (merge 0795df4b9b rs/clear-commit-marks-in-repo later to maint).
309 (merge 9542d56379 sd/prompt-local-variable later to maint).
310 (merge 06d43fad18 rs/pack-write-hashwrite-simplify later to maint).
311 (merge b7e20b4373 mc/typofix later to maint).
312 (merge f6bcd9a8a4 js/test-whitespace-fixes later to maint).
313 (merge 53b67a801b js/test-file-size later to maint).
314 (merge 970909c2a7 rs/hashwrite-be64 later to maint).
315 (merge 5a923bb1f0 ma/list-object-filter-opt-msgfix later to maint).
316 (merge 1c3e412916 rs/archive-plug-leak-refname later to maint).
317 (merge d44e5267ea rs/plug-diff-cache-leak later to maint).
318 (merge 793c1464d3 ab/gc-keep-base-option later to maint).
319 (merge b86339b12b mt/worktree-error-message-fix later to maint).
320 (merge e01ae2a4a7 js/pull-rebase-use-advise later to maint).