@@ -167,13 +167,11 @@ details).
167
167
* An element on GIT_CEILING_DIRECTORIES list that does not name the
168
168
real path to a directory (i.e. a symbolic link) could have caused
169
169
the GIT_DIR discovery logic to escape the ceiling.
170
- (merge 059b379 mh/ceiling later to maint).
171
170
172
171
* When attempting to read the XDG-style $HOME/.config/git/config and
173
172
finding that $HOME/.config/git is a file, we gave a wrong error
174
173
message, instead of treating the case as "a custom config file does
175
174
not exist there" and moving on.
176
- (merge 8f2bbe4 jn/warn-on-inaccessible-loosen later to maint).
177
175
178
176
* The behaviour visible to the end users was confusing, when they
179
177
attempt to kill a process spawned in the editor that was in turn
@@ -184,11 +182,9 @@ details).
184
182
* A child process that was killed by a signal (e.g. SIGINT) was
185
183
reported in an inconsistent way depending on how the process was
186
184
spawned by us, with or without a shell in between.
187
- (merge 709ca73 jk/unify-exit-code-by-receiving-signal later to maint).
188
185
189
186
* After failing to create a temporary file using mkstemp(), failing
190
187
pathname was not reported correctly on some platforms.
191
- (merge f7be59b jc/mkstemp-more-careful-error-reporting later to maint).
192
188
193
189
* The attribute mechanism didn't allow limiting attributes to be
194
190
applied to only a single directory itself with "path/" like the
@@ -197,17 +193,18 @@ details).
197
193
degradations and needs to merge a fix-up topic.
198
194
(merge 9db9eec nd/fix-directory-attrs-off-by-one later to maint).
199
195
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
+
200
200
* "git apply" misbehaved when fixing whitespace breakages by removing
201
201
excess trailing blank lines.
202
- (merge 5de7166 jc/apply-trailing-blank-removal later to maint).
203
202
204
203
* A tar archive created by "git archive" recorded a directory in a
205
204
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).
207
205
208
206
* "git archive" did not record uncompressed size in the header when
209
207
streaming a zip archive, which confused some implementations of unzip.
210
- (merge 5ea2c84 rs/zip-with-uncompressed-size-in-the-header later to maint).
211
208
212
209
* "git clean" showed what it was going to do, but sometimes end up
213
210
finding that it was not allowed to do so, which resulted in a
@@ -220,27 +217,21 @@ details).
220
217
* When "git clone --separate-git-dir=$over_there" is interrupted, it
221
218
failed to remove the real location of the $GIT_DIR it created.
222
219
This was most visible when interrupting a submodule update.
223
- (merge 9be1980 jl/interrupt-clone-remove-separate-git-dir later to maint).
224
220
225
221
* The way "git svn" asked for password using SSH_ASKPASS and
226
222
GIT_ASKPASS was not in line with the rest of the system.
227
- (merge e9263e4 ss/svn-prompt later to maint).
228
223
229
224
* The --graph code fell into infinite loop when asked to do what the
230
225
code did not expect.
231
- (merge 656197a mk/maint-graph-infinity-loop later to maint).
232
226
233
227
* http transport was wrong to ask for the username when the
234
228
authentication is done by certificate identity.
235
- (merge 75e9a40 rb/http-cert-cred-no-username-prompt later to maint).
236
229
237
230
* "git pack-refs" that ran in parallel to another process that
238
231
created new refs had a nasty race.
239
- (merge b3f1280 jk/repack-ref-racefix later to maint).
240
232
241
233
* After "git add -N" and then writing a tree object out of the
242
234
index, the cache-tree data structure got corrupted.
243
- (merge eec3e7e nd/invalidate-i-t-a-cache-tree later to maint).
244
235
245
236
* "git clone" used to allow --bare and --separate-git-dir=$there
246
237
options at the same time, which was nonsensical.
@@ -253,74 +244,65 @@ details).
253
244
* "git merge --no-edit" computed who were involved in the work done
254
245
on the side branch, even though that information is to be discarded
255
246
without getting seen in the editor.
256
- (merge 9bcbb1c jc/maint-fmt-merge-msg-no-edit-lose-credit later to maint).
257
247
258
248
* "git merge" started calling prepare-commit-msg hook like "git
259
249
commit" does some time ago, but forgot to pay attention to the exit
260
250
status of the hook.
261
- (merge 3e4141d ap/merge-stop-at-prepare-commit-msg-failure later to maint).
262
251
263
252
* When users spell "cc:" in lowercase in the fake "header" in the
264
253
trailer part, "git send-email" failed to pick up the addresses from
265
254
there. As e-mail headers field names are case insensitive, this
266
255
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).
268
256
269
257
* Output from "git status --ignored" showed an unexpected interaction
270
258
with "--untracked".
271
- (merge a45fb69 ap/status-ignored-in-ignored-directory later to maint).
272
259
273
260
* "gitweb", when sorting by age to show repositories with new
274
261
activities first, used to sort repositories with absolutely
275
262
nothing in it early, which was not very useful.
276
- (merge 28dae18 md/gitweb-sort-by-age later to maint).
277
263
278
264
* "gitweb"'s code to sanitize control characters before passing it to
279
265
"highlight" filter lost known-to-be-safe control characters by
280
266
mistake.
281
- (merge 0e901d2 os/gitweb-highlight-uncaptured later to maint).
282
267
283
268
* When a line to be wrapped has a solid run of non space characters
284
269
whose length exactly is the wrap width, "git shortlog -w" failed
285
270
to add a newline after such a line.
286
- (merge e0db176 sp/shortlog-missing-lf later to maint).
287
271
288
272
* Command line completion leaked an unnecessary error message while
289
273
looking for possible matches with paths in <tree-ish>.
290
- (merge ca87dd6 ds/completion-silence-in-tree-path-probe later to maint).
291
274
292
275
* Command line completion for "tcsh" emitted an unwanted space
293
276
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).
295
281
296
282
* Some shells do not behave correctly when IFS is unset; work it
297
283
around by explicitly setting it to the default value.
298
- (merge 393050c jc/maint-fbsd-sh-ifs-workaround later to maint).
299
284
300
285
* Some scripted programs written in Python did not get updated when
301
286
PYTHON_PATH changed.
302
287
(cherry-pick 96a4647fca54031974cd6ad1 later to maint).
303
288
304
289
* When autoconf is used, any build on a different commit always ran
305
290
"config.status --recheck" even when unnecessary.
306
- (merge 1226504 jn/less-reconfigure later to maint).
307
291
308
292
* We have been carrying a translated and long-unmaintained copy of an
309
293
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).
311
298
312
299
* t4014, t9502 and t0200 tests had various portability issues that
313
300
broke on OpenBSD.
314
- (merge 27f6342 jc/maint-test-portability later to maint).
315
301
316
302
* t9020 and t3600 tests had various portability issues.
317
- (merge 5a02966 jc/test-portability later to maint).
318
303
319
304
* t9200 runs "cvs init" on a directory that already exists, but a
320
305
platform can configure this fail for the current user (e.g. you
321
306
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).
323
307
324
308
* 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