What's cooking (2015/04 #04)
Junio C Hamano committed
Apr 27, 2015 at 12:37 UTC
c81a7d87e50be3b1cf252757d1d25d4e8aff80e0
1 file changed
+285
-99
whats-cooking.txt
+285
-99
@@ -1,16 +1,20 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2015, #03; Mon, 20)
4
-X-master-at: 7c597ef345aed345576de616c51f27e6f4b342b3
5
-X-next-at: aa1ae690dee8648c2e1169b5e9a10dbc28109e56
3
+Subject: What's cooking in git.git (Apr 2015, #04; Mon, 27)
4
+X-master-at: fb3e7d5515308c73c54c797356651d6ca41b58a6
5
+X-next-at: 800e5753bd3e417587c1acede4a07b3a0f1c5198
6
7
-What's cooking in git.git (Apr 2015, #03; Mon, 20)
7
+What's cooking in git.git (Apr 2015, #04; Mon, 27)
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
+I'll merge two small documentation follow-up to the new features
15
+in 2.4.0 (mg/status-v-v and nd/versioncmp-prereleases topics) to
16
+'master' and tag the final Git 2.4 later this week.
17
+
18
You can find the changes described here in the integration branches
19
of the repositories listed at
20
@@ -53,6 +57,8 @@ of the repositories listed at
57
address, followed by a colon, followed by an empty string (instead
58
of the port number), e.g. ssh://example.com:/path/to/repo.
59
60
+ This should go to the maintenance track, too.
61
+
62
63
* va/fix-git-p4-tests (2015-04-12) 3 commits
64
(merged to 'next' on 2015-04-14 at 261bf90)
@@ -66,59 +72,69 @@ of the repositories listed at
72
[New Topics]
73
74
* 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
75
+ (merged to 'next' on 2015-04-21 at b926f72)
76
+ + parse_date_basic(): let the system handle DST conversion
77
+ + parse_date_basic(): return early when given a bogus timestamp
78
79
"git commit --date=now" or anything that relies on approxidate lost
80
the daylight-saving-time offset.
81
75
- Will merge to 'next'.
82
+ Will merge to 'master' in the second batch of post v2.4 cycle.
83
84
85
* jc/plug-fmt-merge-msg-leak (2015-04-20) 1 commit
79
- - fmt-merge-msg: plug small leak of commit buffer
86
+ (merged to 'next' on 2015-04-21 at 443c728)
87
+ + fmt-merge-msg: plug small leak of commit buffer
88
81
- Will merge to 'next'.
89
+ Will merge to 'master' in the second batch of post v2.4 cycle.
90
91
92
* 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
93
+ (merged to 'next' on 2015-04-21 at f7d56f1)
94
+ + attr: skip UTF8 BOM at the beginning of the input file
95
+ + config: use utf8_bom[] from utf.[ch] in git_parse_source()
96
+ + utf8-bom: introduce skip_utf8_bom() helper
97
+ + add_excludes_from_file: clarify the bom skipping logic
98
+ + dir: allow a BOM at the beginning of exclude files
99
100
Teach the codepaths that read .gitignore and .gitattributes files
101
that these files encoded in UTF-8 may have UTF-8 BOM marker at the
102
beginning; this makes it in line with what we do for configuration
103
files already.
104
96
- Will merge to 'next'.
105
+ Will merge to 'master' in the second batch of post v2.4 cycle.
106
107
99
-* ee/clean-remove-dirs (2015-04-18) 4 commits
108
+* ee/clean-remove-dirs (2015-04-26) 5 commits
109
- clean: improve performance when removing lots of directories
110
- p7300: add performance tests for clean
111
- t7300: add tests to document behavior of clean and nested git
112
+ - setup: sanity check file size in read_gitfile_gently
113
- setup: add gentle version of read_gitfile
114
105
- Still WIP.
115
+ Replace "is this subdirectory a separate repository that should not
116
+ be touched?" check "git clean" does by checking if it has .git/HEAD
117
+ using the submodule-related code with a more optimized check.
118
+
119
+ Will merge to 'next'.
120
121
122
* ep/fix-test-lib-functions-report (2015-04-16) 1 commit
109
- - test-lib-functions.sh: fix the second argument to some helper functions
123
+ (merged to 'next' on 2015-04-21 at 23e584f)
124
+ + test-lib-functions.sh: fix the second argument to some helper functions
125
111
- Will merge to 'next'.
126
+ Will merge to 'master' in the second batch of post v2.4 cycle.
127
128
129
* jk/still-interesting (2015-04-17) 1 commit
115
- - limit_list: avoid quadratic behavior from still_interesting
130
+ (merged to 'next' on 2015-04-21 at 58b54af)
131
+ + limit_list: avoid quadratic behavior from still_interesting
132
133
"git rev-list --objects $old --not --all" to see if everything that
134
is reachable from $old is already connected to the existing refs
135
was very inefficient.
136
121
- Will merge to 'next'.
137
+ Will merge to 'master' in the second batch of post v2.4 cycle.
138
139
140
* jk/type-from-string-gently (2015-04-17) 1 commit
@@ -128,15 +144,18 @@ of the repositories listed at
144
"git cat-file bl $blob" failed to barf even though there is no
145
object type that is "bl".
146
147
+ Will merge to 'master' in the first batch of post v2.4 cycle.
148
+
149
150
* ls/p4-changes-block-size (2015-04-20) 1 commit
133
- - git-p4: use -m when running p4 changes
151
+ (merged to 'next' on 2015-04-21 at 830eeed)
152
+ + git-p4: use -m when running p4 changes
153
154
"git p4" learned "--changes-block-size <n>" to read the changes in
155
chunks from Perforce, instead of making one call to "p4 changes"
156
that may trigger "too many rows scanned" error from Perforce.
157
139
- Will merge to 'next'.
158
+ Will merge to 'master' in the second batch of post v2.4 cycle.
159
160
161
* mg/show-notes-doc (2015-04-17) 1 commit
@@ -149,30 +168,46 @@ of the repositories listed at
168
169
170
* 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
171
+ (merged to 'next' on 2015-04-23 at b1bd21a)
172
+ + stash -p: demonstrate failure of split with mixed y/n
173
+ + t3904-stash-patch: factor PERL prereq at the top of the file
174
+ + t3904-stash-patch: fix test description
175
+ + add -p: demonstrate failure when running 'edit' after a split
176
+ + t3701-add-interactive: simplify code
177
+
178
+ When "add--interactive" splits a hunk into two overlapping hunks
179
+ and then let the user choose only one, it sometimes feeds an
180
+ incorrect patch text to "git apply". Add tests to demonstrate
181
+ this.
182
+
183
+ I have a slight suspicion that this may be $gmane/87202 coming back
184
+ and biting us (I seem to have said "let's run with this and see
185
+ what happens" back then).
186
+
187
+ Will merge to 'master'.
188
189
190
* 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>
191
+ (merged to 'next' on 2015-04-21 at 03e951c)
192
+ + log -L: improve error message on malformed argument
193
+ + Documentation: change -L:<regex> to -L:<funcname>
194
163
- Will merge to 'next'.
195
+ Will merge to 'master' in the second batch of post v2.4 cycle.
196
197
198
* nd/pathspec-strip-fix (2015-04-18) 1 commit
199
- pathspec: adjust prefixlen after striping trailing slash
200
201
+ Does not quite fix ($gmane/267614).
202
+
203
204
* nd/t1509-chroot-test (2015-04-18) 1 commit
171
- - t1509: update prepare script to be able to run t1509 in chroot again
205
+ (merged to 'next' on 2015-04-21 at 60d35d3)
206
+ + t1509: update prepare script to be able to run t1509 in chroot again
207
208
Correct test bitrot.
209
175
- Will merge to 'next'.
210
+ Will merge to 'master' in the first batch of post v2.4 cycle.
211
212
213
* oh/fix-config-default-user-name-section (2015-04-17) 1 commit
@@ -186,31 +221,166 @@ of the repositories listed at
221
Will merge to 'master' in the first batch of post v2.4 cycle.
222
223
189
-* tb/t0027-crlf (2015-04-18) 2 commits
190
- - t0027: support NATIVE_CRLF platforms
191
- - t0027: cleanup: rename functions; avoid non-leading TABs
224
+* tb/t0027-crlf (2015-04-25) 3 commits
225
+ - t0027: Add repoMIX and LF_nul
226
+ (merged to 'next' on 2015-04-21 at 142cb99)
227
+ + t0027: support NATIVE_CRLF platforms
228
+ + t0027: cleanup: rename functions; avoid non-leading TABs
229
193
- Will merge to 'next'.
230
+ Will merge to 'master' in the first batch of post v2.4 cycle.
231
232
233
* 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
234
+ (merged to 'next' on 2015-04-21 at 9990d41)
235
+ + sha1_file: only freshen packs once per run
236
+ + sha1_file: freshen pack objects before loose
237
+ + reachable: only mark local objects as recent
238
239
Access to objects in repositories that borrow from another one on a
240
slow NFS server unnecessarily got more expensive due to recent code
241
becoming more cautious in a naive way not to lose objects to pruning.
242
243
+ Will merge to 'master' in the second batch of post v2.4 cycle.
244
+
245
+
246
+* jc/gitignore-precedence (2015-04-22) 1 commit
247
+ - ignore: info/exclude should trump core.excludesfile
248
+
249
+ core.excludesfile (defaulting to $XDG_HOME/git/ignore) is supposed
250
+ to be overridden by repository-specific .git/info/exclude file, but
251
+ the order was swapped from the beginning. This belatedly fixes it.
252
+
253
Will merge to 'next'.
254
255
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
256
+* jk/git-no-more-argv0-path-munging (2015-04-22) 1 commit
257
+ - stop putting argv[0] dirname at front of PATH
258
+
259
+ We have prepended $GIT_EXEC_PATH and the path "git" is installed in
260
+ (typically "/usr/bin") to $PATH when invoking subprograms and hooks
261
+ for almost eternity, but the original use case the latter tried to
262
+ support was semi-bogus (i.e. install git to /opt/foo/git and run it
263
+ without having /opt/foo on $PATH), and more importantly it has
264
+ become less and less relevant as Git grew more mainstream (i.e. the
265
+ users would _want_ to have it on their $PATH). Stop prepending the
266
+ path in which "git" is installed to users' $PATH, as that would
267
+ interfere the command search order people depend on (e.g. they may
268
+ not like versions of programs that are unrelated to Git in /usr/bin
269
+ and want to override them by having different ones in /usr/local/bin
270
+ and have the latter directory earlier in their $PATH).
271
+
272
+ Will merge to 'next'.
273
+
274
+
275
+* jk/stash-require-clean-index (2015-04-22) 3 commits
276
+ - stash: require a clean index to apply
277
+ - t3903: avoid applying onto dirty index
278
+ - t3903: stop hard-coding commit sha1s
279
+
280
+ "git stash pop/apply" forgot to make sure that not just the working
281
+ tree is clean but also the index is clean. The latter is important
282
+ as a stash application can conflict and the index will be used for
283
+ conflict resolution.
284
+
285
+ Will merge to 'next'.
286
+
287
+
288
+* jc/merge (2015-04-25) 14 commits
289
+ - merge: deprecate 'git merge <message> HEAD <commit>' syntax
290
+ - merge: handle FETCH_HEAD internally
291
+ - merge: decide if we auto-generate the message early in collect_parents()
292
+ - merge: make collect_parents() auto-generate the merge message
293
+ - merge: extract prepare_merge_message() logic out
294
+ - merge: narrow scope of merge_names
295
+ - merge: split reduce_parents() out of collect_parents()
296
+ - merge: clarify collect_parents() logic
297
+ - merge: small leakfix and code simplification
298
+ - merge: do not check argc to determine number of remote heads
299
+ - merge: clarify "pulling into void" special case
300
+ - t5520: test pulling an octopus into an unborn branch
301
+ - t5520: style fixes
302
+ - merge: simplify code flow
303
+ (this branch is used by jc/merge-drop-old-syntax.)
304
+
305
+ "git merge FETCH_HEAD" learned that the previous "git fetch" could
306
+ be to create an Octopus merge, i.e. recording multiple branches
307
+ that are not marked as "not-for-merge"; this allows us to lose an
308
+ old style invocation "git merge <msg> HEAD $commits..." in the
309
+ implementation of "git pull" script; the old style syntax can now
310
+ be deprecated.
311
+
312
+
313
+* jk/test-chain-lint (2015-04-22) 1 commit
314
+ - test-lib: turn on GIT_TEST_CHAIN_LINT by default
315
+
316
+ Will merge to 'next'.
317
+
318
+
319
+* mg/status-v-v (2015-04-23) 1 commit
320
+ (merged to 'next' on 2015-04-25 at cbcaca4)
321
+ + status: document the -v/--verbose option
322
+
323
+ Will merge to 'master'.
324
+
325
+
326
+* mh/ref-lock-avoid-running-out-of-fds (2015-04-25) 8 commits
327
+ - ref_transaction_commit(): only keep one lockfile open at a time
328
+ - ref_transaction_commit(): remove the local flags variables
329
+ - write_ref_sha1(): inline function at callers
330
+ - commit_ref_update(): new function, extracted from write_ref_sha1()
331
+ - write_ref_to_lockfile(): new function, extracted from write_ref_sha1()
332
+ - refs.c: remove lock_fd from struct ref_lock
333
+ - t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE
334
+ - update-ref: test handling large transactions properly
335
+ (this branch is tangled with sb/ref-lock-avoid-running-out-of-fds.)
336
+
337
+ "git update-ref --stdin" was converted to be "transactional" some
338
+ time ago, but the ref transaction machinery was not prepared to
339
+ handle many refs, primarily because it tried to keep the loose ref
340
+ files open at the same time, which would cause us to hit the ENFILE
341
+ limit. Fix the ref_transaction_commit() code not to keep the file
342
+ descriptors open unnecessarily.
343
+
344
+ We would probably want to apply the fix to older codebase, but this
345
+ fix is unfortunately done to apply only on v2.4.x track.
346
+
347
+
348
+* nd/versioncmp-prereleases (2015-04-23) 1 commit
349
+ (merged to 'next' on 2015-04-25 at f824d7f)
350
+ + git tag: mention versionsort.prereleaseSuffix in manpage
351
+
352
+ Will merge to 'master'.
353
+
354
+
355
+* bc/connect-plink (2015-04-27) 3 commits
356
+ - connect: improve check for plink to reduce false positives
357
+ - t5601: fix quotation error leading to skipped tests
358
+ - connect: simplify SSH connection code path
359
+ (this branch uses jc/test-prereq-validate.)
360
+
361
+ The connection initiation code for "ssh" transport tried to absorb
362
+ differences between the stock "ssh" and Putty-supplied "plink" and
363
+ its derivatives, but the logic to tell that we are using "plink"
364
+ variants were too loose and falsely triggered when "plink" appeared
365
+ anywhere in the path (e.g. "/home/me/bin/uplink/ssh").
366
+
367
+ Will merge to 'next'.
368
+
369
+
370
+* jc/test-prereq-validate (2015-04-26) 1 commit
371
+ - test: validate prerequistes syntax
372
+ (this branch is used by bc/connect-plink.)
373
+
374
+ Help us to find broken test script that splits the body part of the
375
+ test by mistaken use of wrong kind of quotes.
376
+
377
+ Will merge to 'next'.
378
+
379
+
380
+* fg/document-commit-message-stripping (2015-04-27) 1 commit
381
+ - Documentation: clarify how "git commit" cleans up the edited log message
382
+
383
+ Will merge to 'next'.
384
385
--------------------------------------------------
386
[Stalled]
@@ -336,28 +506,29 @@ of the repositories listed at
506
507
A few usage string updates.
508
339
- Will hold.
509
+ Will merge to 'next'.
510
511
512
* 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
513
+ (merged to 'next' on 2015-04-21 at c9bce73)
514
+ + t1430: add another refs-escape test
515
+ + read_packed_refs: avoid double-checking sane refs
516
+ + strbuf_getwholeline: use getdelim if it is available
517
+ + strbuf_getwholeline: avoid calling strbuf_grow
518
+ + strbuf_addch: avoid calling strbuf_grow
519
+ + config: use getc_unlocked when reading from file
520
+ + strbuf_getwholeline: use getc_unlocked
521
+ + git-compat-util: add fallbacks for unlocked stdio
522
+ + strbuf_getwholeline: use getc macro
523
524
An earlier rewrite to use strbuf_getwholeline() instead of fgets(3)
525
to read packed-refs file revealed that the former is unacceptably
526
inefficient.
527
357
- Will merge to 'next'.
528
+ Will merge to 'master' in the second batch of post v2.4 cycle.
529
530
360
-* kk/log-merges-config (2015-04-04) 5 commits
531
+* kk/log-merges-config (2015-04-21) 5 commits
532
- bash-completion: add support for git-log --merges= and log.merges
533
- t4202-log: add tests for --merges=
534
- Documentation: add git-log --merges= option and log.merges config. var
@@ -403,25 +574,15 @@ of the repositories listed at
574
575
576
* lm/squelch-bg-progress (2015-04-15) 2 commits
406
- - compat/mingw: stubs for getpgid() and tcgetpgrp()
407
- - progress: no progress in background
577
+ (merged to 'next' on 2015-04-21 at 9a8b1e9)
578
+ + compat/mingw: stubs for getpgid() and tcgetpgrp()
579
+ + progress: no progress in background
580
581
Many long-running operations show progress eye-candy, even when
582
they are later backgrounded. Hide the eye-candy when the process
583
is sent to the background instead.
584
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.)
585
+ Will merge to 'master' in the second batch of post v2.4 cycle.
586
587
588
* sb/test-bitmap-free-at-end (2015-04-12) 1 commit
@@ -431,13 +592,14 @@ of the repositories listed at
592
Will merge to 'master' in the first batch of post v2.4 cycle.
593
594
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
595
+* va/p4-client-path (2015-04-23) 2 commits
596
+ (merged to 'next' on 2015-04-23 at e0d2065)
597
+ + git-p4: improve client path detection when branches are used
598
+ + t9801: check git-p4's branch detection with client spec enabled
599
600
git p4 attempts to better handle branches in Perforce.
601
440
- Will merge to 'next'.
602
+ Will merge to 'master'.
603
604
605
* jk/at-push-sha1 (2015-03-31) 6 commits
@@ -456,9 +618,10 @@ of the repositories listed at
618
619
620
* jk/sha1-file-reduce-useless-warnings (2015-03-30) 1 commit
459
- - sha1_file: squelch "packfile cannot be accessed" warnings
621
+ (merged to 'next' on 2015-04-21 at a8bd995)
622
+ + sha1_file: squelch "packfile cannot be accessed" warnings
623
461
- Will merge to 'next'.
624
+ Will merge to 'master' in the second batch of post v2.4 cycle.
625
626
627
* mh/show-branch-topic (2015-03-31) 1 commit
@@ -517,25 +680,18 @@ of the repositories listed at
680
Will cook in 'next'.
681
682
520
-* jc/merge-deprecate-old-syntax (2015-03-26) 1 commit
521
- - merge: deprecate 'git merge <message> HEAD <commit>' syntax
522
- (this branch is used by jc/merge-drop-old-syntax.)
523
-
524
- The first step to really start the process of removing the ancient
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
533
- (this branch uses jc/merge-deprecate-old-syntax.)
534
-
535
- Stop supporting "git merge <messsage> HEAD <commit>" syntax that
536
- has been deprecated since October 2007.
683
+* pt/xdg-config-path (2015-04-12) 7 commits
684
+ - path.c: remove home_config_paths()
685
+ - git-config: replace use of home_config_paths()
686
+ - git-commit: replace use of home_config_paths()
687
+ - credential-store.c: replace home_config_paths() with xdg_config_home()
688
+ - dir.c: replace home_config_paths() with xdg_config_home()
689
+ - attr.c: replace home_config_paths() with xdg_config_home()
690
+ - path.c: implement xdg_config_home()
691
+ (this branch uses pt/credential-xdg.)
692
538
- This regresses "git pull" in various ways; do not merge ($gmane/267432).
693
+ Seen some discussions.
694
+ Waiting for a reroll ($gmane/267518).
695
696
697
* jc/diff-no-index-d-f (2015-03-26) 2 commits
@@ -645,13 +801,14 @@ of the repositories listed at
801
802
803
* 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
804
+ (merged to 'next' on 2015-04-21 at 919b80d)
805
+ + index-pack: kill union delta_base to save memory
806
+ + index-pack: reduce object_entry size to save memory
807
808
Memory usage of "git index-pack" has been trimmed by tens of
809
per-cent.
810
654
- Will merge to 'next'.
811
+ Will merge to 'master' in the second batch of post v2.4 cycle.
812
813
814
* nd/list-files (2015-02-09) 21 commits
@@ -775,3 +932,32 @@ of the repositories listed at
932
Add a built-in "userdiff" patterns to word-split and identify
933
notable lines in shell scripts to help presentation of diff and
934
grep output.
935
+
936
+
937
+* sb/ref-lock-avoid-running-out-of-fds (2015-04-23) 5 commits
938
+ . refs.c: enable large transactions
939
+ . sha1_file.c: move get_max_fd_limit(void) to wrapper.c
940
+ - refs.c: remove lock_fd from struct ref_lock
941
+ - t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE
942
+ - update-ref: test handling large transactions properly
943
+ (this branch is tangled with mh/ref-lock-avoid-running-out-of-fds.)
944
+
945
+
946
+* jc/merge-deprecate-old-syntax (2015-03-26) 1 commit
947
+ . merge: deprecate 'git merge <message> HEAD <commit>' syntax
948
+
949
+ The first step to really start the process of removing the ancient
950
+ syntax to invoke a two-way merge, which has been deprecated since
951
+ October 2007.
952
+
953
+ This regresses "git pull" in various ways; do not merge ($gmane/267432).
954
+
955
+
956
+* jc/merge-drop-old-syntax (2015-04-25) 1 commit
957
+ - merge: drop 'git merge <message> HEAD <commit>' syntax
958
+ (this branch uses jc/merge.)
959
+
960
+ Stop supporting "git merge <messsage> HEAD <commit>" syntax that
961
+ has been deprecated since October 2007.
962
+
963
+ This regresses "git pull" in various ways; do not merge ($gmane/267432).