What's cooking (2016/07 #09)
Junio C Hamano committed
Jul 29, 2016 at 18:09 UTC
7ddcda378cb88d0684bdef33c0cfc1a837ae378d
1 file changed
+266
-194
whats-cooking.txt
+266
-194
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2016, #08; Wed, 27)
4
-X-master-at: 8c6d1f9807c67532e7fb545a944b064faff0f70b
5
-X-next-at: f76a962d0b7dc838990b78509c5b907bd27b527e
3
+Subject: What's cooking in git.git (Jul 2016, #09; Fri, 29)
4
+X-master-at: f8f7adce9fc50a11a764d57815602dcb818d1816
5
+X-next-at: f965a184db64b4fd46c6b74c02c0079537516c63
6
7
-What's cooking in git.git (Jul 2016, #08; Wed, 27)
7
+What's cooking in git.git (Jul 2016, #09; Fri, 29)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,58 +12,90 @@ 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
+On the 'master' front, the individual commit count now exceeds 400
16
+since the last major release, which is a good pace. We may want to
17
+start slowing down once the current crop of topics in 'next' hits
18
+the 'master' and switch our attention to regression hunting. The
19
+'maint' branch has been accumulating enough material to make it the
20
+next maintenance release v2.9.3.
21
+
22
You can find the changes described here in the integration branches
23
of the repositories listed at
24
25
http://git-blame.blogspot.com/p/git-public-repositories.html
26
27
--------------------------------------------------
21
-[New Topics]
28
+[Graduated to "master"]
29
23
-* da/subtree-2.9-regression (2016-07-26) 2 commits
24
- (merged to 'next' on 2016-07-26 at 9d71562)
25
- + subtree: fix "git subtree split --rejoin"
26
- + t7900-subtree.sh: fix quoting and broken && chains
30
+* ew/daemon-socket-keepalive (2016-07-22) 2 commits
31
+ (merged to 'next' on 2016-07-22 at d39c827)
32
+ + Windows: add missing definition of ENOTSOCK
33
+ (merged to 'next' on 2016-07-19 at 0140849)
34
+ + daemon: ignore ENOTSOCK from setsockopt
35
28
- "git merge" in Git v2.9 was taught to forbid merging an unrelated
29
- lines of history by default, but that is exactly the kind of thing
30
- the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
31
- "git subtree" has been taught to use the "--allow-unrelated-histories"
32
- option to override the default.
36
+ Recent update to "git daemon" tries to enable the socket-level
37
+ KEEPALIVE, but when it is spawned via inetd, the standard input
38
+ file descriptor may not necessarily be connected to a socket.
39
+ Suppress an ENOTSOCK error from setsockopt().
40
34
- Will merge to 'master'.
41
42
+* ew/find-perl-on-freebsd-in-local (2016-07-26) 1 commit
43
+ (merged to 'next' on 2016-07-26 at f76a962)
44
+ + config.mak.uname: correct perl path on FreeBSD
45
37
-* jk/pack-objects-optim-skimming (2016-07-26) 2 commits
38
- - pack-objects: compute local/ignore_pack_keep early
39
- - pack-objects: break out of want_object loop early
46
+ Recent FreeBSD stopped making perl available at /usr/bin/perl;
47
+ switch the default the built-in path to /usr/local/bin/perl on not
48
+ too ancient FreeBSD releases.
49
41
- "git pack-objects" has a few options that tell it not to pack
42
- objects found in certain packfiles, which require it to scan .idx
43
- files of all available packs. The codepaths involved in these
44
- operations have been optimized for a common case of not having any
45
- non-local pack and/or any .kept pack.
50
47
- Will wait for a t/perf update.
51
+* js/rebase-i-tests (2016-07-07) 3 commits
52
+ (merged to 'next' on 2016-07-13 at b06b28f)
53
+ + rebase -i: we allow extra spaces after fixup!/squash!
54
+ + rebase -i: demonstrate a bug with --autosquash
55
+ + t3404: add a test for the --gpg-sign option
56
57
+ A few tests that specifically target "git rebase -i" have been
58
+ added.
59
50
-* nd/fetch-ref-summary (2016-07-26) 1 commit
51
- - t5510: skip tests under GETTEXT_POISON build
60
53
- Hotfix of a test in a topic that has already been merged to 'master'.
61
+* nd/pack-ofs-4gb-limit (2016-07-13) 7 commits
62
+ (merged to 'next' on 2016-07-13 at 91e217d)
63
+ + fsck: use streaming interface for large blobs in pack
64
+ + pack-objects: do not truncate result in-pack object size on 32-bit systems
65
+ + index-pack: correct "offset" type in unpack_entry_data()
66
+ + index-pack: report correct bad object offsets even if they are large
67
+ + index-pack: correct "len" type in unpack_data()
68
+ + sha1_file.c: use type off_t* for object_info->disk_sizep
69
+ + pack-objects: pass length to check_pack_crc() without truncation
70
55
- Will merge to 'next'.
71
+ "git pack-objects" and "git index-pack" mostly operate with off_t
72
+ when talking about the offset of objects in a packfile, but there
73
+ were a handful of places that used "unsigned long" to hold that
74
+ value, leading to an unintended truncation.
75
76
58
-* os/no-verify-skips-commit-msg-too (2016-07-26) 1 commit
59
- (merged to 'next' on 2016-07-26 at 09b98b9)
60
- + commit: describe that --no-verify skips the commit-msg hook in the help text
77
+* nd/worktree-lock (2016-07-08) 6 commits
78
+ (merged to 'next' on 2016-07-13 at c768a85)
79
+ + worktree.c: find_worktree() search by path suffix
80
+ + worktree: add "unlock" command
81
+ + worktree: add "lock" command
82
+ + worktree.c: add is_worktree_locked()
83
+ + worktree.c: add is_main_worktree()
84
+ + worktree.c: add find_worktree()
85
62
- "git commit --help" said "--no-verify" is only about skipping the
63
- pre-commit hook, and failed to say that it also skipped the
64
- commit-msg hook.
86
+ "git worktree prune" protected worktrees that are marked as
87
+ "locked" by creating a file in a known location. "git worktree"
88
+ command learned a dedicated command pair to create and remove such
89
+ a file, so that the users do not have to do this with editor.
90
66
- Will merge to 'master'.
91
+
92
+* rs/notes-merge-no-toctou (2016-07-07) 1 commit
93
+ (merged to 'next' on 2016-07-13 at f08b530)
94
+ + notes-merge: use O_EXCL to avoid overwriting existing files
95
+
96
+ "git notes merge" had a code to see if a path exists (and fails if
97
+ it does) and then open the path for writing (when it doesn't).
98
+ Replace it with open with O_EXCL.
99
100
101
* sb/submodule-deinit-all (2016-07-26) 1 commit
@@ -72,22 +104,96 @@ of the repositories listed at
104
105
A comment update for a topic that was merged to Git v2.8.
106
75
- Will merge to 'master'.
107
+--------------------------------------------------
108
+[New Topics]
109
110
+* da/subtree-modernize (2016-07-27) 2 commits
111
+ - subtree: adjust function definitions to match CodingGuidelines
112
+ - subtree: adjust style to match CodingGuidelines
113
+ (this branch uses da/subtree-2.9-regression.)
114
78
-* cp/completion-clone-recurse-submodules (2016-07-27) 1 commit
79
- - completion: add option '--recurse-submodules' to 'git clone'
115
+ Style fixes for "git subtree" (in contrib/).
116
117
Will merge to 'next'.
118
119
84
-* va/i18n (2016-07-27) 3 commits
85
- - SQUASH??? -Werror=format-security
86
- - i18n: config: unfold error messages marked for translation
87
- - i18n: notes: mark comment for translation
120
+* js/rebase-i-progress-tidy (2016-07-28) 1 commit
121
+ - rebase-interactive: trim leading whitespace from progress count
122
+
123
+ Regression fix for an i18n topic already in 'master'.
124
+
125
+ Will merge to 'next'.
126
+
127
+
128
+* jk/t4205-cleanup (2016-07-27) 2 commits
129
+ - t4205: indent here documents
130
+ - t4205: drop top-level &&-chaining
131
+
132
+ Test modernization.
133
+
134
+ Will merge to 'next'.
135
+
136
+
137
+* jk/pack-objects-optim (2016-07-29) 7 commits
138
+ - pack-objects: use mru list when iterating over packs
139
+ - pack-objects: compute local/ignore_pack_keep early
140
+ - pack-objects: break out of want_object loop early
141
+ - find_pack_entry: replace last_found_pack with MRU cache
142
+ - add generic most-recently-used list
143
+ - sha1_file: drop free_pack_by_name
144
+ - t/perf: add tests for many-pack scenarios
145
+
146
+ "git pack-objects" has a few options that tell it not to pack
147
+ objects found in certain packfiles, which require it to scan .idx
148
+ files of all available packs. The codepaths involved in these
149
+ operations have been optimized for a common case of not having any
150
+ non-local pack and/or any .kept pack.
151
+
152
+ The last patch is still questionable in that it can attempt to
153
+ create a cycle in delta-chain, only to be stopped by the last-ditch
154
+ recovery logic in there.
155
+
156
+
157
+* kw/patch-ids-optim (2016-07-29) 4 commits
158
+ - rebase: avoid computing unnecessary patch IDs
159
+ - patch-ids: add flag to create the diff patch id using header only data
160
+ - patch-ids: replace the seen indicator with a commit pointer
161
+ - patch-ids: stop using a hand-rolled hashmap implementation
162
+
163
+ When "git rebase" tries to compare set of changes on the updated
164
+ upstream and our own branch, it computes patch-id for all of these
165
+ changes and attempts to find matches. This has been optimized by
166
+ lazily computing the full patch-id (which is expensive) to be
167
+ compared only for changes that touch the same set of paths.
168
+
169
+ Will merge to 'next'.
170
+
171
+
172
+* jk/rebase-i-drop-ident-check (2016-07-29) 1 commit
173
+ - rebase-interactive: drop early check for valid ident
174
89
- More i18n marking. The top one seems to need more work; the bottom
90
- one looked OK.
175
+ Even when "git pull --rebase=preserve" (and the underlying "git
176
+ rebase --preserve") can complete without creating any new commit
177
+ (i.e. fast-forwards), it still insisted on having a usable ident
178
+ information (read: user.email is set correctly), which was less
179
+ than nice. As the underlying commands used inside "git rebase"
180
+ would fail with a more meaningful error message and advice text
181
+ when the bogus ident matters, this extra check was removed.
182
+
183
+ Will hold.
184
+ cf. <20160729224944.GA23242@sigill.intra.peff.net>
185
+
186
+
187
+* jk/reset-ident-time-per-commit (2016-07-29) 1 commit
188
+ - reset cached ident date before creating objects
189
+
190
+ Not-so-recent rewrite of "git am" that started making internal
191
+ calls into the commit machinery had an unintended regression, in
192
+ that no matter how many seconds it took to apply many patches, the
193
+ resulting committer timestamp for the resulting commits were all
194
+ the same.
195
+
196
+ Will merge to 'next'.
197
198
--------------------------------------------------
199
[Stalled]
@@ -170,7 +276,7 @@ of the repositories listed at
276
to check has been optimized greatly.
277
278
Expecting a reroll.
173
- ($gmane/291163)
279
+ cf. <1460294354-7031-1-git-send-email-s-beyer@gmx.net>
280
281
282
* sg/completion-updates (2016-02-28) 21 commits
@@ -197,7 +303,7 @@ of the repositories listed at
303
. completion: improve __git_refs()'s in-code documentation
304
305
Will be rerolled.
200
- ($gmane/287839)
306
+ cf. <1456754714-25237-1-git-send-email-szeder@ira.uka.de>
307
308
309
* ec/annotate-deleted (2015-11-20) 1 commit
@@ -219,7 +325,7 @@ of the repositories listed at
325
.bitmap and .keep files.
326
327
Waiting for a reroll.
222
- ($gmane/284368).
328
+ cf. <xmqq60ypbeng.fsf@gitster.mtv.corp.google.com>
329
330
331
* jc/diff-b-m (2015-02-23) 5 commits
@@ -240,18 +346,69 @@ of the repositories listed at
346
--------------------------------------------------
347
[Cooking]
348
349
+* da/subtree-2.9-regression (2016-07-26) 2 commits
350
+ (merged to 'next' on 2016-07-26 at 9d71562)
351
+ + subtree: fix "git subtree split --rejoin"
352
+ + t7900-subtree.sh: fix quoting and broken && chains
353
+ (this branch is used by da/subtree-modernize.)
354
+
355
+ "git merge" in Git v2.9 was taught to forbid merging an unrelated
356
+ lines of history by default, but that is exactly the kind of thing
357
+ the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
358
+ "git subtree" has been taught to use the "--allow-unrelated-histories"
359
+ option to override the default.
360
+
361
+ Will merge to 'master'.
362
+
363
+
364
+* nd/fetch-ref-summary (2016-07-26) 1 commit
365
+ - t5510: skip tests under GETTEXT_POISON build
366
+
367
+ Hotfix of a test in a topic that has already been merged to 'master'.
368
+
369
+ Will merge to 'next'.
370
+
371
+
372
+* os/no-verify-skips-commit-msg-too (2016-07-26) 1 commit
373
+ (merged to 'next' on 2016-07-26 at 09b98b9)
374
+ + commit: describe that --no-verify skips the commit-msg hook in the help text
375
+
376
+ "git commit --help" said "--no-verify" is only about skipping the
377
+ pre-commit hook, and failed to say that it also skipped the
378
+ commit-msg hook.
379
+
380
+ Will merge to 'master'.
381
+
382
+
383
+* cp/completion-clone-recurse-submodules (2016-07-27) 1 commit
384
+ - completion: add option '--recurse-submodules' to 'git clone'
385
+
386
+ Will merge to 'next'.
387
+
388
+
389
+* va/i18n (2016-07-28) 2 commits
390
+ - i18n: config: unfold error messages marked for translation
391
+ - i18n: notes: mark comment for translation
392
+
393
+ More i18n marking.
394
+
395
+ Will merge to 'next'.
396
+
397
+
398
* jc/grep-commandline-vs-configuration (2016-07-25) 1 commit
244
- - grep: further simplify setting the pattern type
399
+ (merged to 'next' on 2016-07-28 at dd53273)
400
+ + grep: further simplify setting the pattern type
401
402
"git -c grep.patternType=extended log --basic-regexp" misbehaved
403
because the internal API to access the grep machinery was not
404
designed well.
405
250
- Will merge to 'next'.
406
+ Will merge to 'master'.
407
408
409
* jk/diff-do-not-reuse-wtf-needs-cleaning (2016-07-22) 1 commit
254
- - diff: do not reuse worktree files that need "clean" conversion
410
+ (merged to 'next' on 2016-07-28 at e3c5190)
411
+ + diff: do not reuse worktree files that need "clean" conversion
412
413
There is an optimization used in "git diff $treeA $treeB" to borrow
414
an already checked-out copy in the working tree when it is known to
@@ -263,21 +420,23 @@ of the repositories listed at
420
point of the optimization. The optimization has been disabled when
421
the conversion is necessary.
422
266
- Will merge to 'next'.
423
+ Will merge to 'master'.
424
425
426
* jk/git-jump (2016-07-22) 3 commits
270
- - contrib/git-jump: fix typo in README
271
- - contrib/git-jump: add whitespace-checking mode
272
- - contrib/git-jump: fix greedy regex when matching hunks
427
+ (merged to 'next' on 2016-07-28 at 9ef9398)
428
+ + contrib/git-jump: fix typo in README
429
+ + contrib/git-jump: add whitespace-checking mode
430
+ + contrib/git-jump: fix greedy regex when matching hunks
431
432
"git jump" script (in contrib/) has been updated a bit.
433
276
- Will merge to 'next'.
434
+ Will merge to 'master'.
435
436
437
* jk/parse-options-concat (2016-07-06) 1 commit
280
- - parse_options: allocate a new array when concatenating
438
+ (merged to 'next' on 2016-07-28 at 219bc3a)
439
+ + parse_options: allocate a new array when concatenating
440
441
Users of the parse_options_concat() API function needs to allocate
442
extra slots in advance and fill them with OPT_END() when they want
@@ -285,27 +444,28 @@ of the repositories listed at
444
error-prone and hard to read. This has been corrected by tweaking
445
the API to allocate and return a new copy of "struct option" array.
446
288
- Will merge to 'next'.
447
+ Will merge to 'master'.
448
449
450
* jk/push-progress (2016-07-20) 12 commits
292
- - receive-pack: send keepalives during quiet periods
293
- - receive-pack: turn on connectivity progress
294
- - receive-pack: relay connectivity errors to sideband
295
- - receive-pack: turn on index-pack resolving progress
296
- - index-pack: add flag for showing delta-resolution progress
297
- - clone: use a real progress meter for connectivity check
298
- - check_connected: add progress flag
299
- - check_connected: relay errors to alternate descriptor
300
- - check_everything_connected: use a struct with named options
301
- - check_everything_connected: convert to argv_array
302
- - rev-list: add optional progress reporting
303
- - check_everything_connected: always pass --quiet to rev-list
451
+ (merged to 'next' on 2016-07-28 at 39598fb)
452
+ + receive-pack: send keepalives during quiet periods
453
+ + receive-pack: turn on connectivity progress
454
+ + receive-pack: relay connectivity errors to sideband
455
+ + receive-pack: turn on index-pack resolving progress
456
+ + index-pack: add flag for showing delta-resolution progress
457
+ + clone: use a real progress meter for connectivity check
458
+ + check_connected: add progress flag
459
+ + check_connected: relay errors to alternate descriptor
460
+ + check_everything_connected: use a struct with named options
461
+ + check_everything_connected: convert to argv_array
462
+ + rev-list: add optional progress reporting
463
+ + check_everything_connected: always pass --quiet to rev-list
464
465
"git push" and "git clone" learned to give better progress meters
466
to the end user who is waiting on the terminal.
467
308
- Will merge to 'next'.
468
+ Will merge to 'master'.
469
470
471
* jk/reflog-date (2016-07-27) 7 commits
@@ -325,52 +485,45 @@ of the repositories listed at
485
486
487
* mm/status-suggest-merge-abort (2016-07-22) 1 commit
328
- - status: suggest 'git merge --abort' when appropriate
488
+ (merged to 'next' on 2016-07-28 at b8b87d9)
489
+ + status: suggest 'git merge --abort' when appropriate
490
491
"git status" learned to suggest "merge --abort" during a conflicted
492
merge, just like it already suggests "rebase --abort" during a
493
conflicted rebase.
494
334
- Will merge to 'next'.
495
+ Will merge to 'master'.
496
497
498
* pm/build-persistent-https-with-recent-go (2016-07-22) 2 commits
338
- - contrib/persistent-https: use Git version for build label
339
- - contrib/persistent-https: update ldflags syntax for Go 1.7+
499
+ (merged to 'next' on 2016-07-28 at f6e9115)
500
+ + contrib/persistent-https: use Git version for build label
501
+ + contrib/persistent-https: update ldflags syntax for Go 1.7+
502
503
The build procedure for "git persistent-https" helper (in contrib/)
504
has been updated so that it can be built with more recent versions
505
of Go.
506
345
- Will merge to 'next'.
507
+ Will merge to 'master'.
508
509
510
* sb/pack-protocol-doc-nak (2016-07-22) 1 commit
349
- - Documentation: pack-protocol correct NAK response
511
+ (merged to 'next' on 2016-07-28 at 5c94e0e)
512
+ + Documentation: pack-protocol correct NAK response
513
514
A doc update.
515
353
- Will merge to 'next'.
516
+ Will merge to 'master'.
517
518
519
* sb/submodule-clone-retry (2016-07-22) 2 commits
357
- - submodule-helper: fix indexing in clone retry error reporting path
358
- - git-submodule: forward exit code of git-submodule--helper more faithfully
520
+ (merged to 'next' on 2016-07-28 at 5487d28)
521
+ + submodule-helper: fix indexing in clone retry error reporting path
522
+ + git-submodule: forward exit code of git-submodule--helper more faithfully
523
524
An earlier tweak to make "submodule update" retry a failing clone
525
of submodules was buggy and caused segfault, which has been fixed.
526
363
- Will merge to 'next'.
364
-
365
-
366
-* ew/find-perl-on-freebsd-in-local (2016-07-26) 1 commit
367
- (merged to 'next' on 2016-07-26 at f76a962)
368
- + config.mak.uname: correct perl path on FreeBSD
369
-
370
- Recent FreeBSD stopped making perl available at /usr/bin/perl;
371
- switch the default the built-in path to /usr/local/bin/perl on not
372
- too ancient FreeBSD releases.
373
-
527
Will merge to 'master'.
528
529
@@ -399,22 +552,9 @@ of the repositories listed at
552
Will merge to 'next'.
553
554
402
-* ew/daemon-socket-keepalive (2016-07-22) 2 commits
403
- (merged to 'next' on 2016-07-22 at d39c827)
404
- + Windows: add missing definition of ENOTSOCK
405
- (merged to 'next' on 2016-07-19 at 0140849)
406
- + daemon: ignore ENOTSOCK from setsockopt
407
-
408
- Recent update to "git daemon" tries to enable the socket-level
409
- KEEPALIVE, but when it is spawned via inetd, the standard input
410
- file descriptor may not necessarily be connected to a socket.
411
- Suppress an ENOTSOCK error from setsockopt().
412
-
413
- Will merge to 'master'.
414
-
415
-
555
* jt/fetch-large-handshake-window-on-http (2016-07-19) 1 commit
417
- - fetch-pack: grow stateless RPC windows exponentially
556
+ (merged to 'next' on 2016-07-28 at 5606b14)
557
+ + fetch-pack: grow stateless RPC windows exponentially
558
559
"git fetch" exchanges batched have/ack messages between the sender
560
and the receiver, initially doubling every time and then falling
@@ -424,27 +564,20 @@ of the repositories listed at
564
repository. The internal mechanism learned to grow the window size
565
more aggressively when working with the "smart http" transport.
566
427
- Will merge to 'next'.
428
-
429
-
430
-* ew/svn-authorsprog-doc (2016-07-19) 1 commit
431
- - git-svn: document svn.authorsProg in config
432
-
433
- Belated doc update.
434
-
435
- Perhaps I will get a copy of this directly from Eric together with
436
- other updates to git-svn, in which case this needs to be scrapped.
567
+ Will merge to 'master'.
568
569
439
-* rs/submodule-config-code-cleanup (2016-07-26) 3 commits
440
- - submodule-config: combine error checking if clauses
441
- - fix passing a name for config from submodules
570
+* rs/submodule-config-code-cleanup (2016-07-28) 4 commits
571
+ (merged to 'next' on 2016-07-28 at e25450e)
572
+ + submodule-config: fix test binary crashing when no arguments given
573
+ + submodule-config: combine early return code into one goto
574
+ + submodule-config: passing name reference for .gitmodule blobs
575
(merged to 'next' on 2016-07-19 at 59dbd58)
576
+ submodule-config: use explicit empty string instead of strbuf in config_from()
577
578
Code cleanup.
579
447
- Will merge to 'next'.
580
+ Will merge to 'master'.
581
582
583
* js/am-3-merge-recursive-direct (2016-07-26) 16 commits
@@ -473,24 +606,6 @@ of the repositories listed at
606
I started re-reading them, but I do want eyes from other people.
607
608
476
-* nd/pack-ofs-4gb-limit (2016-07-13) 7 commits
477
- (merged to 'next' on 2016-07-13 at 91e217d)
478
- + fsck: use streaming interface for large blobs in pack
479
- + pack-objects: do not truncate result in-pack object size on 32-bit systems
480
- + index-pack: correct "offset" type in unpack_entry_data()
481
- + index-pack: report correct bad object offsets even if they are large
482
- + index-pack: correct "len" type in unpack_data()
483
- + sha1_file.c: use type off_t* for object_info->disk_sizep
484
- + pack-objects: pass length to check_pack_crc() without truncation
485
-
486
- "git pack-objects" and "git index-pack" mostly operate with off_t
487
- when talking about the offset of objects in a packfile, but there
488
- were a handful of places that used "unsigned long" to hold that
489
- value, leading to an unintended truncation.
490
-
491
- Will merge to 'master'.
492
-
493
-
609
* sb/push-options (2016-07-14) 4 commits
610
(merged to 'next' on 2016-07-19 at ee9a83a)
611
+ add a test for push options
@@ -549,32 +664,8 @@ of the repositories listed at
664
Will hold.
665
666
552
-* js/rebase-i-tests (2016-07-07) 3 commits
553
- (merged to 'next' on 2016-07-13 at b06b28f)
554
- + rebase -i: we allow extra spaces after fixup!/squash!
555
- + rebase -i: demonstrate a bug with --autosquash
556
- + t3404: add a test for the --gpg-sign option
557
-
558
- A few tests that specifically target "git rebase -i" have been
559
- added.
560
-
561
- Will merge to 'master'.
562
-
563
-
564
-* rs/notes-merge-no-toctou (2016-07-07) 1 commit
565
- (merged to 'next' on 2016-07-13 at f08b530)
566
- + notes-merge: use O_EXCL to avoid overwriting existing files
567
-
568
- "git notes merge" had a code to see if a path exists (and fails if
569
- it does) and then open the path for writing (when it doesn't).
570
- Replace it with open with O_EXCL.
571
-
572
- Will merge to 'master'.
573
-
574
-
575
-* jk/difftool-in-subdir (2016-07-19) 4 commits
667
+* jk/difftool-in-subdir (2016-07-28) 3 commits
668
- difftool: use Git::* functions instead of passing around state
577
- - SQUASH???
669
- difftool: avoid $GIT_DIR and $GIT_WORK_TREE
670
- difftool: fix argument handling in subdirs
671
@@ -582,6 +673,8 @@ of the repositories listed at
673
interpret the paths relative to that directory, which has been
674
fixed.
675
676
+ Will merge to 'next'.
677
+
678
679
* dp/autoconf-curl-ssl (2016-06-28) 1 commit
680
- ./configure.ac: detect SSL in libcurl using curl-config
@@ -592,8 +685,8 @@ of the repositories listed at
685
Needs review.
686
687
595
-* jc/pull-rebase-ff (2016-06-29) 1 commit
596
- - pull: fast-forward "pull --rebase=true"
688
+* jc/pull-rebase-ff (2016-07-28) 1 commit
689
+ - pull: fast-forward "pull --rebase=true"
690
691
"git pull --rebase", when there is no new commits on our side since
692
we forked from the upstream, should be able to fast-forward without
@@ -616,7 +709,7 @@ of the repositories listed at
709
documentation.
710
711
Updates in 4/8 ("give headings") is reported to break formatting?
619
- ($gmane/300030)
712
+ cf. <57913C97.1030001@xiplink.com>
713
714
715
* ex/deprecate-empty-pathspec-as-match-all (2016-06-22) 1 commit
@@ -681,7 +774,7 @@ of the repositories listed at
774
can plug in different backends to store references.
775
776
Needs a fixup.
684
- ($gmane/298137)
777
+ cf. <576D9885.2020901@ramsayjones.plus.com>
778
779
780
* jc/blame-reverse (2016-06-14) 2 commits
@@ -774,23 +867,6 @@ of the repositories listed at
867
Comments?
868
869
777
-* nd/worktree-lock (2016-07-08) 6 commits
778
- (merged to 'next' on 2016-07-13 at c768a85)
779
- + worktree.c: find_worktree() search by path suffix
780
- + worktree: add "unlock" command
781
- + worktree: add "lock" command
782
- + worktree.c: add is_worktree_locked()
783
- + worktree.c: add is_main_worktree()
784
- + worktree.c: add find_worktree()
785
-
786
- "git worktree prune" protected worktrees that are marked as
787
- "locked" by creating a file in a known location. "git worktree"
788
- command learned a dedicated command pair to create and remoev such
789
- a file, so that the users do not have to do this with editor.
790
-
791
- Will merge to 'master'.
792
-
793
-
870
* sb/submodule-default-paths (2016-06-20) 5 commits
871
- completion: clone can recurse into submodules
872
- clone: add --init-submodule=<pathspec> switch
@@ -923,7 +999,8 @@ of the repositories listed at
999
refresh cost.
1000
1001
Not quite ready yet, it seems.
926
- ($gmane/298949, $gmane/299506)
1002
+ cf. <alpine.DEB.2.20.1607061016330.6426@virtualbox>
1003
+ cf. <CACsJy8AiER_=5aJ65r+GPCE_nXbrPTAMKJi=FuJgT8zzV2-NFw@mail.gmail.com>
1004
1005
1006
* jc/bundle (2016-03-03) 6 commits
@@ -954,19 +1031,14 @@ of the repositories listed at
1031
1032
It has been reported that git-gui still uses the deprecated syntax,
1033
which needs to be fixed before this final step can proceed.
957
- ($gmane/282594)
1034
+ cf. <5671DB28.8020901@kdbg.org>
1035
1036
--------------------------------------------------
1037
[Discarded]
1038
962
-* ew/svn-bad-ref (2016-07-06) 1 commit
963
- . git-svn: warn instead of dying when commit data is missing
964
-
965
- Pulled directly from upstream hence discarded.
966
-
1039
+* ew/svn-authorsprog-doc (2016-07-19) 1 commit
1040
+ . git-svn: document svn.authorsProg in config
1041
968
-* tb/convert-peek-in-index (2016-07-07) 2 commits
969
- . correct ce_compare_data() in a middle of a merge
970
- . read-cache: factor out get_sha1_from_index() helper
1042
+ Belated doc update.
1043
972
- Discarded and replaced by jc/renormalize-merge-kill-safer-crlf
1044
+ Pulled directly from upstream hence discarded.