What's cooking (2015/03 #03)
Junio C Hamano committed
Apr 20, 2015 at 16:02 UTC
34ca5788522d006176579a747c29ee11114a33b7
1 file changed
+246
-251
whats-cooking.txt
+246
-251
@@ -1,21 +1,16 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2015, #02; Tue, 14)
4
-X-master-at: e46fe3df01435bf523d2ab4f2755556c0e4e6f78
5
-X-next-at: 261bf90abd228250f9684d6ab3165ecae03d793a
3
+Subject: What's cooking in git.git (Apr 2015, #03; Mon, 20)
4
+X-master-at: 7c597ef345aed345576de616c51f27e6f4b342b3
5
+X-next-at: aa1ae690dee8648c2e1169b5e9a10dbc28109e56
6
7
-What's cooking in git.git (Apr 2015, #02; Tue, 14)
7
+What's cooking in git.git (Apr 2015, #03; Mon, 20)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-The second release candidate 2.4-rc2 has been tagged. There were a
15
-few more topics I felt are safe to merge, but they had updates to
16
-translatable strings, which would add last-minute burden to our l10n
17
-teams, so they are held back for the remainder of the cycle.
18
-
14
You can find the changes described here in the integration branches
15
of the repositories listed at
16
@@ -24,222 +19,202 @@ of the repositories listed at
19
--------------------------------------------------
20
[Graduated to "master"]
21
27
-* iu/fix-parse-options-h-comment (2015-03-29) 1 commit
28
- (merged to 'next' on 2015-04-02 at 7fd3cef)
29
- + parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval
22
+* jc/push-cert (2015-04-02) 1 commit
23
+ (merged to 'next' on 2015-04-08 at aecdd43)
24
+ + push --signed: tighten what the receiving end can ask to sign
25
26
+ The "git push --signed" protocol extension did not limit what the
27
+ "nonce" that is a server-chosen string can contain or how long it
28
+ can be, which was unnecessarily lax. Limit both the length and the
29
+ alphabet to a reasonably small space that can still have enough
30
+ entropy.
31
32
-* jc/update-instead-into-void (2015-04-01) 1 commit
33
- (merged to 'next' on 2015-04-08 at 8ef4e15)
34
- + push-to-deploy: allow pushing into an unborn branch and updating it
32
36
- A push into an unborn branch, with "receive.denyCurrentBranch" set
37
- to "updateInstead", did not check out the working tree as expected.
33
+* ma/bash-completion-leaking-x (2015-04-12) 1 commit
34
+ (merged to 'next' on 2015-04-14 at 3a52a6d)
35
+ + completion: fix global bash variable leak on __gitcompappend
36
37
+ The completion script (in contrib/) contaminated global namespace
38
+ and clobbered on a shell variable $x.
39
40
-* jk/cherry-pick-docfix (2015-03-30) 1 commit
41
- (merged to 'next' on 2015-04-02 at 40da1d7)
42
- + cherry-pick: fix docs describing handling of empty commits
40
41
+* ps/grep-help-all-callback-arg (2015-04-12) 1 commit
42
+ (merged to 'next' on 2015-04-14 at e0a8092)
43
+ + grep: correctly initialize help-all option
44
45
-* jk/colors (2015-04-04) 1 commit
46
- (merged to 'next' on 2015-04-08 at 9b9e6f2)
47
- + diff-highlight: do not split multibyte characters
45
+ Code clean-up.
46
49
- "diff-highlight" (in contrib/) used to show byte-by-byte
50
- differences, which meant that multi-byte characters can be chopped
51
- in the middle. It learned to pay attention to character boundaries
52
- (assuming the UTF-8 payload).
47
48
+* tb/connect-ipv6-parse-fix (2015-04-08) 1 commit
49
+ (merged to 'next' on 2015-04-14 at e720918)
50
+ + connect.c: ignore extra colon after hostname
51
55
-* jk/merge-quiet (2015-04-02) 1 commit
56
- (merged to 'next' on 2015-04-08 at 6475433)
57
- + merge: pass verbosity flag down to merge-recursive
52
+ An earlier update to the parser that disects a URL broke an
53
+ address, followed by a colon, followed by an empty string (instead
54
+ of the port number), e.g. ssh://example.com:/path/to/repo.
55
59
- "git merge --quiet" did not squelch messages from the underlying
60
- merge-recursive strategy.
56
57
+* va/fix-git-p4-tests (2015-04-12) 3 commits
58
+ (merged to 'next' on 2015-04-14 at 261bf90)
59
+ + t9814: guarantee only one source exists in git-p4 copy tests
60
+ + git-p4: fix copy detection test
61
+ + t9814: fix broken shell syntax in git-p4 rename test
62
63
-* jk/pack-corruption-post-mortem (2015-04-01) 1 commit
64
- (merged to 'next' on 2015-04-08 at 890c04e)
65
- + howto: document more tools for recovery corruption
63
+ Test fixes for git-p4.
64
67
- Documentation update.
65
+--------------------------------------------------
66
+[New Topics]
67
68
+* jc/epochtime-wo-tz (2015-04-15) 2 commits
69
+ - parse_date_basic(): let the system handle DST conversion
70
+ - parse_date_basic(): return early when given a bogus timestamp
71
70
-* jn/doc-fast-import-no-16-octopus-limit (2015-03-31) 1 commit
71
- (merged to 'next' on 2015-04-08 at 341ca70)
72
- + fast-import doc: remove suggested 16-parent limit
72
+ "git commit --date=now" or anything that relies on approxidate lost
73
+ the daylight-saving-time offset.
74
74
- Documentation update.
75
+ Will merge to 'next'.
76
77
77
-* jz/gitweb-conf-doc-fix (2015-03-31) 1 commit
78
- (merged to 'next' on 2015-04-02 at 237d1bc)
79
- + gitweb.conf.txt: say "build-time", not "built-time"
78
+* jc/plug-fmt-merge-msg-leak (2015-04-20) 1 commit
79
+ - fmt-merge-msg: plug small leak of commit buffer
80
81
- Documentation update.
81
+ Will merge to 'next'.
82
83
84
-* pt/enter-repo-comment-fix (2015-03-31) 1 commit
85
- (merged to 'next' on 2015-04-02 at 276ad7e)
86
- + enter_repo(): fix docs to match code
84
+* cn/bom-in-gitignore (2015-04-16) 5 commits
85
+ - attr: skip UTF8 BOM at the beginning of the input file
86
+ - config: use utf8_bom[] from utf.[ch] in git_parse_source()
87
+ - utf8-bom: introduce skip_utf8_bom() helper
88
+ - add_excludes_from_file: clarify the bom skipping logic
89
+ - dir: allow a BOM at the beginning of exclude files
90
88
- Documentation update.
91
+ Teach the codepaths that read .gitignore and .gitattributes files
92
+ that these files encoded in UTF-8 may have UTF-8 BOM marker at the
93
+ beginning; this makes it in line with what we do for configuration
94
+ files already.
95
96
+ Will merge to 'next'.
97
91
-* sb/plug-streaming-leak (2015-03-31) 1 commit
92
- (merged to 'next' on 2015-04-08 at 226bdd8)
93
- + streaming.c: fix a memleak
98
99
+* ee/clean-remove-dirs (2015-04-18) 4 commits
100
+ - clean: improve performance when removing lots of directories
101
+ - p7300: add performance tests for clean
102
+ - t7300: add tests to document behavior of clean and nested git
103
+ - setup: add gentle version of read_gitfile
104
96
-* sb/plug-wt-shortstatus-tracking-leak (2015-03-30) 1 commit
97
- (merged to 'next' on 2015-04-08 at bd6291b)
98
- + wt-status.c: fix a memleak
105
+ Still WIP.
106
100
---------------------------------------------------
101
-[New Topics]
107
103
-* ah/usage-strings (2015-04-02) 2 commits
104
- - branch: fix funny-sounding error message
105
- - standardize usage strings that were missed the first time
108
+* ep/fix-test-lib-functions-report (2015-04-16) 1 commit
109
+ - test-lib-functions.sh: fix the second argument to some helper functions
110
107
- A few usage string updates.
111
+ Will merge to 'next'.
112
109
- Will hold.
113
114
+* jk/still-interesting (2015-04-17) 1 commit
115
+ - limit_list: avoid quadratic behavior from still_interesting
116
112
-* jk/reading-packed-refs (2015-04-05) 6 commits
113
- - refname_is_safe: avoid expensive normalize_path_copy call
114
- - t1430: add another refs-escape test
115
- - strbuf: add an optimized 1-character strbuf_grow
116
- - strbuf_getwholeline: use getc_unlocked
117
- - git-compat-util: add fallbacks for unlocked stdio
118
- - strbuf_getwholeline: use getc macro
117
+ "git rev-list --objects $old --not --all" to see if everything that
118
+ is reachable from $old is already connected to the existing refs
119
+ was very inefficient.
120
120
- An earlier rewrite to use strbuf_getwholeline() instead of fgets(3)
121
- to read packed-refs file revealed that the former is unacceptably
122
- inefficient.
121
+ Will merge to 'next'.
122
124
- There were further discussions on this topic to use getdelim(3).
125
- $gmane/266932
123
127
- Expecting a reroll.
124
+* jk/type-from-string-gently (2015-04-17) 1 commit
125
+ (merged to 'next' on 2015-04-20 at a97611f)
126
+ + type_from_string_gently: make sure length matches
127
128
+ "git cat-file bl $blob" failed to barf even though there is no
129
+ object type that is "bl".
130
130
-* kk/log-merges-config (2015-04-04) 5 commits
131
- - bash-completion: add support for git-log --merges= and log.merges
132
- - t4202-log: add tests for --merges=
133
- - Documentation: add git-log --merges= option and log.merges config. var
134
- - log: honor log.merges= option
135
- - revision: add --merges={show|only|hide} option
131
137
- "git log" (but not other commands in the "log" family) learned to
138
- pay attention to the log.merges configuration variable that can be
139
- set to "show" (the normal behaviour), "only" (hide non-merge
140
- commits), or "hide" (hide merge commits). --merges=(show|only|hide)
141
- can be used to override the setting from the command line.
132
+* ls/p4-changes-block-size (2015-04-20) 1 commit
133
+ - git-p4: use -m when running p4 changes
134
143
- The documentation may need to be updated once more.
135
+ "git p4" learned "--changes-block-size <n>" to read the changes in
136
+ chunks from Perforce, instead of making one call to "p4 changes"
137
+ that may trigger "too many rows scanned" error from Perforce.
138
139
+ Will merge to 'next'.
140
146
-* kn/cat-file-literally (2015-04-05) 5 commits
147
- - SQUASH???
148
- - t1006: add tests for git cat-file --literally
149
- - cat-file: add documentation for '--literally' option.
150
- - cat-file: teach cat-file a '--literally' option
151
- - sha1_file.c: support reading from a loose object of unknown type
141
153
- Add the "--literally" option to "cat-file" to allow inspecting
154
- loose objects of an experimental or a broken type.
155
-
156
- This is v7 $gmane/266761; getting closer to the final, I would say.
142
+* mg/show-notes-doc (2015-04-17) 1 commit
143
+ (merged to 'next' on 2015-04-20 at 2e93969)
144
+ + rev-list-options.txt: complete sentence about notes matching
145
146
+ Documentation fix.
147
159
-* ld/p4-filetype-detection (2015-04-04) 3 commits
160
- (merged to 'next' on 2015-04-08 at da735b4)
161
- + git-p4: fix filetype detection on files opened exclusively
162
- + git-p4: small fix for locked-file-move-test
163
- + git-p4: fix small bug in locked test scripts
148
+ Will merge to 'master' in the first batch of post v2.4 cycle.
149
165
- Will hold.
150
151
+* mm/add-p-split-error (2015-04-16) 5 commits
152
+ - stash -p: demonstrate failure of split with mixed y/n
153
+ - t3904-stash-patch: factor PERL prereq at the top of the file
154
+ - t3904-stash-patch: fix test description
155
+ - add -p: demonstrate failure when running 'edit' after a split
156
+ - t3701-add-interactive: simplify code
157
168
-* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
169
- - t/lib-git-svn: check same httpd module dirs as lib-httpd
170
- - t/lib-httpd: load mod_unixd
158
172
- This is the first two commits in a three-patch series $gmane/266962
159
+* mm/usage-log-l-can-take-regex (2015-04-20) 2 commits
160
+ - log -L: improve error message on malformed argument
161
+ - Documentation: change -L:<regex> to -L:<funcname>
162
163
+ Will merge to 'next'.
164
175
-* tb/connect-ipv6-parse-fix (2015-04-08) 1 commit
176
- (merged to 'next' on 2015-04-14 at e720918)
177
- + connect.c: ignore extra colon after hostname
165
179
- An earlier update to the parser that disects an address broke an
180
- address, followed by a colon, followed by an empty string (instead
181
- of the port number).
166
+* nd/pathspec-strip-fix (2015-04-18) 1 commit
167
+ - pathspec: adjust prefixlen after striping trailing slash
168
183
- Will merge to 'master' in the first batch of post v2.4 cycle.
169
170
+* nd/t1509-chroot-test (2015-04-18) 1 commit
171
+ - t1509: update prepare script to be able to run t1509 in chroot again
172
186
-* lm/squelch-bg-progress (2015-04-14) 1 commit
187
- - progress: no progress in background
173
+ Correct test bitrot.
174
189
- Many long-running operations show progress eye-candy, even when
190
- they are later backgrounded. Hide the eye-candy when the process
191
- is sent to the background instead.
175
+ Will merge to 'next'.
176
193
- Needs a follow-up compat/ updates for platforms that lack POSIXy
194
- process group support before this topic can move forward.
177
178
+* oh/fix-config-default-user-name-section (2015-04-17) 1 commit
179
+ (merged to 'next' on 2015-04-20 at b74b914)
180
+ + config: fix settings in default_user_config template
181
197
-* ma/bash-completion-leaking-x (2015-04-12) 1 commit
198
- (merged to 'next' on 2015-04-14 at 3a52a6d)
199
- + completion: fix global bash variable leak on __gitcompappend
182
+ The default $HOME/.gitconfig file created upon "git config --global"
183
+ that edits it had incorrectly spelled user.name and user.email
184
+ entries in it.
185
186
Will merge to 'master' in the first batch of post v2.4 cycle.
187
188
204
-* ps/grep-help-all-callback-arg (2015-04-12) 1 commit
205
- (merged to 'next' on 2015-04-14 at e0a8092)
206
- + grep: correctly initialize help-all option
189
+* tb/t0027-crlf (2015-04-18) 2 commits
190
+ - t0027: support NATIVE_CRLF platforms
191
+ - t0027: cleanup: rename functions; avoid non-leading TABs
192
208
- Code clean-up.
193
+ Will merge to 'next'.
194
210
- Will merge to 'master' in the first batch of post v2.4 cycle.
195
196
+* jk/prune-mtime (2015-04-20) 3 commits
197
+ - sha1_file: only freshen packs once per run
198
+ - sha1_file: freshen pack objects before loose
199
+ - reachable: only mark local objects as recent
200
213
-* pt/xdg-config-path (2015-04-12) 7 commits
214
- - path.c: remove home_config_paths()
215
- - git-config: replace use of home_config_paths()
216
- - git-commit: replace use of home_config_paths()
217
- - credential-store.c: replace home_config_paths() with xdg_config_home()
218
- - dir.c: replace home_config_paths() with xdg_config_home()
219
- - attr.c: replace home_config_paths() with xdg_config_home()
220
- - path.c: implement xdg_config_home()
221
- (this branch uses pt/credential-xdg.)
201
+ Access to objects in repositories that borrow from another one on a
202
+ slow NFS server unnecessarily got more expensive due to recent code
203
+ becoming more cautious in a naive way not to lose objects to pruning.
204
205
+ Will merge to 'next'.
206
224
-* sb/test-bitmap-free-at-end (2015-04-12) 1 commit
225
- (merged to 'next' on 2015-04-14 at 0ae4759)
226
- + pack-bitmap.c: fix a memleak
207
228
- Will merge to 'master' in the first batch of post v2.4 cycle.
208
+* sb/remove-fd-from-ref-lock (2015-04-17) 5 commits
209
+ . refs.c: enable large transactions
210
+ . sha1_fiel.c: move get_max_fd_limit(void) to wrapper.c
211
+ . refs.c: remove lock_fd from struct ref_lock
212
+ . t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE
213
+ . update-ref: test handling large transactions properly
214
215
--------------------------------------------------
216
[Stalled]
217
233
-* as/userdiff-sh (2015-03-13) 1 commit
234
- - userdiff: funcname and word patterns for sh
235
-
236
- Add a built-in "userdiff" patterns to word-split and identify
237
- notable lines in shell scripts to help presentation of diff and
238
- grep output.
239
-
240
- Will discard.
241
-
242
-
218
* mh/fdopen-with-retry (2015-03-06) 6 commits
219
- buffer_fdinit(): use fdopen_with_retry()
220
- update_info_file(): use fdopen_with_retry()
@@ -355,23 +330,114 @@ of the repositories listed at
330
--------------------------------------------------
331
[Cooking]
332
358
-* va/fix-git-p4-tests (2015-04-12) 3 commits
359
- (merged to 'next' on 2015-04-14 at 261bf90)
360
- + t9814: guarantee only one source exists in git-p4 copy tests
361
- + git-p4: fix copy detection test
362
- + t9814: fix broken shell syntax in git-p4 rename test
333
+* ah/usage-strings (2015-04-02) 2 commits
334
+ - branch: fix funny-sounding error message
335
+ - standardize usage strings that were missed the first time
336
+
337
+ A few usage string updates.
338
+
339
+ Will hold.
340
+
341
+
342
+* jk/reading-packed-refs (2015-04-16) 9 commits
343
+ - t1430: add another refs-escape test
344
+ - read_packed_refs: avoid double-checking sane refs
345
+ - strbuf_getwholeline: use getdelim if it is available
346
+ - strbuf_getwholeline: avoid calling strbuf_grow
347
+ - strbuf_addch: avoid calling strbuf_grow
348
+ - config: use getc_unlocked when reading from file
349
+ - strbuf_getwholeline: use getc_unlocked
350
+ - git-compat-util: add fallbacks for unlocked stdio
351
+ - strbuf_getwholeline: use getc macro
352
+
353
+ An earlier rewrite to use strbuf_getwholeline() instead of fgets(3)
354
+ to read packed-refs file revealed that the former is unacceptably
355
+ inefficient.
356
+
357
+ Will merge to 'next'.
358
+
359
+
360
+* kk/log-merges-config (2015-04-04) 5 commits
361
+ - bash-completion: add support for git-log --merges= and log.merges
362
+ - t4202-log: add tests for --merges=
363
+ - Documentation: add git-log --merges= option and log.merges config. var
364
+ - log: honor log.merges= option
365
+ - revision: add --merges={show|only|hide} option
366
+
367
+ "git log" (but not other commands in the "log" family) learned to
368
+ pay attention to the log.merges configuration variable that can be
369
+ set to "show" (the normal behaviour), "only" (hide non-merge
370
+ commits), or "hide" (hide merge commits). --merges=(show|only|hide)
371
+ can be used to override the setting from the command line.
372
+
373
+ The documentation may need to be updated once more.
374
+
375
364
- Test fixes for git-p4
376
+* kn/cat-file-literally (2015-04-15) 5 commits
377
+ - SQUASH???
378
+ - t1006: add tests for git cat-file --literally
379
+ - cat-file: add documentation for '--literally' option.
380
+ - cat-file: teach cat-file a '--literally' option
381
+ - sha1_file.c: support reading from a loose object of unknown type
382
+
383
+ Add the "--literally" option to "cat-file" to allow inspecting
384
+ loose objects of an experimental or a broken type.
385
+
386
+ This is v8 $gmane/267213; getting closer to the final, I would say.
387
+
388
+
389
+* ld/p4-filetype-detection (2015-04-04) 3 commits
390
+ (merged to 'next' on 2015-04-08 at da735b4)
391
+ + git-p4: fix filetype detection on files opened exclusively
392
+ + git-p4: small fix for locked-file-move-test
393
+ + git-p4: fix small bug in locked test scripts
394
395
Will merge to 'master' in the first batch of post v2.4 cycle.
396
397
369
-* va/p4-client-path (2015-03-28) 2 commits
398
+* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
399
+ - t/lib-git-svn: check same httpd module dirs as lib-httpd
400
+ - t/lib-httpd: load mod_unixd
401
+
402
+ This is the first two commits in a three-patch series $gmane/266962
403
+
404
+
405
+* lm/squelch-bg-progress (2015-04-15) 2 commits
406
+ - compat/mingw: stubs for getpgid() and tcgetpgrp()
407
+ - progress: no progress in background
408
+
409
+ Many long-running operations show progress eye-candy, even when
410
+ they are later backgrounded. Hide the eye-candy when the process
411
+ is sent to the background instead.
412
+
413
+ Will merge to 'next'.
414
+
415
+
416
+* pt/xdg-config-path (2015-04-12) 7 commits
417
+ - path.c: remove home_config_paths()
418
+ - git-config: replace use of home_config_paths()
419
+ - git-commit: replace use of home_config_paths()
420
+ - credential-store.c: replace home_config_paths() with xdg_config_home()
421
+ - dir.c: replace home_config_paths() with xdg_config_home()
422
+ - attr.c: replace home_config_paths() with xdg_config_home()
423
+ - path.c: implement xdg_config_home()
424
+ (this branch uses pt/credential-xdg.)
425
+
426
+
427
+* sb/test-bitmap-free-at-end (2015-04-12) 1 commit
428
+ (merged to 'next' on 2015-04-14 at 0ae4759)
429
+ + pack-bitmap.c: fix a memleak
430
+
431
+ Will merge to 'master' in the first batch of post v2.4 cycle.
432
+
433
+
434
+* va/p4-client-path (2015-04-19) 2 commits
435
- git-p4: improve client path detection when branches are used
436
- t9801: check git-p4's branch detection and client view together
437
373
- Attempt to better handle branches in perforce by git p4
374
- Reviews by git-p4 experts are very much appreciated.
438
+ git p4 attempts to better handle branches in Perforce.
439
+
440
+ Will merge to 'next'.
441
442
443
* jk/at-push-sha1 (2015-03-31) 6 commits
@@ -382,10 +448,18 @@ of the repositories listed at
448
- remote.c: drop "remote" pointer from "struct branch"
449
- remote.c: drop default_remote_name variable
450
451
+ Introduce <branch>@{push} short-hand to denote the remote-tracking
452
+ branch that tracks the branch at the remote the <branch> would be
453
+ pushed to.
454
+
455
+ Waiting for a reroll ($gmane/266573).
456
+
457
458
* jk/sha1-file-reduce-useless-warnings (2015-03-30) 1 commit
459
- sha1_file: squelch "packfile cannot be accessed" warnings
460
461
+ Will merge to 'next'.
462
+
463
464
* mh/show-branch-topic (2015-03-31) 1 commit
465
(merged to 'next' on 2015-04-08 at 628ada5)
@@ -405,19 +479,6 @@ of the repositories listed at
479
Will merge to 'master' in the first batch of post v2.4 cycle.
480
481
408
-* jc/push-cert (2015-04-02) 1 commit
409
- (merged to 'next' on 2015-04-08 at aecdd43)
410
- + push --signed: tighten what the receiving end can ask to sign
411
-
412
- The "git push --signed" protocol extension did not limit what the
413
- "nonce" that is a server-chosen string can contain or how long it
414
- can be, which was unnecessarily lax. Limit both the length and the
415
- alphabet to a reasonably small space that can still have enough
416
- entropy.
417
-
418
- Will merge to 'master' in the first batch of post v2.4 cycle.
419
-
420
-
482
* jk/init-core-worktree-at-root (2015-04-02) 1 commit
483
(merged to 'next' on 2015-04-08 at 92a942b)
484
+ init: don't set core.worktree when initializing /.git
@@ -464,6 +525,8 @@ of the repositories listed at
525
syntax to invoke a two-way merge, which has been deprecated since
526
October 2007.
527
528
+ This regresses "git pull" in various ways; do not merge ($gmane/267432).
529
+
530
531
* jc/merge-drop-old-syntax (2015-03-26) 1 commit
532
- merge: drop 'git merge <message> HEAD <commit>' syntax
@@ -472,6 +535,8 @@ of the repositories listed at
535
Stop supporting "git merge <messsage> HEAD <commit>" syntax that
536
has been deprecated since October 2007.
537
538
+ This regresses "git pull" in various ways; do not merge ($gmane/267432).
539
+
540
541
* jc/diff-no-index-d-f (2015-03-26) 2 commits
542
(merged to 'next' on 2015-03-27 at 1f270f9)
@@ -485,7 +550,7 @@ of the repositories listed at
550
and compare the file with the file with the same name in the
551
directory, instead of refusing to run.
552
488
- Will cook in 'next'.
553
+ Will merge to 'master' in the first batch of post v2.4 cycle.
554
555
556
* nd/diff-i-t-a (2015-03-23) 1 commit
@@ -579,14 +644,14 @@ of the repositories listed at
644
that seems to have seen no interest X-<.
645
646
582
-* nd/slim-index-pack-memory-usage (2015-02-27) 2 commits
647
+* nd/slim-index-pack-memory-usage (2015-04-18) 2 commits
648
- index-pack: kill union delta_base to save memory
649
- index-pack: reduce object_entry size to save memory
650
651
Memory usage of "git index-pack" has been trimmed by tens of
652
per-cent.
653
589
- Waiting for further comments and a final reroll ($gmane/264544).
654
+ Will merge to 'next'.
655
656
657
* nd/list-files (2015-02-09) 21 commits
@@ -704,79 +769,9 @@ of the repositories listed at
769
--------------------------------------------------
770
[Discarded]
771
707
-* ak/stash-store-create-help (2015-01-13) 1 commit
708
- . stash: show "create" and "store" subcommands in usage-help
709
-
710
-
711
-* bp/diff-relative-config (2015-01-07) 2 commits
712
- . diff: teach diff.relative to give default to --relative=<value>
713
- . diff: teach --no-relative to override earlier --relative
714
-
715
-
716
-* je/quiltimport-no-fuzz (2014-10-21) 2 commits
717
- . git-quiltimport: flip the default not to allow fuzz
718
- . git-quiltimport.sh: allow declining fuzz with --exact option
719
-
720
- "quiltimport" drove "git apply" always with -C1 option to reduce
721
- context of the patch in order to give more chance to somewhat stale
722
- patches to apply. Add an "--exact" option to disable, and also
723
- "-C$n" option to customize this behaviour. The top patch
724
- optionally flips the default to "--exact".
725
-
726
-
727
-* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
728
- . SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
729
- . git-add--interactive: Preserve diff heading when splitting hunks
730
-
731
-
732
-* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
733
- . userdiff: support Java try keyword
734
- . userdiff: support C# async methods and correct C# keywords
735
-
736
-
737
-* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
738
- . git-rebase: print name of rev when using shorthand
739
-
740
- Teach "git rebase -" to report the concrete name of the branch
741
- (i.e. the previous one).
742
-
743
- But it stops short and does not do the same for "git rebase @{-1}".
744
-
745
-
746
-* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
747
- . merge: drop unused arg from abort_commit method signature
748
- . merge: make prepare_to_commit responsible for write_merge_state
749
- . t7505: ensure cleanup after hook blocks merge
750
- . t7505: add missing &&
751
-
752
- Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
753
- run during "git merge". The log message stresses too much on one
754
- hook, prepare-commit-msg, but it would equally apply to other hooks
755
- like post-merge, I think.
756
-
757
-
758
-* jc/graph-post-root-gap (2013-12-30) 3 commits
759
- . WIP: document what we want at the end
760
- . graph: remove unused code a bit
761
- . graph: stuff the current commit into graph->columns[]
762
-
763
- This was primarily a RFH ($gmane/239580).
764
-
765
-
766
-* ts/man-pdf (2015-03-20) 1 commit
767
- . Documentation: make 'make pdf' format manpages to PDF as well
768
-
769
- For offline consumption of manual pages, a target to produce one
770
- pdf document per manual page was added to Documentation/Makefile.
771
-
772
- Its usefulness is unknown, given that this does not produce a
773
- single document with all the manual pages in it, which would be not
774
- much better than keeping a bunch of HTML manual pages we already
775
- produce and use them instead for offline consumption.
776
-
777
- Discarded, while leaving a single-document target as an open
778
- possibility.
779
-
772
+* as/userdiff-sh (2015-03-13) 1 commit
773
+ . userdiff: funcname and word patterns for sh
774
781
-* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
782
- . gitweb: Harden UTF-8 handling in generated links
775
+ Add a built-in "userdiff" patterns to word-split and identify
776
+ notable lines in shell scripts to help presentation of diff and
777
+ grep output.