What's cooking (2017/03 #02)
Junio C Hamano committed
Mar 3, 2017 at 13:59 UTC
000dd595e40b3240f4bca910932c6049e9790b06
1 file changed
+237
-214
whats-cooking.txt
+237
-214
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2017, #01; Wed, 1)
3
+Subject: What's cooking in git.git (Mar 2017, #02; Fri, 3)
4
X-master-at: 3bc53220cb2dcf709f7a027a3f526befd021d858
5
-X-next-at: e531d8d3a95fec6ab73587571eb5e2443b8523e7
5
+X-next-at: a2ecc84866b651ad965003275b748da92fd99ab4
6
7
-What's cooking in git.git (Mar 2017, #01; Wed, 1)
7
+What's cooking in git.git (Mar 2017, #02; Fri, 3)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -20,130 +20,75 @@ of the repositories listed at
20
--------------------------------------------------
21
[New Topics]
22
23
-* jk/interpret-branch-name (2017-02-28) 8 commits
24
- - checkout: restrict @-expansions when finding branch
25
- - strbuf_check_ref_format(): expand only local branches
26
- - branch: restrict @-expansions when deleting
27
- - t3204: test git-branch @-expansion corner cases
28
- - interpret_branch_name: allow callers to restrict expansions
29
- - strbuf_branchname: add docstring
30
- - strbuf_branchname: drop return value
31
- - interpret_branch_name: move docstring to header file
32
-
33
- "git branch @" created refs/heads/@ as a branch, and in general the
34
- code that handled @{-1} and @{upstream} was a bit too loose in
35
- disambiguating.
36
-
37
- Expecting a reroll.
38
- cf. <20170228123331.wubqplp5zjwzz6is@sigill.intra.peff.net>
39
-
40
-
41
-* jk/sha1dc (2017-03-01) 7 commits
42
- - Put sha1dc on a diet
43
- - sha1dc: avoid 'for' loop initial decl
44
- - sha1dc: resurrect LICENSE file
45
- - sha1dc: avoid c99 declaration-after-statement
46
- - Makefile: add USE_SHA1DC knob
47
- - sha1dc: adjust header includes for git
48
- - add collision-detecting sha1 implementation
49
-
50
- Borrow "detect attempt to create collisions" variant of SHA-1
51
- implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft).
52
-
53
- Expecting a cleaned-up reroll after discussion settles.
54
- cf. <CA+55aFxTWqsTTiDKo4DBZT-8Z9t80bGMD3uijzKONa_bYEZABQ@mail.gmail.com>
55
-
56
-
57
-* js/travis-32bit-linux (2017-02-28) 1 commit
58
- - Travis: also test on 32-bit Linux
59
-
60
- Add 32-bit Linux variant to the set of platforms to be tested with
61
- Travis CI.
62
-
63
- Will merge to 'next'.
64
-
65
-
66
-* jt/http-base-url-update-upon-redirect (2017-02-28) 1 commit
67
- - http: attempt updating base URL only if no error
68
-
69
- When a redirected http transport gets an error during the
70
- redirected request, we ignored the error we got from the server,
71
- and ended up giving a not-so-useful error message.
72
-
73
- Will merge to 'next'.
74
-
75
-
76
-* jt/mark-tree-uninteresting-for-uninteresting-commit (2017-02-28) 3 commits
77
- - upload-pack: compute blob reachability correctly
78
- - revision: exclude trees/blobs given commit
79
- - revision: unify {tree,blob}_objects in rev_info
80
-
81
- The revision/object traversal machinery did not mark all tree and
82
- blob objects that are contained in an uninteresting commit as
83
- uninteresting, because that is quite costly. Instead, it only
84
- marked those that are contained in an uninteresting boundary commit
85
- as uninteresting.
86
-
87
-
88
-* ps/docs-diffcore (2017-02-28) 2 commits
89
- - docs/diffcore: unquote "Complete Rewrites" in headers
90
- - docs/diffcore: fix grammar in diffcore-rename header
23
+* ew/markdown-url-in-readme (2017-03-01) 1 commit
24
+ (merged to 'next' on 2017-03-03 at 3d35e3a991)
25
+ + README: create HTTP/HTTPS links from URLs in Markdown
26
27
Doc update.
28
94
- Will merge to 'next'.
29
+ Will merge to 'master'.
30
31
97
-* rj/remove-unused-mktemp (2017-02-28) 2 commits
98
- - wrapper.c: remove unused gitmkstemps() function
99
- - wrapper.c: remove unused git_mkstemp() function
32
+* jk/add-i-patch-do-prompt (2017-03-02) 1 commit
33
+ - add--interactive: fix missing file prompt for patch mode with "-i"
34
101
- Code cleanup.
35
+ The patch subcommand of "git add -i" was meant to have paths
36
+ selection prompt just like other subcommand, unlike "git add -p"
37
+ directly jumps to hunk selection. Recently, this was broken and
38
+ "add -i" lost the paths selection dialog, but it now has been
39
+ fixed.
40
41
Will merge to 'next'.
42
43
106
-* sb/submodule-init-url-selection (2017-02-28) 1 commit
107
- - submodule init: warn about falling back to a local path
44
+* ax/line-log-range-merge-fix (2017-03-03) 1 commit
45
+ - line-log.c: prevent crash during union of too many ranges
46
109
- Give a warning when "git submodule init" decides that the submodule
110
- in the working tree is its upstream, as it is not a very common
111
- setup.
47
+ The code to parse "git log -L..." command line was buggy when there
48
+ are many ranges specified with -L; overrun of the allocated buffer
49
+ has been fixed.
50
51
Will merge to 'next'.
52
53
116
-* jc/diff-populate-filespec-size-only-fix (2017-03-01) 1 commit
117
- - diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()
54
+* js/early-config (2017-03-03) 11 commits
55
+ - t1309: test read_early_config()
56
+ - read_early_config(): really discover .git/
57
+ - read_early_config(): avoid .git/config hack when unneeded
58
+ - setup: make read_early_config() reusable
59
+ - setup: export the discover_git_directory() function
60
+ - SQUASH??? ERROR: trailing statements should be on next line
61
+ - setup_git_directory_1(): avoid changing global state
62
+ - setup: prepare setup_discovered_git_directory() the root directory
63
+ - SQUASH??? ERROR: trailing statements should be on next line
64
+ - setup_git_directory(): use is_dir_sep() helper
65
+ - t7006: replace dubious test
66
119
- "git diff --quiet" relies on the size field in diff_filespec to be
120
- correctly populated, but diff_populate_filespec() helper function
121
- made an incorrect short-cut when asked only to populate the size
122
- field for paths that need to go through convert_to_git() (e.g. CRLF
123
- conversion).
67
+ The start-up sequence of "git" needs to figure out some configured
68
+ settings before it finds and set itself up in the location of the
69
+ repository and was quite messy due to its "chicken-and-egg" nature.
70
+ The code has been restructured.
71
125
- Will merge to 'next'.
72
+ Will merge to 'next' after squashing niggle-fixes in.
73
74
128
-* nd/conditional-config-include (2017-03-01) 4 commits
129
- - SQUASH???
130
- - config: add conditional include
131
- - config.txt: reflow the second include.path paragraph
132
- - config.txt: clarify multiple key values in include.path
75
+* jt/perf-updates (2017-03-03) 3 commits
76
+ - t/perf: add fallback for pre-bin-wrappers versions of git
77
+ - t/perf: use $MODERN_GIT for all repo-copying steps
78
+ - t/perf: export variable used in other blocks
79
134
- The configuration file learned a new "includeIf.<condition>.path"
135
- that includes the contents of the given path only when the
136
- condition holds. This allows you to say "include this work-related
137
- bit only in the repositories under my ~/work/ directory".
80
+ The t/perf performance test suite was not prepared to test not so
81
+ old versions of Git, but now it covers versions of Git that are not
82
+ so ancient.
83
139
- I think this is almost ready for 'next'.
84
+ Will merge to 'next'.
85
86
142
-* rs/log-email-subject (2017-03-01) 2 commits
143
- - pretty: use fmt_output_email_subject()
144
- - log-tree: factor out fmt_output_email_subject()
87
+* ss/remote-bzr-hg-placeholder-wo-python (2017-03-03) 1 commit
88
+ - contrib: git-remote-{bzr,hg} placeholders don't need Python
89
146
- Code clean-up.
90
+ There is no need for Python only to give a few messages to the
91
+ standard error stream, but we somehow did.
92
93
Will merge to 'next'.
94
@@ -247,6 +192,142 @@ of the repositories listed at
192
--------------------------------------------------
193
[Cooking]
194
195
+* jk/interpret-branch-name (2017-03-02) 9 commits
196
+ - checkout: restrict @-expansions when finding branch
197
+ - strbuf_check_ref_format(): expand only local branches
198
+ - branch: restrict @-expansions when deleting
199
+ - t3204: test git-branch @-expansion corner cases
200
+ - interpret_branch_name: allow callers to restrict expansions
201
+ - strbuf_branchname: add docstring
202
+ - strbuf_branchname: drop return value
203
+ - interpret_branch_name: move docstring to header file
204
+ - interpret_branch_name(): handle auto-namelen for @{-1}
205
+
206
+ "git branch @" created refs/heads/@ as a branch, and in general the
207
+ code that handled @{-1} and @{upstream} was a bit too loose in
208
+ disambiguating.
209
+
210
+ Will merge to 'next'.
211
+
212
+
213
+* jk/sha1dc (2017-03-01) 7 commits
214
+ - Put sha1dc on a diet
215
+ - sha1dc: avoid 'for' loop initial decl
216
+ - sha1dc: resurrect LICENSE file
217
+ - sha1dc: avoid c99 declaration-after-statement
218
+ - Makefile: add USE_SHA1DC knob
219
+ - sha1dc: adjust header includes for git
220
+ - add collision-detecting sha1 implementation
221
+
222
+ Borrow "detect attempt to create collisions" variant of SHA-1
223
+ implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft).
224
+
225
+ Expecting a cleaned-up reroll after discussion settles.
226
+ cf. <CA+55aFxTWqsTTiDKo4DBZT-8Z9t80bGMD3uijzKONa_bYEZABQ@mail.gmail.com>
227
+
228
+
229
+* js/travis-32bit-linux (2017-03-03) 1 commit
230
+ - Travis: also test on 32-bit Linux
231
+
232
+ Add 32-bit Linux variant to the set of platforms to be tested with
233
+ Travis CI.
234
+
235
+ Will merge to 'next'.
236
+
237
+
238
+* jt/http-base-url-update-upon-redirect (2017-02-28) 1 commit
239
+ (merged to 'next' on 2017-03-03 at 5225bd3ef8)
240
+ + http: attempt updating base URL only if no error
241
+
242
+ When a redirected http transport gets an error during the
243
+ redirected request, we ignored the error we got from the server,
244
+ and ended up giving a not-so-useful error message.
245
+
246
+ Will merge to 'master'.
247
+
248
+
249
+* jt/mark-tree-uninteresting-for-uninteresting-commit (2017-02-28) 3 commits
250
+ - upload-pack: compute blob reachability correctly
251
+ - revision: exclude trees/blobs given commit
252
+ - revision: unify {tree,blob}_objects in rev_info
253
+
254
+ The revision/object traversal machinery did not mark all tree and
255
+ blob objects that are contained in an uninteresting commit as
256
+ uninteresting, because that is quite costly. Instead, it only
257
+ marked those that are contained in an uninteresting boundary commit
258
+ as uninteresting.
259
+
260
+ cf. <20170228215937.yd4juycjf7y3vish@sigill.intra.peff.net>
261
+
262
+
263
+* ps/docs-diffcore (2017-02-28) 2 commits
264
+ (merged to 'next' on 2017-03-03 at 9ca5691de2)
265
+ + docs/diffcore: unquote "Complete Rewrites" in headers
266
+ + docs/diffcore: fix grammar in diffcore-rename header
267
+
268
+ Doc update.
269
+
270
+ Will merge to 'master'.
271
+
272
+
273
+* rj/remove-unused-mktemp (2017-02-28) 2 commits
274
+ (merged to 'next' on 2017-03-03 at 4512f0c5ab)
275
+ + wrapper.c: remove unused gitmkstemps() function
276
+ + wrapper.c: remove unused git_mkstemp() function
277
+
278
+ Code cleanup.
279
+
280
+ Will merge to 'master'.
281
+
282
+
283
+* sb/submodule-init-url-selection (2017-02-28) 1 commit
284
+ (merged to 'next' on 2017-03-03 at 847d1f9a91)
285
+ + submodule init: warn about falling back to a local path
286
+
287
+ Give a warning when "git submodule init" decides that the submodule
288
+ in the working tree is its upstream, as it is not a very common
289
+ setup.
290
+
291
+ Will merge to 'master'.
292
+
293
+
294
+* jc/diff-populate-filespec-size-only-fix (2017-03-02) 1 commit
295
+ - diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()
296
+
297
+ "git diff --quiet" relies on the size field in diff_filespec to be
298
+ correctly populated, but diff_populate_filespec() helper function
299
+ made an incorrect short-cut when asked only to populate the size
300
+ field for paths that need to go through convert_to_git() (e.g. CRLF
301
+ conversion).
302
+
303
+ Will merge to 'next'.
304
+
305
+
306
+* nd/conditional-config-include (2017-03-03) 5 commits
307
+ - SQUASH??? cond config include test
308
+ - SQUASH???
309
+ - config: add conditional include
310
+ - config.txt: reflow the second include.path paragraph
311
+ - config.txt: clarify multiple key values in include.path
312
+
313
+ The configuration file learned a new "includeIf.<condition>.path"
314
+ that includes the contents of the given path only when the
315
+ condition holds. This allows you to say "include this work-related
316
+ bit only in the repositories under my ~/work/ directory".
317
+
318
+ Will merge to 'next' after squashing niggle-fixes in.
319
+
320
+
321
+* rs/log-email-subject (2017-03-01) 2 commits
322
+ (merged to 'next' on 2017-03-03 at a2ecc84866)
323
+ + pretty: use fmt_output_email_subject()
324
+ + log-tree: factor out fmt_output_email_subject()
325
+
326
+ Code clean-up.
327
+
328
+ Will merge to 'master'.
329
+
330
+
331
* cc/split-index-config (2017-03-01) 22 commits
332
- Documentation/git-update-index: explain splitIndex.*
333
- Documentation/config: add splitIndex.sharedIndexExpire
@@ -277,7 +358,7 @@ of the repositories listed at
358
I think this is almost ready for 'next'.
359
360
280
-* dp/filter-branch-prune-empty (2017-02-23) 4 commits
361
+* dp/filter-branch-prune-empty (2017-03-03) 4 commits
362
- p7000: add test for filter-branch with --prune-empty
363
- filter-branch: fix --prune-empty on parentless commits
364
- t7003: ensure --prune-empty removes entire branch when applicable
@@ -286,7 +367,7 @@ of the repositories listed at
367
"git filter-branch --prune-empty" drops a single-parent commit that
368
becomes a no-op, but did not drop a root commit whose tree is empty.
369
289
- Needs review.
370
+ Will merge to 'next'.
371
372
373
* jc/config-case-cmdline-take-2 (2017-02-23) 2 commits
@@ -302,8 +383,9 @@ of the repositories listed at
383
This supersedes jc/config-case-cmdline topic that has been discarded.
384
385
305
-* ab/cond-skip-tests (2017-02-27) 2 commits
386
+* ab/cond-skip-tests (2017-03-01) 3 commits
387
- gitweb tests: skip tests when we don't have Time::HiRes
388
+ - gitweb tests: change confusing "skip_all" phrasing
389
- cvs tests: skip tests that call "cvs commit" when running as root
390
391
A few tests were run conditionally under (rare) conditions where
@@ -312,14 +394,6 @@ of the repositories listed at
394
Will merge to 'next'.
395
396
315
-* jk/auto-namelen-in-interpret-branch-name (2017-02-27) 1 commit
316
- - interpret_branch_name(): handle auto-namelen for @{-1}
317
-
318
- A small bug in the code that parses @{...} has been fixed.
319
-
320
- Will merge to 'next'.
321
-
322
-
397
* jk/interop-test (2017-02-27) 2 commits
398
- t/interop: add test of old clients against modern git-daemon
399
- t: add an interoperability test harness
@@ -344,41 +418,45 @@ of the repositories listed at
418
419
420
* jk/t6300-cleanup (2017-02-27) 1 commit
347
- - t6300: avoid creating refs/heads/HEAD
421
+ (merged to 'next' on 2017-03-02 at 3087521bea)
422
+ + t6300: avoid creating refs/heads/HEAD
423
349
- A test that creats a confusing branch whose name is HEAD when any
350
- branch name would have sufficed has been corrected.
424
+ A test that creates a confusing branch whose name is HEAD has been
425
+ corrected not to do so.
426
352
- Will merge to 'next'.
427
+ Will merge to 'master'.
428
429
430
* rs/commit-parsing-optim (2017-02-27) 2 commits
356
- - commit: don't check for space twice when looking for header
357
- - commit: be more precise when searching for headers
431
+ (merged to 'next' on 2017-03-02 at 22239f35df)
432
+ + commit: don't check for space twice when looking for header
433
+ + commit: be more precise when searching for headers
434
435
The code that parses header fields in the commit object has been
436
updated for (micro)performance and code hygiene.
437
362
- Will merge to 'next'.
438
+ Will merge to 'master'.
439
440
441
* rs/sha1-file-plug-fallback-base-leak (2017-02-27) 1 commit
366
- - sha1_file: release fallback base's memory in unpack_entry()
442
+ (merged to 'next' on 2017-03-02 at 03344b1119)
443
+ + sha1_file: release fallback base's memory in unpack_entry()
444
445
A leak in a codepath to read from a packed object in (rare) cases
446
has been plugged.
447
371
- Will merge to 'next'.
448
+ Will merge to 'master'.
449
450
451
* rs/strbuf-add-real-path (2017-02-27) 2 commits
375
- - strbuf: add strbuf_add_real_path()
376
- - cocci: use ALLOC_ARRAY
452
+ (merged to 'next' on 2017-03-02 at 69191becd6)
453
+ + strbuf: add strbuf_add_real_path()
454
+ + cocci: use ALLOC_ARRAY
455
456
An helper function to make it easier to append the result from
457
real_path() to a strbuf has been added.
458
381
- Will merge to 'next'.
459
+ Will merge to 'master'.
460
461
462
* sb/parse-hide-refs-config-cleanup (2017-02-24) 1 commit
@@ -398,9 +476,8 @@ of the repositories listed at
476
cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
477
478
401
-* sk/dash-is-previous (2017-02-27) 6 commits
479
+* sk/dash-is-previous (2017-03-01) 5 commits
480
- revert.c: delegate handling of "-" shorthand to setup_revisions
403
- - merge.c: delegate handling of "-" shorthand to revision.c:get_sha1
481
- sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
482
- revision.c: args starting with "-" might be a revision
483
- revision.c: swap if/else blocks
@@ -414,24 +491,26 @@ of the repositories listed at
491
492
493
* jh/send-email-one-cc (2017-02-27) 1 commit
417
- - send-email: only allow one address per body tag
494
+ (merged to 'next' on 2017-03-02 at 32c0e6ad88)
495
+ + send-email: only allow one address per body tag
496
497
"Cc:" on the trailer part does not have to conform to RFC strictly,
498
unlike in the e-mail header. "git send-email" has been updated to
499
ignore anything after '>' when picking addresses, to allow non-address
500
cruft like " # stable 4.4" after the address.
501
424
- Will merge to 'next'.
502
+ Will merge to 'master'.
503
504
505
* jk/http-auth (2017-02-27) 2 commits
428
- - http: add an "auto" mode for http.emptyauth
429
- - http: restrict auth methods to what the server advertises
506
+ (merged to 'next' on 2017-03-02 at 87f81b4395)
507
+ + http: add an "auto" mode for http.emptyauth
508
+ + http: restrict auth methods to what the server advertises
509
510
Reduce authentication round-trip over HTTP when the server supports
511
just a single authentication method.
512
434
- Will merge to 'next'.
513
+ Will merge to 'master'.
514
515
516
* jk/ident-empty (2017-02-23) 4 commits
@@ -441,8 +520,8 @@ of the repositories listed at
520
+ ident: handle NULL email when complaining of empty name
521
+ ident: mark error messages for translation
522
444
- user.email that consists of only cruft chars should have
445
- consistently errored out, but didn't.
523
+ user.email that consists of only cruft chars should consistently
524
+ error out, but didn't.
525
526
Will merge to 'master'.
527
@@ -459,13 +538,13 @@ of the repositories listed at
538
Will merge to 'master'.
539
540
462
-* ah/doc-ls-files-quotepath (2017-02-28) 3 commits
463
- - SQUASH???
464
- - Documentation: Link descriptions of -z to core.quotePath
465
- - Documentation: Improve description for core.quotePath
541
+* ah/doc-ls-files-quotepath (2017-03-02) 1 commit
542
+ - Documentation: improve description for core.quotePath
543
544
Documentation for "git ls-files" did not refer to core.quotePath
545
546
+ Will merge to 'next'.
547
+
548
549
* jh/memihash-opt (2017-02-17) 5 commits
550
- name-hash: remember previous dir_entry during lazy_init_name_hash
@@ -474,7 +553,8 @@ of the repositories listed at
553
- hashmap: allow memihash computation to be continued
554
- name-hash: eliminate duplicate memihash call
555
477
- Expecting an update for perf?
556
+ Expecting an update for perf.
557
+ cf. <MWHPR03MB29581B0EDDEDCA7D51EC396F8A280@MWHPR03MB2958.namprd03.prod.outlook.com>
558
559
560
* nd/prune-in-worktree (2017-02-19) 15 commits
@@ -502,17 +582,16 @@ of the repositories listed at
582
garbage collection.
583
584
505
-* mm/fetch-show-error-message-on-unadvertised-object (2017-02-22) 4 commits
585
+* mm/fetch-show-error-message-on-unadvertised-object (2017-03-02) 3 commits
586
- fetch-pack: add specific error for fetching an unadvertised object
587
- fetch_refs_via_pack: call report_unmatched_refs
508
- - squash??? remove unfinished sentence
588
- fetch-pack: move code to report unmatched refs to a function
589
590
"git fetch" that requests a commit by object name, when the other
591
side does not allow such an request, failed without much
592
explanation.
593
515
- Will squash the change in before merging to 'next'.
594
+ Will merge to 'next'.
595
596
597
* nd/worktree-kill-parse-ref (2017-02-19) 22 commits
@@ -580,8 +659,6 @@ of the repositories listed at
659
when dealing with ref_store that represents the set of refs visible
660
from the other worktrees.
661
583
- Needs review.
584
-
662
663
* sb/checkout-recurse-submodules (2017-02-23) 15 commits
664
- builtin/checkout: add --recurse-submodules switch
@@ -602,21 +679,23 @@ of the repositories listed at
679
680
"git checkout" is taught --recurse-submodules option.
681
605
- Needs review.
682
+ Reroll exists, but it appears it still needs minor work on top.
683
+ cf. <20170302004759.27852-1-sbeller@google.com>
684
685
686
* tg/stash-push (2017-02-28) 6 commits
609
- - stash: allow pathspecs in the no verb form
610
- - stash: use stash_push for no verb form
611
- - stash: teach 'push' (and 'create_stash') to honor pathspec
612
- - stash: refactor stash_create
613
- - stash: add test for the create command line arguments
614
- - stash: introduce push verb
687
+ (merged to 'next' on 2017-03-03 at b50fda0389)
688
+ + stash: allow pathspecs in the no verb form
689
+ + stash: use stash_push for no verb form
690
+ + stash: teach 'push' (and 'create_stash') to honor pathspec
691
+ + stash: refactor stash_create
692
+ + stash: add test for the create command line arguments
693
+ + stash: introduce push verb
694
695
Allow "git stash" to take pathspec so that the local changes can be
696
stashed away only partially.
697
619
- Will merge to 'next'.
698
+ Will merge to 'master'.
699
700
701
* bc/object-id (2017-02-22) 19 commits
@@ -652,8 +731,7 @@ of the repositories listed at
731
Windows port wants to use OpenSSL's implementation of SHA-1
732
routines, so let them.
733
655
- Kicked back to 'pu'
656
- cf. <9913e513-553e-eba6-e81a-9c21030dd767@kdbg.org>
734
+ Will merge to 'next'.
735
736
737
* sg/completion-refs-speedup (2017-02-13) 13 commits
@@ -717,64 +795,9 @@ of the repositories listed at
795
--------------------------------------------------
796
[Discarded]
797
720
-* sb/push-make-submodule-check-the-default (2017-01-26) 2 commits
721
- . Revert "push: change submodule default to check when submodules exist"
722
- . push: change submodule default to check when submodules exist
723
-
724
- Turn the default of "push.recurseSubmodules" to "check" when
725
- submodules seem to be in use.
726
-
727
- Retracted.
728
-
729
-
730
-* ls/submodule-config-ucase (2017-02-15) 2 commits
731
- . submodule config does not apply to upper case submodules?
732
- . t7400: cleanup "submodule add clone shallow submodule" test
733
-
734
- Demonstrate a breakage in handling submodule.UPPERCASENAME.update
735
- configuration variables.
736
-
737
- Superseded by jc/config-case-cmdline.
738
-
739
-
740
-* js/curl-empty-auth-set-by-default (2017-02-22) 1 commit
741
- . http(s): automatically try NTLM authentication first
742
-
743
- Flip "http.emptyAuth" on by default to help OOB experience for
744
- users of HTTP Negotiate authentication scheme.
745
-
746
- Superseded by jk/http-auth topic.
747
-
748
-
749
-* jc/config-case-cmdline (2017-02-21) 3 commits
750
- . config: squelch stupid compiler
751
- . config: reject invalid VAR in 'git -c VAR=VAL command'
752
- . config: preserve <subsection> case for one-shot config on the command line
753
-
754
- The code to parse "git -c VAR=VAL cmd" and set configuration
755
- variable for the duration of cmd had two small bugs, which have
756
- been fixed.
757
-
758
- Superseded by jc/config-case-cmdline-take-2
759
-
760
-
761
-* lt/oneline-decoration-at-end (2017-02-21) 2 commits
762
- . log: fix regression to "--source" when "--decorate" was updated
763
- . show decorations at the end of the line
764
-
765
- The output from "git log --oneline --decorate" has been updated to
766
- show the extra information at the end of the line, not near the
767
- front.
768
-
769
- Retracted.
770
- cf. <CA+55aFwT2HUBzZO8Gpt9tHoJtdRxv9oe3TDoSH5jcEOixRNBXg@mail.gmail.com>
771
-
772
-
773
-* sk/parse-remote-cleanup (2017-02-21) 2 commits
774
- . Revert "parse-remote: remove reference to unused op_prep"
775
- . parse-remote: remove reference to unused op_prep
798
+* jk/auto-namelen-in-interpret-branch-name (2017-02-27) 1 commit
799
+ . interpret_branch_name(): handle auto-namelen for @{-1}
800
777
- Code clean-up.
801
+ A small bug in the code that parses @{...} has been fixed.
802
779
- Will discard.
780
- There may be third-party scripts that are dot-sourcing this one.
803
+ This is now a part of jk/interpret-branch-name topic.