What's cooking (2016/06 #01)
Junio C Hamano committed
Jun 2, 2016 at 15:50 UTC
13a33cce0cfaec30a14386e6d3e7c5f13afbad6b
1 file changed
+249
-223
whats-cooking.txt
+249
-223
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2016, #09; Tue, 31)
3
+Subject: What's cooking in git.git (Jun 2016, #01; Thu, 2)
4
X-master-at: 60bd4b1c513bb652cdffad44382046ca872140eb
5
-X-next-at: 534e6b4ae36749d2ee8ff48851a5939661db5ad6
5
+X-next-at: 8a191e187a9dca3d786c0197f9610e627b4f4137
6
7
-What's cooking in git.git (May 2016, #09; Tue, 31)
7
+What's cooking in git.git (Jun 2016, #01; Thu, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,247 +12,103 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-2.9-rc1 has been tagged. There still are a few topics yet to be
16
-merged to 'master' for the upcoming release, but otherwise this is
17
-pretty much "feature complete". One known brown-paper-bag breakage
18
-exists in t/perf/, whose fix is still in 'next'.
15
+2.9-rc2 is scheduled for early next week. A handful low-impact
16
+topics are expected to be in 'master' by then.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
20
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
25
---------------------------------------------------
26
-[Graduated to "master"]
27
-
28
-* ak/t0008-ksh88-workaround (2016-05-20) 1 commit
29
- (merged to 'next' on 2016-05-26 at 9a34a2a)
30
- + t0008: 4 tests fail with ksh88
31
-
32
- Test portability workaround.
33
-
34
-
35
-* ak/t4204-shell-portability (2016-05-24) 1 commit
36
- (merged to 'next' on 2016-05-27 at fd16e6d)
37
- + t4204: do not let $name variable clobbered
38
-
39
- Update a test to run also under ksh88.
40
-
41
-
42
-* es/t1500-modernize (2016-05-18) 5 commits
43
- (merged to 'next' on 2016-05-26 at 274e39c)
44
- + t1500: avoid setting environment variables outside of tests
45
- + t1500: avoid setting configuration options outside of tests
46
- + t1500: avoid changing working directory outside of tests
47
- + t1500: test_rev_parse: facilitate future test enhancements
48
- + t1500: be considerate to future potential tests
49
-
50
- test updates to make it more readable and maintainable.
51
-
52
-
53
-* fc/fast-import-broken-marks-file (2016-05-17) 1 commit
54
- (merged to 'next' on 2016-05-26 at 9962fcf)
55
- + fast-import: do not truncate exported marks file
56
-
57
- "git fast-import --export-marks" would overwrite the existing marks
58
- file even when it makes a dump from its custom die routine.
59
- Prevent it from doing so when we have an import-marks file but
60
- haven't finished reading it.
61
-
62
-
63
-* jk/cat-file-buffered-batch-all (2016-05-18) 2 commits
64
- (merged to 'next' on 2016-05-26 at 4da062d)
65
- + cat-file: default to --buffer when --batch-all-objects is used
66
- + cat-file: avoid noop calls to sha1_object_info_extended
67
-
68
- "git cat-file --batch-all" has been sped up, by taking advantage
69
- of the fact that it does not have to read a list of objects, in two
70
- ways.
71
-
72
-
73
-* js/t6044-use-test-seq (2016-05-18) 1 commit
74
- (merged to 'next' on 2016-05-27 at d052a29)
75
- + t6044: replace seq by test_seq
76
-
77
- Test portability fix.
78
-
79
-
80
-* kb/msys2-tty (2016-05-26) 1 commit
81
- (merged to 'next' on 2016-05-27 at 588f76c)
82
- + mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)
83
-
84
- The "are we talking with TTY, doing an interactive session?"
85
- detection has been updated to work better for "Git for Windows".
86
-
87
-
88
-* mr/send-email-doc-gmail-2fa (2016-05-27) 1 commit
89
- (merged to 'next' on 2016-05-27 at 19d6ba4)
90
- + Documentation: add instructions to help setup gmail 2FA
91
-
92
- Give hints to GMail users with two-factor auth enabled that
93
- they need app-specific-password when using send-email.
94
-
95
-
96
-* rj/log-decorate-auto (2016-05-27) 1 commit
97
- (merged to 'next' on 2016-05-27 at 813112b)
98
- + log: document the --decorate=auto option
99
-
100
- We forgot to add "git log --decorate=auto" to documentation when we
101
- added the feature back in v2.1.0 timeframe.
102
-
23
--------------------------------------------------
24
[New Topics]
25
106
-* js/rebase-i-dedup-call-to-rerere (2016-05-31) 1 commit
107
- (merged to 'next' on 2016-05-31 at db1f9e3)
108
- + rebase -i: remove an unnecessary 'rerere' invocation
109
-
110
- "git rebase -i", after it fails to auto-resolve the conflict, had
111
- an unnecessary call to "git rerere" from its very early days, which
112
- was spotted recently; the call has been removed.
113
-
114
- Will merge to 'master'.
115
-
26
+* et/add-chmod-x (2016-06-01) 2 commits
27
+ - SQUASH??? add: add --chmod=+x / --chmod=-x options
28
+ - add: add --chmod=+x / --chmod=-x options
29
117
-* sb/submodule-recommend-shallowness (2016-05-27) 2 commits
118
- (merged to 'next' on 2016-05-31 at 1ee161c)
119
- + submodule update: learn `--[no-]recommend-shallow` option
120
- + submodule-config: keep shallow recommendation around
121
-
122
- An upstream project can make a recommendation to make only a
123
- shallow clone for some submodules in the .gitmodules file it ship.
30
+ Waiting for a reroll (or ack for proposed fixup).
31
125
- Will merge to 'master' after 2.9 final.
32
33
+* jc/t2300-setup (2016-06-01) 1 commit
34
+ - t2300: run git-sh-setup in an environment that better mimics the real life
35
128
-* tb/convert-peek-in-index (2016-05-24) 2 commits
129
- - convert: ce_compare_data() checks for a sha1 of a path
130
- - read-cache: factor out get_sha1_from_index() helper
131
-
132
- The motivation is rather iffy.
133
-
134
-
135
-* va/i18n-even-more (2016-05-26) 22 commits
136
- - t5523: use test_i18ngrep for negation
137
- - t4153: fix negated test_i18ngrep call
138
- - t9003: become resilient to GETTEXT_POISON
139
- - tests: unpack-trees: update to use test_i18n* functions
140
- - tests: use test_i18n* functions to suppress false positives
141
- - i18n: setup: mark strings for translation
142
- - i18n: rebase-interactive: mark comments of squash for translation
143
- - i18n: rebase-interactive: mark here-doc strings for translation
144
- - i18n: rebase-interactive: mark strings for translation
145
- - i18n: git-sh-setup.sh: mark strings for translation
146
- - t6030: update to use test_i18ncmp
147
- - i18n: bisect: simplify error message for i18n
148
- - i18n: rebase: mark placeholder for translation
149
- - i18n: rebase: fix marked string to use eval_gettext variant
150
- - merge-octupus: use die shell function from git-sh-setup.sh
151
- - i18n: merge-octopus: mark messages for translation
152
- - i18n: sequencer: mark string for translation
153
- - i18n: sequencer: mark entire sentences for translation
154
- - i18n: transport: mark strings for translation
155
- - i18n: advice: internationalize message for conflicts
156
- - i18n: advice: mark string about detached head for translation
157
- - i18n: builtin/remote.c: fix mark for translation
158
-
159
- More markings of messages for i18n, with updates to various tests
160
- to pass GETTEXT_POISON tests.
161
-
162
- Is everybody happy with this version?
163
-
164
-
165
-* bd/readme.markdown-more (2016-05-31) 1 commit
166
- - README.md: format CLI commands with code syntax
36
+ A test fix.
37
38
Will merge to 'next'.
39
40
171
-* em/man-bold-literal (2016-05-31) 1 commit
172
- - Documentation: bold literals in man
41
+* jk/shell-portability (2016-06-01) 2 commits
42
+ - t5500 & t7403: lose bash-ism "local"
43
+ - test-lib: add in-shell "env" replacement
44
174
- The manpage output of our documentation did not render well in
175
- terminal; typeset literals in bold by default to make them stand
176
- out more.
45
+ test fixes.
46
47
Will merge to 'next'.
48
49
181
-* jg/dash-is-last-branch-in-worktree-add (2016-05-31) 1 commit
182
- - worktree: allow "-" short-hand for @{-1} in add command
50
+* mh/connect (2016-06-01) 9 commits
51
+ - connect: move ssh command line preparation to a separate function
52
+ - connect: actively reject git:// urls with a user part
53
+ - connect: change the --diag-url output to separate user and host
54
+ - connect: make parse_connect_url() return the user part of the url as a separate value
55
+ - connect: group CONNECT_DIAG_URL handling code
56
+ - connect: make parse_connect_url() return separated host and port
57
+ - connect: re-derive a host:port string from the separate host and port variables
58
+ - connect: call get_host_and_port() earlier
59
+ - connect: document why we sometimes call get_port after get_host_and_port
60
184
- "git worktree add" learned that '-' can be used as a short-hand for
185
- "@{-1}", the previous branch.
186
-
187
- Will merge to 'next'.
61
+ Needs review.
62
63
190
-* js/perf-rebase-i (2016-05-31) 1 commit
191
- (merged to 'next' on 2016-05-31 at 39d8dc8)
192
- + perf: make the tests work without a worktree
64
+* sb/submodule-helper-list-signal-unmatch-via-exit-status (2016-06-01) 1 commit
65
+ (merged to 'next' on 2016-06-02 at 29064a2)
66
+ + submodule--helper: offer a consistent API
67
+ (this branch is used by sb/submodule-helper-relative-path.)
68
194
- The one in 'master' has a brown-paper-bag bug that breaks the perf
195
- test when used inside a usual Git repository with a working tree.
69
+ The way how "submodule--helper list" signals unmatch error to its
70
+ callers has been updated.
71
72
Will merge to 'master'.
73
74
200
-* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
201
- - blame: require 0 context lines while finding moved lines with -M
202
-
203
- "git blame -M" missed a single line that was moved within the file.
204
-
205
- We may want to squash a test or two to this commit. Volunteers?
75
+* sb/submodule-helper-relative-path (2016-06-01) 1 commit
76
+ (merged to 'next' on 2016-06-02 at 8a191e1)
77
+ + submodule: remove bashism from shell script
78
+ (this branch uses sb/submodule-helper-list-signal-unmatch-via-exit-status.)
79
80
+ A bash-ism "local" has been removed from "git submodule" scripted
81
+ Porcelain.
82
208
-* mm/makefile-developer-can-be-in-config-mak (2016-05-31) 1 commit
209
- - Makefile: move 'ifdef DEVELOPER' after config.mak* inclusion
210
-
211
- "make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in
212
- config.mak didn't.
213
-
214
- Will merge to 'next'.
215
-
216
-
217
-* nd/worktree-lock (2016-05-31) 6 commits
218
- - worktree: add "unlock" command
219
- - worktree: add "lock" command
220
- - worktree.c: retrieve lock status (and optionally reason) in get_worktrees()
221
- - worktree.c: add is_main_worktree()
222
- - worktree.c: find_worktree() learns to identify worktrees by basename
223
- - worktree.c: add find_worktree()
224
- (this branch uses nd/worktree-cleanup-post-head-protection.)
225
-
226
- "git worktree prune" protected worktrees that are marked as
227
- "locked" by creating a file in a known location. "git worktree"
228
- command learned a dedicated command pair to create and remoev such
229
- a file, so that the users do not have to do this with editor.
83
+ Will merge to 'master'.
84
231
- The implementation was wasteful; expecting a reroll.
85
86
+* mr/send-email-doc-gmail-2fa (2016-06-01) 1 commit
87
+ (merged to 'next' on 2016-06-02 at cd2ade8)
88
+ + Documentation/git-send-email: fix typo in gmail 2FA section
89
234
-* pa/cherry-pick-doc-typo (2016-05-29) 1 commit
235
- - git-cherry-pick.txt: correct a small typo
90
+ Typofix.
91
237
- "git cherry-pick --help" had three instances of word "behavior",
238
- one of which was spelled "behaviour", which is updated to match the
239
- other two.
92
+ Will merge to 'master'.
93
241
- Will merge to 'next'.
94
95
+* aq/upload-pack-use-parse-options (2016-05-31) 1 commit
96
+ - upload-pack.c: use parse-options API
97
244
-* rs/apply-name-terminate (2016-05-29) 1 commit
245
- - apply: remove unused parameters from name_terminate()
246
-
247
- Code clean-up.
98
+ "git upload-pack" command has been updated to use the parse-options
99
+ API.
100
101
Will merge to 'next'.
102
103
252
-* rs/patch-id-use-skip-prefix (2016-05-29) 1 commit
253
- - patch-id: use starts_with() and skip_prefix()
104
+* jc/clear-pathspec (2016-06-02) 1 commit
105
+ - pathspec: rename free_pathspec() to clear_pathspec()
106
255
- Code clean-up.
107
+ We usually call a function that clears the contents a data
108
+ structure X without freeing the structure itself clear_X(), and
109
+ call a function that does clear_X() and also frees it free_X().
110
+ free_pathspec() function has been renamed to clear_pathspec()
111
+ to avoid confusion.
112
113
Will merge to 'next'.
114
@@ -474,6 +330,171 @@ of the repositories listed at
330
--------------------------------------------------
331
[Cooking]
332
333
+* js/rebase-i-dedup-call-to-rerere (2016-05-31) 1 commit
334
+ (merged to 'next' on 2016-05-31 at db1f9e3)
335
+ + rebase -i: remove an unnecessary 'rerere' invocation
336
+
337
+ "git rebase -i", after it fails to auto-resolve the conflict, had
338
+ an unnecessary call to "git rerere" from its very early days, which
339
+ was spotted recently; the call has been removed.
340
+
341
+ Will merge to 'master'.
342
+
343
+
344
+* sb/submodule-recommend-shallowness (2016-05-27) 2 commits
345
+ (merged to 'next' on 2016-05-31 at 1ee161c)
346
+ + submodule update: learn `--[no-]recommend-shallow` option
347
+ + submodule-config: keep shallow recommendation around
348
+
349
+ An upstream project can make a recommendation to make only a
350
+ shallow clone for some submodules in the .gitmodules file it ship.
351
+
352
+ Will merge to 'master' after 2.9 final.
353
+
354
+
355
+* tb/convert-peek-in-index (2016-05-24) 2 commits
356
+ - convert: ce_compare_data() checks for a sha1 of a path
357
+ - read-cache: factor out get_sha1_from_index() helper
358
+
359
+ The motivation is rather iffy.
360
+
361
+
362
+* va/i18n-even-more (2016-05-26) 22 commits
363
+ - t5523: use test_i18ngrep for negation
364
+ - t4153: fix negated test_i18ngrep call
365
+ - t9003: become resilient to GETTEXT_POISON
366
+ - tests: unpack-trees: update to use test_i18n* functions
367
+ - tests: use test_i18n* functions to suppress false positives
368
+ - i18n: setup: mark strings for translation
369
+ - i18n: rebase-interactive: mark comments of squash for translation
370
+ - i18n: rebase-interactive: mark here-doc strings for translation
371
+ - i18n: rebase-interactive: mark strings for translation
372
+ - i18n: git-sh-setup.sh: mark strings for translation
373
+ - t6030: update to use test_i18ncmp
374
+ - i18n: bisect: simplify error message for i18n
375
+ - i18n: rebase: mark placeholder for translation
376
+ - i18n: rebase: fix marked string to use eval_gettext variant
377
+ - merge-octupus: use die shell function from git-sh-setup.sh
378
+ - i18n: merge-octopus: mark messages for translation
379
+ - i18n: sequencer: mark string for translation
380
+ - i18n: sequencer: mark entire sentences for translation
381
+ - i18n: transport: mark strings for translation
382
+ - i18n: advice: internationalize message for conflicts
383
+ - i18n: advice: mark string about detached head for translation
384
+ - i18n: builtin/remote.c: fix mark for translation
385
+
386
+ More markings of messages for i18n, with updates to various tests
387
+ to pass GETTEXT_POISON tests.
388
+
389
+ Is everybody happy with this version?
390
+
391
+
392
+* bd/readme.markdown-more (2016-05-31) 1 commit
393
+ (merged to 'next' on 2016-06-02 at 1de7554)
394
+ + README.md: format CLI commands with code syntax
395
+
396
+ The mark-up in the top-level README.md file has been updated to
397
+ typeset CLI command names differently from the body text.
398
+
399
+ Will merge to 'master'.
400
+
401
+
402
+* em/man-bold-literal (2016-05-31) 1 commit
403
+ (merged to 'next' on 2016-06-02 at efb4156)
404
+ + Documentation: bold literals in man
405
+
406
+ The manpage output of our documentation did not render well in
407
+ terminal; typeset literals in bold by default to make them stand
408
+ out more.
409
+
410
+ Will merge to 'master'.
411
+
412
+
413
+* jg/dash-is-last-branch-in-worktree-add (2016-05-31) 1 commit
414
+ (merged to 'next' on 2016-06-02 at 3959ef6)
415
+ + worktree: allow "-" short-hand for @{-1} in add command
416
+
417
+ "git worktree add" learned that '-' can be used as a short-hand for
418
+ "@{-1}", the previous branch.
419
+
420
+ Will merge to 'master' after 2.9 final.
421
+
422
+
423
+* js/perf-rebase-i (2016-05-31) 1 commit
424
+ (merged to 'next' on 2016-05-31 at 39d8dc8)
425
+ + perf: make the tests work without a worktree
426
+
427
+ The one in 'master' has a brown-paper-bag bug that breaks the perf
428
+ test when used inside a usual Git repository with a working tree.
429
+
430
+ Will merge to 'master'.
431
+
432
+
433
+* dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit
434
+ - blame: require 0 context lines while finding moved lines with -M
435
+
436
+ "git blame -M" missed a single line that was moved within the file.
437
+
438
+ We may want to squash a test or two to this commit. Volunteers?
439
+
440
+
441
+* mm/makefile-developer-can-be-in-config-mak (2016-06-01) 2 commits
442
+ (merged to 'next' on 2016-06-02 at f3a0678)
443
+ + Makefile: add $(DEVELOPER_CFLAGS) variable
444
+ + Makefile: move 'ifdef DEVELOPER' after config.mak* inclusion
445
+
446
+ "make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in
447
+ config.mak didn't.
448
+
449
+ Will merge to 'master' after 2.9 final.
450
+
451
+
452
+* nd/worktree-lock (2016-05-31) 6 commits
453
+ - worktree: add "unlock" command
454
+ - worktree: add "lock" command
455
+ - worktree.c: retrieve lock status (and optionally reason) in get_worktrees()
456
+ - worktree.c: add is_main_worktree()
457
+ - worktree.c: find_worktree() learns to identify worktrees by basename
458
+ - worktree.c: add find_worktree()
459
+ (this branch uses nd/worktree-cleanup-post-head-protection.)
460
+
461
+ "git worktree prune" protected worktrees that are marked as
462
+ "locked" by creating a file in a known location. "git worktree"
463
+ command learned a dedicated command pair to create and remoev such
464
+ a file, so that the users do not have to do this with editor.
465
+
466
+ Expecting a reroll.
467
+
468
+
469
+* pa/cherry-pick-doc-typo (2016-05-29) 1 commit
470
+ (merged to 'next' on 2016-06-02 at e2c2457)
471
+ + git-cherry-pick.txt: correct a small typo
472
+
473
+ "git cherry-pick --help" had three instances of word "behavior",
474
+ one of which was spelled "behaviour", which is updated to match the
475
+ other two.
476
+
477
+ Will merge to 'master'.
478
+
479
+
480
+* rs/apply-name-terminate (2016-05-29) 1 commit
481
+ (merged to 'next' on 2016-06-02 at 8df9332)
482
+ + apply: remove unused parameters from name_terminate()
483
+
484
+ Code clean-up.
485
+
486
+ Will merge to 'master'.
487
+
488
+
489
+* rs/patch-id-use-skip-prefix (2016-05-29) 1 commit
490
+ (merged to 'next' on 2016-06-02 at c993de3)
491
+ + patch-id: use starts_with() and skip_prefix()
492
+
493
+ Code clean-up.
494
+
495
+ Will merge to 'master'.
496
+
497
+
498
* et/pretty-format-c-auto (2016-05-27) 1 commit
499
(merged to 'next' on 2016-05-31 at 1e9c920)
500
+ format_commit_message: honor `color=auto` for `%C(auto)`
@@ -498,8 +519,9 @@ of the repositories listed at
519
Will merge to 'master' after 2.9 final.
520
521
501
-* jk/upload-pack-hook (2016-05-27) 6 commits
522
+* jk/upload-pack-hook (2016-06-02) 7 commits
523
- upload-pack: provide a hook for running pack-objects
524
+ - t1308: do not get fooled by symbolic links to the source tree
525
- config: add a notion of "scope"
526
- config: return configset value for current_config_ functions
527
- config: set up config_source for command-line config
@@ -514,21 +536,22 @@ of the repositories listed at
536
537
538
* rs/xdiff-hunk-with-func-line (2016-05-31) 8 commits
517
- - grep: -W: don't extend context to trailing empty lines
518
- - t7810: add test for grep -W and trailing empty context lines
519
- - xdiff: don't trim common tail with -W
520
- - xdiff: -W: don't include common trailing empty lines in context
521
- - xdiff: ignore empty lines before added functions with -W
522
- - xdiff: handle appended chunks better with -W
523
- - xdiff: factor out match_func_rec()
524
- - t4051: rewrite, add more tests
539
+ (merged to 'next' on 2016-06-02 at 0c2e335)
540
+ + grep: -W: don't extend context to trailing empty lines
541
+ + t7810: add test for grep -W and trailing empty context lines
542
+ + xdiff: don't trim common tail with -W
543
+ + xdiff: -W: don't include common trailing empty lines in context
544
+ + xdiff: ignore empty lines before added functions with -W
545
+ + xdiff: handle appended chunks better with -W
546
+ + xdiff: factor out match_func_rec()
547
+ + t4051: rewrite, add more tests
548
549
"git show -W" (extend hunks to cover the entire function, delimited
550
by lines that match the "funcname" pattern) used to show the entire
551
file when a change added an entire function at the end of the file,
552
which has been fixed.
553
531
- Will merge to 'next'.
554
+ Will merge to 'master' after 2.9 final.
555
556
557
* sb/submodule-misc-cleanups (2016-05-25) 1 commit
@@ -599,8 +622,9 @@ of the repositories listed at
622
optimized using the knowledge of which attributes are queried.
623
624
602
-* cc/apply-introduce-state (2016-05-12) 48 commits
603
- - builtin/apply: rename 'prefix_' parameter to 'prefix'
625
+* cc/apply-introduce-state (2016-06-01) 49 commits
626
+ - builtin/apply: move 'newfd' global into 'struct apply_state'
627
+ - builtin/apply: move 'lock_file' global into 'struct apply_state'
628
- builtin/apply: move applying patches into apply_all_patches()
629
- builtin/apply: move 'state' check into check_apply_state()
630
- builtin/apply: move 'symlink_changes' global into 'struct apply_state'
@@ -660,7 +684,8 @@ of the repositories listed at
684
review the above first and give the remainder of the series a solid
685
base to build on.
686
663
- Reroll exists, but hasn't seen any review yet ($gmane/295429).
687
+ Expecting an update.
688
+ ($gmane/296136)
689
690
691
* pb/bisect (2016-05-24) 3 commits
@@ -682,7 +707,8 @@ of the repositories listed at
707
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
708
to limit paths that match $pattern further by attribute settings.
709
685
- Will merge to 'master' after 2.9 final.
710
+ This breaks anything that uses preload-index with the new pathspec
711
+ magic, because the attribute subsystem is not thread-ready.
712
713
714
* nd/worktree-cleanup-post-head-protection (2016-05-24) 6 commits
@@ -742,15 +768,6 @@ of the repositories listed at
768
then merge to 'next'.
769
770
745
-* mh/connect-leak (2016-04-28) 1 commit
746
- - git_connect(): fix memory leak with CONNECT_DIAG_URL
747
-
748
- Is already made obsolete with a patch in flight under discussion.
749
- ($gmane/292962)
750
-
751
- Will discard.
752
-
753
-
771
* ew/fast-import-unpack-limit (2016-05-29) 2 commits
772
(merged to 'next' on 2016-05-29 at af32aba)
773
+ fast-import: invalidate pack_id references after loosening
@@ -856,3 +873,12 @@ of the repositories listed at
873
It has been reported that git-gui still uses the deprecated syntax,
874
which needs to be fixed before this final step can proceed.
875
($gmane/282594)
876
+
877
+--------------------------------------------------
878
+[Discarded]
879
+
880
+* mh/connect-leak (2016-04-28) 1 commit
881
+ . git_connect(): fix memory leak with CONNECT_DIAG_URL
882
+
883
+ Is already made obsolete with a patch in flight under discussion.
884
+ ($gmane/292962)