@@ -167,13 +167,11 @@ details).
167167 * An element on GIT_CEILING_DIRECTORIES list that does not name the
168168 real path to a directory (i.e. a symbolic link) could have caused
169169 the GIT_DIR discovery logic to escape the ceiling.
170- (merge 059b379 mh/ceiling later to maint).
171170
172171 * When attempting to read the XDG-style $HOME/.config/git/config and
173172 finding that $HOME/.config/git is a file, we gave a wrong error
174173 message, instead of treating the case as "a custom config file does
175174 not exist there" and moving on.
176- (merge 8f2bbe4 jn/warn-on-inaccessible-loosen later to maint).
177175
178176 * The behaviour visible to the end users was confusing, when they
179177 attempt to kill a process spawned in the editor that was in turn
@@ -184,11 +182,9 @@ details).
184182 * A child process that was killed by a signal (e.g. SIGINT) was
185183 reported in an inconsistent way depending on how the process was
186184 spawned by us, with or without a shell in between.
187- (merge 709ca73 jk/unify-exit-code-by-receiving-signal later to maint).
188185
189186 * After failing to create a temporary file using mkstemp(), failing
190187 pathname was not reported correctly on some platforms.
191- (merge f7be59b jc/mkstemp-more-careful-error-reporting later to maint).
192188
193189 * The attribute mechanism didn't allow limiting attributes to be
194190 applied to only a single directory itself with "path/" like the
@@ -197,17 +193,18 @@ details).
197193 degradations and needs to merge a fix-up topic.
198194 (merge 9db9eec nd/fix-directory-attrs-off-by-one later to maint).
199195
196+ * "git am" did not parse datestamp correctly from Hg generated patch,
197+ when it is run in a locale outside C (or en).
198+ (merge 5185b97 dl/am-hg-locale later to maint).
199+
200200 * "git apply" misbehaved when fixing whitespace breakages by removing
201201 excess trailing blank lines.
202- (merge 5de7166 jc/apply-trailing-blank-removal later to maint).
203202
204203 * A tar archive created by "git archive" recorded a directory in a
205204 way that made NetBSD's implementation of "tar" sometimes unhappy.
206- (merge 22f0dcd rs/leave-base-name-in-name-field-of-tar later to maint).
207205
208206 * "git archive" did not record uncompressed size in the header when
209207 streaming a zip archive, which confused some implementations of unzip.
210- (merge 5ea2c84 rs/zip-with-uncompressed-size-in-the-header later to maint).
211208
212209 * "git clean" showed what it was going to do, but sometimes end up
213210 finding that it was not allowed to do so, which resulted in a
@@ -220,27 +217,21 @@ details).
220217 * When "git clone --separate-git-dir=$over_there" is interrupted, it
221218 failed to remove the real location of the $GIT_DIR it created.
222219 This was most visible when interrupting a submodule update.
223- (merge 9be1980 jl/interrupt-clone-remove-separate-git-dir later to maint).
224220
225221 * The way "git svn" asked for password using SSH_ASKPASS and
226222 GIT_ASKPASS was not in line with the rest of the system.
227- (merge e9263e4 ss/svn-prompt later to maint).
228223
229224 * The --graph code fell into infinite loop when asked to do what the
230225 code did not expect.
231- (merge 656197a mk/maint-graph-infinity-loop later to maint).
232226
233227 * http transport was wrong to ask for the username when the
234228 authentication is done by certificate identity.
235- (merge 75e9a40 rb/http-cert-cred-no-username-prompt later to maint).
236229
237230 * "git pack-refs" that ran in parallel to another process that
238231 created new refs had a nasty race.
239- (merge b3f1280 jk/repack-ref-racefix later to maint).
240232
241233 * After "git add -N" and then writing a tree object out of the
242234 index, the cache-tree data structure got corrupted.
243- (merge eec3e7e nd/invalidate-i-t-a-cache-tree later to maint).
244235
245236 * "git clone" used to allow --bare and --separate-git-dir=$there
246237 options at the same time, which was nonsensical.
@@ -253,74 +244,65 @@ details).
253244 * "git merge --no-edit" computed who were involved in the work done
254245 on the side branch, even though that information is to be discarded
255246 without getting seen in the editor.
256- (merge 9bcbb1c jc/maint-fmt-merge-msg-no-edit-lose-credit later to maint).
257247
258248 * "git merge" started calling prepare-commit-msg hook like "git
259249 commit" does some time ago, but forgot to pay attention to the exit
260250 status of the hook.
261- (merge 3e4141d ap/merge-stop-at-prepare-commit-msg-failure later to maint).
262251
263252 * When users spell "cc:" in lowercase in the fake "header" in the
264253 trailer part, "git send-email" failed to pick up the addresses from
265254 there. As e-mail headers field names are case insensitive, this
266255 script should follow suit and treat "cc:" and "Cc:" the same way.
267- (merge 6310071 nz/send-email-headers-are-case-insensitive later to maint).
268256
269257 * Output from "git status --ignored" showed an unexpected interaction
270258 with "--untracked".
271- (merge a45fb69 ap/status-ignored-in-ignored-directory later to maint).
272259
273260 * "gitweb", when sorting by age to show repositories with new
274261 activities first, used to sort repositories with absolutely
275262 nothing in it early, which was not very useful.
276- (merge 28dae18 md/gitweb-sort-by-age later to maint).
277263
278264 * "gitweb"'s code to sanitize control characters before passing it to
279265 "highlight" filter lost known-to-be-safe control characters by
280266 mistake.
281- (merge 0e901d2 os/gitweb-highlight-uncaptured later to maint).
282267
283268 * When a line to be wrapped has a solid run of non space characters
284269 whose length exactly is the wrap width, "git shortlog -w" failed
285270 to add a newline after such a line.
286- (merge e0db176 sp/shortlog-missing-lf later to maint).
287271
288272 * Command line completion leaked an unnecessary error message while
289273 looking for possible matches with paths in <tree-ish>.
290- (merge ca87dd6 ds/completion-silence-in-tree-path-probe later to maint).
291274
292275 * Command line completion for "tcsh" emitted an unwanted space
293276 after completing a single directory name.
294- (merge 92f1c04 mk/complete-tcsh later to maint).
277+
278+ * Command line completion code was inadvertently made incompatible with
279+ older versions of bash by using a newer array notation.
280+ (merge 50c5885 bc/fix-array-syntax-for-3.0-in-completion-bash later to maint).
295281
296282 * Some shells do not behave correctly when IFS is unset; work it
297283 around by explicitly setting it to the default value.
298- (merge 393050c jc/maint-fbsd-sh-ifs-workaround later to maint).
299284
300285 * Some scripted programs written in Python did not get updated when
301286 PYTHON_PATH changed.
302287 (cherry-pick 96a4647fca54031974cd6ad1 later to maint).
303288
304289 * When autoconf is used, any build on a different commit always ran
305290 "config.status --recheck" even when unnecessary.
306- (merge 1226504 jn/less-reconfigure later to maint).
307291
308292 * We have been carrying a translated and long-unmaintained copy of an
309293 old version of the tutorial; removed.
310- (merge 0a85441 ta/remove-stale-translated-tut later to maint).
294+
295+ * t0050 had tests expecting failures from a bug that was fixed some
296+ time ago.
297+ (merge 336e2e2 tb/t0050-maint later to maint).
311298
312299 * t4014, t9502 and t0200 tests had various portability issues that
313300 broke on OpenBSD.
314- (merge 27f6342 jc/maint-test-portability later to maint).
315301
316302 * t9020 and t3600 tests had various portability issues.
317- (merge 5a02966 jc/test-portability later to maint).
318303
319304 * t9200 runs "cvs init" on a directory that already exists, but a
320305 platform can configure this fail for the current user (e.g. you
321306 need to be in the cvsadmin group on NetBSD 6.0).
322- (merge 8666df0 jc/test-cvs-no-init-in-existing-dir later to maint).
323307
324308 * t9020 and t9810 had a few non-portable shell script construct.
325- (merge 2797914 tb/test-t9020-no-which later to maint).
326- (merge 6f4e505 tb/test-t9810-no-sed-i later to maint).
0 commit comments