| blob | 50710e603cbc6393188b65b9b5827e0924b819de |
1 Git 2.34 Release Notes
2 ======================
4 Updates since Git 2.33
5 ----------------------
7 UI, Workflows & Features
9 * Pathname expansion (like "~username/") learned a way to specify a
10 location relative to Git installation (e.g. its $sharedir which is
11 $(prefix)/share), with "%(prefix)".
13 * Use `ort` instead of `recursive` as the default merge strategy.
15 * The userdiff pattern for "java" language has been updated.
17 * "git rebase" by default skips changes that are equivalent to
18 commits that are already in the history the branch is rebased onto;
19 give messages when this happens to let the users be aware of
20 skipped commits, and also teach them how to tell "rebase" to keep
21 duplicated changes.
23 * The advice message that "git cherry-pick" gives when it asks
24 conflicted replay of a commit to be resolved by the end user has
25 been updated.
27 * After "git clone --recurse-submodules", all submodules are cloned
28 but they are not by default recursed into by other commands. With
29 submodule.stickyRecursiveClone configuration set, submodule.recurse
30 configuration is set to true in a repository created by "clone"
31 with "--recurse-submodules" option.
33 * The logic for auto-correction of misspelt subcommands learned to go
34 interactive when the help.autocorrect configuration variable is set
35 to 'prompt'.
38 Performance, Internal Implementation, Development Support etc.
40 * "git bisect" spawned "git show-branch" only to pretty-print the
41 title of the commit after checking out the next version to be
42 tested; this has been rewritten in C.
44 * "git add" can work better with the sparse index.
46 * Support for ancient versions of cURL library (pre 7.19.4) has been
47 dropped.
49 * A handful of tests that assumed implementation details of files
50 backend for refs have been cleaned up.
52 * trace2 logs learned to show parent process name to see in what
53 context Git was invoked.
55 * Loading of ref tips to prepare for common ancestry negotiation in
56 "git fetch-pack" has been optimized by taking advantage of the
57 commit graph when available.
59 * Remind developers that the userdiff patterns should be kept simple
60 and permissive, assuming that the contents they apply are always
61 syntactically correct.
63 * The current implementation of GIT_TEST_FAIL_PREREQS is broken in
64 that checking for the lack of a prerequisite would not work. Avoid
65 the use of "if ! test_have_prereq X" in a test script.
67 * The revision traversal API has been optimized by taking advantage
68 of the commit-graph, when available, to determine if a commit is
69 reachable from any of the existing refs.
71 * "git fetch --quiet" optimization to avoid useless computation of
72 info that will never be displayed.
74 * Callers from older advice_config[] based API has been updated to
75 use the newer advice_if_enabled() and advice_enabled() API.
77 * Teach "test_pause" and "debug" helpers to allow using the HOME and
78 TERM environment variables the user usually uses.
80 * "make INSTALL_STRIP=-s install" allows the installation step to use
81 "install -s" to strip the binaries as they get installed.
84 Fixes since v2.33
85 -----------------
87 * Input validation of "git pack-objects --stdin-packs" has been
88 corrected.
89 (merge 561fa03529 ab/pack-stdin-packs-fix later to maint).
91 * Bugfix for common ancestor negotiation recently introduced in "git
92 push" code path.
93 (merge 82823118b9 jt/push-negotiation-fixes later to maint).
95 * "git pull" had various corner cases that were not well thought out
96 around its --rebase backend, e.g. "git pull --ff-only" did not stop
97 but went ahead and rebased when the history on other side is not a
98 descendant of our history. The series tries to fix them up.
99 (merge 6f843a3355 en/pull-conflicting-options later to maint).
101 * "git apply" miscounted the bytes and failed to read to the end of
102 binary hunks.
103 (merge 46d723ce57 jk/apply-binary-hunk-parsing-fix later to maint).
105 * "git range-diff" code clean-up.
106 (merge c4d5907324 jk/range-diff-fixes later to maint).
108 * "git commit --fixup" now works with "--edit" again, after it was
109 broken in v2.32.
110 (merge 8ef6aad664 jk/commit-edit-fixup-fix later to maint).
112 * Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
113 new version has a blocker bug for that architecture.
114 (merge 3cf9bb36bf cb/ci-use-upload-artifacts-v1 later to maint).
116 * Checking out all the paths from HEAD during the last conflicted
117 step in "git rebase" and continuing would cause the step to be
118 skipped (which is expected), but leaves MERGE_MSG file behind in
119 $GIT_DIR and confuses the next "git commit", which has been
120 corrected.
121 (merge e5ee33e855 pw/rebase-skip-final-fix later to maint).
123 * Various bugs in "git rebase -r" have been fixed.
124 (merge f2563c9ef3 pw/rebase-r-fixes later to maint).
126 * mmap() imitation used to call xmalloc() that dies upon malloc()
127 failure, which has been corrected to just return an error to the
128 caller to be handled.
129 (merge 95b4ff3931 rs/git-mmap-uses-malloc later to maint).
131 * "git diff --relative" segfaulted and/or produced incorrect result
132 when there are unmerged paths.
133 (merge 8174627b3d dd/diff-files-unmerged-fix later to maint).
135 * The delayed checkout code path in "git checkout" etc. were chatty
136 even when --quiet and/or --no-progress options were given.
137 (merge 7a132c628e mt/quiet-with-delayed-checkout later to maint).
139 * "git branch -D <branch>" used to refuse to remove a broken branch
140 ref that points at a missing commit, which has been corrected.
141 (merge 597a977489 rs/branch-allow-deleting-dangling later to maint).
143 * Build update for Apple clang.
144 (merge f32c5d3716 cb/makefile-apple-clang later to maint).
146 * The parser for the "--nl" option of "git column" has been
147 corrected.
148 (merge c93ca46cf5 sg/column-nl later to maint).
150 * "git upload-pack" which runs on the other side of "git fetch"
151 forgot to take the ref namespaces into account when handling
152 want-ref requests.
153 (merge 53a66ec37c ka/want-ref-in-namespace later to maint).
155 * The sparse-index support can corrupt the index structure by storing
156 a stale and/or uninitialized data, which has been corrected.
157 (merge d9e9b44d7a jh/sparse-index-resize-fix later to maint).
159 * Buggy tests could damage repositories outside the throw-away test
160 area we created. We now by default export GIT_CEILING_DIRECTORIES
161 to limit the damage from such a stray test.
162 (merge 614c3d8f2e sg/set-ceiling-during-tests later to maint).
164 * Even when running "git send-email" without its own threaded
165 discussion support, a threading related header in one message is
166 carried over to the subsequent message to result in an unwanted
167 threading, which has been corrected.
168 (merge e082113484 mh/send-email-reset-in-reply-to later to maint).
170 * The output from "git fast-export", when its anonymization feature
171 is in use, showed an annotated tag incorrectly.
172 (merge 2f040a9671 tk/fast-export-anonymized-tag-fix later to maint).
174 * Doc update plus improved error reporting.
175 (merge 1e93770888 jk/log-warn-on-bogus-encoding later to maint).
177 * Recent "diff -m" changes broke "gitk", which has been corrected.
178 (merge 5acffd3473 so/diff-index-regression-fix later to maint).
180 * Regression fix.
181 (merge b996f84989 ab/send-email-config-fix later to maint).
183 * The "git apply -3" code path learned not to bother the lower level
184 merge machinery when the three-way merge can be trivially resolved
185 without the content level merge. This fixes a regression caused by
186 recent "-3way first and fall back to direct application" change.
187 (merge 57f183b698 jc/trivial-threeway-binary-merge later to maint).
189 * The code that optionally creates the *.rev reverse index file has
190 been optimized to avoid needless computation when it is not writing
191 the file out.
192 (merge 8fe8bae9d2 ab/reverse-midx-optim later to maint).
194 * "git range-diff -I... <range> <range>" segfaulted, which has been
195 corrected.
196 (merge 709b3f32d3 rs/range-diff-avoid-segfault-with-I later to maint).
198 * Other code cleanup, docfix, build fix, etc.
199 (merge 1d9c8daef8 ab/bundle-doc later to maint).
200 (merge 81483fe613 en/merge-strategy-docs later to maint).
201 (merge 626beebdf8 js/log-protocol-version later to maint).
202 (merge 00e302da76 cb/builtin-merge-format-string-fix later to maint).
203 (merge ad51ae4dc0 cb/ci-freebsd-update later to maint).
204 (merge be6444d1ca fc/completion-updates later to maint).
205 (merge ff7b83f562 ti/tcsh-completion-regression-fix later to maint).
206 (merge 325b06deda sg/make-fix-ar-invocation later to maint).
207 (merge bd72824c60 me/t5582-cleanup later to maint).
208 (merge f6a5af0f62 ga/send-email-sendmail-cmd later to maint).
209 (merge f58c7468cd ab/ls-remote-packet-trace later to maint).
210 (merge 0160f7e725 ab/rebase-fatal-fatal-fix later to maint).
211 (merge a16eb6b1ff js/maintenance-launchctl-fix later to maint).
212 (merge c21b2511c2 jk/t5323-no-pack-test-fix later to maint).
213 (merge 5146c2f148 mh/credential-leakfix later to maint).
214 (merge 1549577338 dd/t6300-wo-gpg-fix later to maint).
215 (merge 66e905b7dd rs/xopen-reports-open-failures later to maint).
216 (merge 469888e6a5 es/walken-tutorial-fix later to maint).
217 (merge 88682b016d ba/object-info later to maint).
218 (merge b45c172e51 ab/gc-log-rephrase later to maint).
219 (merge ccdd5d1eb1 ab/mailmap-leakfix later to maint).
220 (merge 6540b71614 cb/remote-ndebug-fix later to maint).
221 (merge e4f8d27585 rs/show-branch-simplify later to maint).
222 (merge e124ecf7f7 rs/archive-use-object-id later to maint).
223 (merge cebead1ebf cb/ci-build-pedantic later to maint).
224 (merge ca0cc98e03 bs/doc-bugreport-outdir later to maint).
225 (merge 72b113e562 ab/no-more-check-bindir later to maint).
226 (merge 92a5d1c9b4 jc/prefix-filename-allocates later to maint).