What's cooking (2016/05 #02)
Junio C Hamano committed
May 6, 2016 at 15:26 UTC
27a742c2bcda39d977c91d7ad8bd83e96c65664c
1 file changed
+254
-297
whats-cooking.txt
+254
-297
@@ -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, #01; Tue, 3)
4
-X-master-at: 4bb51aed1e858bfac174255ae4d8994af3a8e07a
5
-X-next-at: d223320ae286a25b183b0959b1a0160871c6684a
3
+Subject: What's cooking in git.git (May 2016, #02; Fri, 6)
4
+X-master-at: 63a35025b11bf0e7ef39693aeea3b639a066b7b8
5
+X-next-at: 68575d3b6b2330b6a5502f5d10f584fa21b380e1
6
7
-What's cooking in git.git (May 2016, #01; Tue, 3)
7
+What's cooking in git.git (May 2016, #02; Fri, 6)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,7 +12,7 @@ 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
-The 'master' branch now has the ninth batch of topics of this cycle.
15
+The 'master' branch now has the tenth batch of topics of this cycle.
16
On the 'maint' front, 2.8.2 is out and fixes that have been in
17
'master' accumulates on it for 2.8.3.
18
@@ -26,166 +26,169 @@ of the repositories listed at
26
--------------------------------------------------
27
[Graduated to "master"]
28
29
-* en/merge-fixes (2016-04-12) 2 commits
30
- (merged to 'next' on 2016-04-27 at 14d7d10)
31
- + merge-recursive: do not check working copy when creating a virtual merge base
32
- + merge-recursive: remove duplicate code
29
+* bc/object-id (2016-04-25) 6 commits
30
+ (merged to 'next' on 2016-04-29 at 02f13a4)
31
+ + match-trees: convert several leaf functions to use struct object_id
32
+ + tree-walk: convert tree_entry_extract() to use struct object_id
33
+ + struct name_entry: use struct object_id instead of unsigned char sha1[20]
34
+ + match-trees: convert shift_tree() and shift_tree_by() to use object_id
35
+ + test-match-trees: convert to use struct object_id
36
+ + sha1-name: introduce a get_oid() function
37
34
- "merge-recursive" strategy incorrectly checked if a path that is
35
- involved in its internal merge exists in the working tree.
38
+ Move from unsigned char[20] to struct object_id continues.
39
40
38
-* jd/p4-jobs-in-commit (2016-04-19) 2 commits
39
- (merged to 'next' on 2016-04-27 at 654d946)
40
- + git-p4: add P4 jobs to git commit message
41
- + git-p4: clean-up code style in tests
41
+* bw/rebase-merge-entire-branch (2016-04-24) 1 commit
42
+ (merged to 'next' on 2016-04-29 at 7a9487f)
43
+ + git-rebase--merge: don't include absent parent as a base
44
43
- "git p4" learned to record P4 jobs in Git commit that imports from
44
- the history in Perforce.
45
+ "git rebase -m" could be asked to rebase an entire branch starting
46
+ from the root, but failed by assuming that there always is a parent
47
+ commit to the first commit on the branch.
48
49
47
-* jd/send-email-to-whom (2016-04-25) 1 commit
48
- (merged to 'next' on 2016-04-27 at 47ae363)
49
- + send-email: fix grammo in the prompt that asks e-mail recipients
50
+* jc/drop-git-spec-in (2016-04-27) 2 commits
51
+ (merged to 'next' on 2016-04-27 at 2b85030)
52
+ + Makefile: remove dependency on git.spec
53
+ (merged to 'next' on 2016-04-22 at 531583f)
54
+ + Makefile: stop pretending to support rpmbuild
55
51
- A question by "git send-email" to ask the identity of the sender
52
- has been updated.
56
+ As nobody maintains our in-tree git.spec.in and distros use their
57
+ own spec file, we stopped pretending that we support "make rpm".
58
59
55
-* jk/fix-attribute-macro-in-2.5 (2016-04-25) 1 commit
56
- (merged to 'next' on 2016-04-27 at 2e42613)
57
- + remote.c: spell __attribute__ correctly
60
+* jk/diff-compact-heuristic (2016-05-02) 3 commits
61
+ (merged to 'next' on 2016-05-02 at 2a74763)
62
+ + diff: undocument the compaction heuristic knobs for experimentation
63
+ (merged to 'next' on 2016-04-22 at 0c117ea)
64
+ + xdiff: implement empty line chunk heuristic
65
+ + xdiff: add recs_match helper function
66
+ (this branch is tangled with jc/diff-compact-always-use-blank-heuristics.)
67
59
- Code fixup.
68
+ Patch output from "git diff" and friends has been tweaked to be
69
+ more readable by using a blank line as a strong hint that the
70
+ contents before and after it belong to a logically separate unit.
71
72
62
-* js/name-rev-use-oldest-ref (2016-04-22) 1 commit
63
- (merged to 'next' on 2016-04-27 at 8fdc0ac)
64
- + name-rev: include taggerdate in considering the best name
73
+* js/http-custom-headers (2016-04-27) 1 commit
74
+ (merged to 'next' on 2016-04-27 at 0c97a50)
75
+ + http: support sending custom HTTP headers
76
66
- "git describe --contains" often made a hard-to-justify choice of
67
- tag to give name to a given commit, because it tried to come up
68
- with a name with smallest number of hops from a tag, causing an old
69
- commit whose close descendant that is recently tagged were not
70
- described with respect to an old tag but with a newer tag. It did
71
- not help that its computation of "hop" count was further tweaked to
72
- penalize being on a side branch of a merge. The logic has been
73
- updated to favor using the tag with the oldest tagger date, which
74
- is a lot easier to explain to the end users: "We describe a commit
75
- in terms of the (chronologically) oldest tag that contains the
76
- commit."
77
+ HTTP transport clients learned to throw extra HTTP headers at the
78
+ server, specified via http.extraHeader configuration variable.
79
80
79
-* nd/remove-unused (2016-04-22) 2 commits
80
- (merged to 'next' on 2016-04-27 at 7917efa)
81
- + wrapper.c: delete dead function git_mkstemps()
82
- + dir.c: remove dead function fnmatch_icase()
81
+* ld/p4-test-py3 (2016-04-26) 3 commits
82
+ (merged to 'next' on 2016-04-27 at d5d5fca)
83
+ + git-p4 tests: time_in_seconds should use $PYTHON_PATH
84
+ + git-p4 tests: work with python3 as well as python2
85
+ + git-p4 tests: cd to / before running python
86
84
- Code cleanup.
87
+ The test scripts for "git p4" (but not "git p4" implementation
88
+ itself) has been updated so that they would work even on a system
89
+ where the installed version of Python is python 3.
90
91
87
-* nf/mergetool-prompt (2016-04-25) 1 commit
88
- (merged to 'next' on 2016-04-27 at 1c992df)
89
- + difftool/mergetool: make the form of yes/no questions consistent
92
+* ls/p4-lfs-test-fix-2.7.0 (2016-04-29) 2 commits
93
+ (merged to 'next' on 2016-04-29 at da56b67)
94
+ + t9824: fix wrong reference value
95
+ (merged to 'next' on 2016-04-27 at be87c63)
96
+ + t9824: fix broken &&-chain in a subshell
97
91
- UI consistency improvements.
98
+ Fix a broken test.
99
100
94
-* rt/string-list-lookup-cleanup (2016-04-25) 1 commit
95
- (merged to 'next' on 2016-04-27 at 53514e1)
96
- + string_list: use string-list API in unsorted_string_list_lookup()
101
+* sb/clone-shallow-passthru (2016-04-26) 1 commit
102
+ (merged to 'next' on 2016-04-27 at 3112b24)
103
+ + clone: add `--shallow-submodules` flag
104
98
- Code cleanup.
105
+ "git clone" learned "--shallow-submodules" option.
106
107
101
-* sg/test-lib-simplify-expr-away (2016-04-22) 1 commit
102
- (merged to 'next' on 2016-04-27 at 8f40952)
103
- + test-lib: simplify '--option=value' parsing
108
+* sb/config-exit-status-list (2016-04-26) 1 commit
109
+ (merged to 'next' on 2016-04-27 at 44fe343)
110
+ + config doc: improve exit code listing
111
105
- Code cleanup.
112
+ Doc update.
113
114
--------------------------------------------------
115
[New Topics]
116
110
-* ew/normal-to-e (2016-05-02) 1 commit
111
- - .mailmap: update to my shorter email address
112
-
113
- Will merge to 'next'.
117
+* sb/submodule-deinit-all (2016-05-05) 1 commit
118
+ - submodule deinit: require '--all' instead of '.' for all submodules
119
115
-
116
-* jc/diff-compact-always-use-blank-heuristics (2016-04-29) 3 commits
117
- - diff: enable "compaction heuristics" and lose experimentation knob
118
- (merged to 'next' on 2016-04-22 at 0c117ea)
119
- + xdiff: implement empty line chunk heuristic
120
- + xdiff: add recs_match helper function
121
- (this branch is tangled with jk/diff-compact-heuristic.)
122
-
123
- This should be discarded.
124
-
125
-
126
-* js/close-packs-before-gc (2016-05-02) 1 commit
127
- - t5510: run auto-gc in the foreground
120
+ Correct faulty recommendation to use "git submodule deinit ." when
121
+ de-initialising all submodules, which would result in a strange
122
+ error message in a pathological corner case.
123
124
Will merge to 'next'.
125
126
132
-* ls/travis-submitting-patches (2016-05-02) 1 commit
133
- - Documentation: add setup instructions for Travis CI
127
+* bn/config-doc-tt-varnames (2016-05-05) 1 commit
128
+ - config: consistently format $variables in monospaced font
129
+ (this branch uses jc/config-pathname-type.)
130
135
- Will merge to 'next'.
131
+ Doc formatting fixes.
132
133
138
-* rn/glossary-typofix (2016-05-02) 1 commit
139
- - Documentation: fix typo 'In such these cases'
134
+* lp/typofixes (2016-05-06) 1 commit
135
+ - typofix: assorted typofixes in comments, documentation and messages
136
137
Will merge to 'next'.
138
139
144
-* jc/commit-tree-ignore-commit-gpgsign (2016-05-03) 1 commit
145
- - commit-tree: do not pay attention to commit.gpgsign
146
-
147
- "git commit-tree" plumbing command required the user to always sign
148
- its result when the user sets the commit.gpgsign configuration
149
- variable, which was an ancient mistake. Rework "git rebase" that
150
- relied on this mistake so that it reads commit.gpgsign and pass (or
151
- not pass) the -S option to "git commit-tree" to keep the end-user
152
- expectation the same, while teaching "git commit-tree" to ignore
153
- the configuration variable. This will stop requiring the users to
154
- sign commit objects used internally as an implementation detail of
155
- "git stash".
140
+* sb/z-is-gnutar-ism (2016-05-06) 1 commit
141
+ - t3513: do not compress backup tar file
142
143
Will merge to 'next'.
144
145
160
-* jk/push-client-deadlock-fix (2016-05-02) 1 commit
161
- - Windows: add pthread_sigmask() that does nothing
146
+* jc/test-parse-options-expect (2016-05-06) 4 commits
147
+ - t0040: convert a few tests to use test-parse-options --expect
148
+ - t0040: remove unused test helpers
149
+ - test-parse-options: --expect=<string> option to simplify tests
150
+ - test-parse-options: fix output when callback option fails
151
+ (this branch uses pb/commit-verbose-config.)
152
163
- Will merge to 'next'.
164
-
165
-
166
-* sb/clean-test-fix (2016-05-03) 1 commit
167
- - t7300: mark test with SANITY
153
169
- Will merge to 'next'.
154
+* jc/doc-lint (2016-05-04) 2 commits
155
+ - Documentation: fix linkgit references
156
+ - ci: validate "gitlink:" in documentation
157
158
172
-* sb/submodule-module-list-pathspec-fix (2016-05-03) 1 commit
173
- - submodule deinit test: fix broken && chain in subshell
174
-
175
- Will merge to 'next'.
159
+--------------------------------------------------
160
+[Stalled]
161
162
+* sb/bisect (2016-04-15) 22 commits
163
+ - SQUASH???
164
+ - bisect: get back halfway shortcut
165
+ - bisect: compute best bisection in compute_relevant_weights()
166
+ - bisect: use a bottom-up traversal to find relevant weights
167
+ - bisect: prepare for different algorithms based on find_all
168
+ - bisect: rename count_distance() to compute_weight()
169
+ - bisect: make total number of commits global
170
+ - bisect: introduce distance_direction()
171
+ - bisect: extract get_distance() function from code duplication
172
+ - bisect: use commit instead of commit list as arguments when appropriate
173
+ - bisect: replace clear_distance() by unique markers
174
+ - bisect: use struct node_data array instead of int array
175
+ - bisect: get rid of recursion in count_distance()
176
+ - bisect: make algorithm behavior independent of DEBUG_BISECT
177
+ - bisect: make bisect compile if DEBUG_BISECT is set
178
+ - bisect: plug the biggest memory leak
179
+ - bisect: add test for the bisect algorithm
180
+ - t6030: generalize test to not rely on current implementation
181
+ - t: use test_cmp_rev() where appropriate
182
+ - t/test-lib-functions.sh: generalize test_cmp_rev
183
+ - bisect: allow 'bisect run' if no good commit is known
184
+ - bisect: write about `bisect next` in documentation
185
178
-* sk/gitweb-highlight-encoding (2016-05-03) 1 commit
179
- - gitweb: apply fallback encoding before highlight
186
+ The internal algorithm used in "git bisect" to find the next commit
187
+ to check has been optimized greatly.
188
181
- Some multi-byte encoding can have a backslash byte as a later part
182
- of one letter, which would confuse "highlight" filter used in
183
- gitweb.
189
+ Expecting a reroll.
190
+ ($gmane/291163)
191
185
- Will merge to 'next'.
186
-
187
---------------------------------------------------
188
-[Stalled]
192
193
* ar/diff-args-osx-precompose (2016-04-05) 1 commit
194
- diff: run arguments through precompose_argv
@@ -377,7 +380,84 @@ of the repositories listed at
380
--------------------------------------------------
381
[Cooking]
382
380
-* ab/hooks (2016-04-26) 4 commits
383
+* ew/normal-to-e (2016-05-02) 1 commit
384
+ (merged to 'next' on 2016-05-06 at 65a2c52)
385
+ + .mailmap: update to my shorter email address
386
+
387
+ Will merge to 'master'.
388
+
389
+
390
+* js/close-packs-before-gc (2016-05-02) 1 commit
391
+ (merged to 'next' on 2016-05-06 at bfd39bf)
392
+ + t5510: run auto-gc in the foreground
393
+
394
+ Will merge to 'master'.
395
+
396
+
397
+* ls/travis-submitting-patches (2016-05-02) 1 commit
398
+ (merged to 'next' on 2016-05-06 at 467930e)
399
+ + Documentation: add setup instructions for Travis CI
400
+
401
+ Will merge to 'master'.
402
+
403
+
404
+* rn/glossary-typofix (2016-05-02) 1 commit
405
+ (merged to 'next' on 2016-05-06 at 1e73e76)
406
+ + Documentation: fix typo 'In such these cases'
407
+
408
+ Will merge to 'master'.
409
+
410
+
411
+* jc/commit-tree-ignore-commit-gpgsign (2016-05-03) 1 commit
412
+ (merged to 'next' on 2016-05-06 at 08eccb2)
413
+ + commit-tree: do not pay attention to commit.gpgsign
414
+
415
+ "git commit-tree" plumbing command required the user to always sign
416
+ its result when the user sets the commit.gpgsign configuration
417
+ variable, which was an ancient mistake. Rework "git rebase" that
418
+ relied on this mistake so that it reads commit.gpgsign and pass (or
419
+ not pass) the -S option to "git commit-tree" to keep the end-user
420
+ expectation the same, while teaching "git commit-tree" to ignore
421
+ the configuration variable. This will stop requiring the users to
422
+ sign commit objects used internally as an implementation detail of
423
+ "git stash".
424
+
425
+ Will merge to 'master'.
426
+
427
+
428
+* jk/push-client-deadlock-fix (2016-05-02) 1 commit
429
+ (merged to 'next' on 2016-05-06 at e91626c)
430
+ + Windows: add pthread_sigmask() that does nothing
431
+
432
+ Will merge to 'master'.
433
+
434
+
435
+* sb/clean-test-fix (2016-05-03) 1 commit
436
+ (merged to 'next' on 2016-05-06 at d80c9c6)
437
+ + t7300: mark test with SANITY
438
+
439
+ Will merge to 'master'.
440
+
441
+
442
+* sb/submodule-module-list-pathspec-fix (2016-05-03) 1 commit
443
+ (merged to 'next' on 2016-05-06 at ab6dac3)
444
+ + submodule deinit test: fix broken && chain in subshell
445
+
446
+ Will merge to 'master'.
447
+
448
+
449
+* sk/gitweb-highlight-encoding (2016-05-03) 1 commit
450
+ (merged to 'next' on 2016-05-06 at 441302c)
451
+ + gitweb: apply fallback encoding before highlight
452
+
453
+ Some multi-byte encoding can have a backslash byte as a later part
454
+ of one letter, which would confuse "highlight" filter used in
455
+ gitweb.
456
+
457
+ Will merge to 'master'.
458
+
459
+
460
+* ab/hooks (2016-05-04) 4 commits
461
- hooks: allow customizing where the hook directory is
462
- githooks.txt: minor improvements to the grammar & phrasing
463
- githooks.txt: amend dangerous advice about 'update' hook ACL
@@ -386,8 +466,7 @@ of the repositories listed at
466
A new configuration variable core.hooksPath allows customizing
467
where the hook directory is.
468
389
- Almost there.
390
- ($gmane/292635)
469
+ Will merge to 'next'.
470
471
472
* jc/merge-impossible-no-commit (2016-04-26) 2 commits
@@ -403,57 +482,7 @@ of the repositories listed at
482
champions this topic, I'll drop it.
483
484
406
-* js/http-custom-headers (2016-04-27) 1 commit
407
- (merged to 'next' on 2016-04-27 at 0c97a50)
408
- + http: support sending custom HTTP headers
409
-
410
- HTTP transport clients learned to throw extra HTTP headers at the
411
- server, specified via http.extraHeader configuration variable.
412
-
413
- Will merge to 'master'.
414
-
415
-
416
-* sb/bisect (2016-04-15) 22 commits
417
- - SQUASH???
418
- - bisect: get back halfway shortcut
419
- - bisect: compute best bisection in compute_relevant_weights()
420
- - bisect: use a bottom-up traversal to find relevant weights
421
- - bisect: prepare for different algorithms based on find_all
422
- - bisect: rename count_distance() to compute_weight()
423
- - bisect: make total number of commits global
424
- - bisect: introduce distance_direction()
425
- - bisect: extract get_distance() function from code duplication
426
- - bisect: use commit instead of commit list as arguments when appropriate
427
- - bisect: replace clear_distance() by unique markers
428
- - bisect: use struct node_data array instead of int array
429
- - bisect: get rid of recursion in count_distance()
430
- - bisect: make algorithm behavior independent of DEBUG_BISECT
431
- - bisect: make bisect compile if DEBUG_BISECT is set
432
- - bisect: plug the biggest memory leak
433
- - bisect: add test for the bisect algorithm
434
- - t6030: generalize test to not rely on current implementation
435
- - t: use test_cmp_rev() where appropriate
436
- - t/test-lib-functions.sh: generalize test_cmp_rev
437
- - bisect: allow 'bisect run' if no good commit is known
438
- - bisect: write about `bisect next` in documentation
439
-
440
- The internal algorithm used in "git bisect" to find the next commit
441
- to check has been optimized greatly.
442
-
443
- Expecting a reroll.
444
- ($gmane/291163)
445
-
446
-
447
-* sb/config-exit-status-list (2016-04-26) 1 commit
448
- (merged to 'next' on 2016-04-27 at 44fe343)
449
- + config doc: improve exit code listing
450
-
451
- Doc update.
452
-
453
- Will merge to 'master'.
454
-
455
-
456
-* mh/split-under-lock (2016-04-27) 29 commits
485
+* mh/split-under-lock (2016-05-06) 33 commits
486
- lock_ref_sha1_basic(): only handle REF_NODEREF mode
487
- commit_ref_update(): remove the flags parameter
488
- lock_ref_for_update(): don't resolve symrefs
@@ -471,6 +500,7 @@ of the repositories listed at
500
- ref_transaction_create(): disallow recursive pruning
501
- refs: make error messages more consistent
502
- lock_ref_sha1_basic(): remove unneeded local variable
503
+ - read_raw_ref(): move docstring to header file
504
- read_raw_ref(): improve docstring
505
- read_raw_ref(): rename symref argument to referent
506
- read_raw_ref(): clear *type at start of function
@@ -483,37 +513,39 @@ of the repositories listed at
513
- refname_is_safe(): use skip_prefix()
514
- remove_dir_recursively(): add docstring
515
- safe_create_leading_directories(): improve docstring
516
+ - read_raw_ref(): don't get confused by an empty directory
517
+ - commit_ref(): if there is an empty dir in the way, delete it
518
+ - t1404: demonstrate a bug resolving references
519
520
Further preparatory work on the refs API before the pluggable
521
backend series can land.
522
490
- Almost there.
491
- ($gmane/292772)
523
+ Updated. Will wait for comments for the last time, and then
524
+ merge to 'next'.
525
526
494
-* bn/http-cookiefile-config (2016-04-29) 2 commits
527
+* bn/http-cookiefile-config (2016-05-04) 2 commits
528
- http: expand http.cookieFile as a path
529
- Documentation: config: improve word ordering for http.cookieFile
497
- (this branch uses jc/config-pathname-type.)
530
531
"http.cookieFile" configuration variable clearly wants a pathname,
532
but we forgot to treat it as such by e.g. applying tilde expansion.
533
502
- Waiting for an Ack to what's queued with tweaks, or a reroll.
503
- ($gmane/292969)
534
+ Will merge to 'next'.
535
536
537
* ew/doc-split-pack-disables-bitmap (2016-04-28) 1 commit
507
- - pack-objects: warn on split packs disabling bitmaps
538
+ (merged to 'next' on 2016-05-06 at 6343d1e)
539
+ + pack-objects: warn on split packs disabling bitmaps
540
541
Doc update.
542
511
- Will merge to 'next'.
543
+ Will merge to 'master'.
544
545
514
-* jc/config-pathname-type (2016-04-29) 1 commit
546
+* jc/config-pathname-type (2016-05-04) 1 commit
547
- config: describe 'pathname' value type
516
- (this branch is used by bn/http-cookiefile-config.)
548
+ (this branch is used by bn/config-doc-tt-varnames.)
549
550
Consolidate description of tilde-expansion that is done to
551
configuration variables that take pathname to a single place.
@@ -521,7 +553,8 @@ of the repositories listed at
553
Will merge to 'next'.
554
555
524
-* jk/submodule-config-sanitize-fix (2016-04-28) 5 commits
556
+* jk/submodule-c-credential (2016-05-06) 6 commits
557
+ - submodule: stop sanitizing config options
558
- submodule: use prepare_submodule_repo_env consistently
559
- submodule--helper: move config-sanitizing to submodule.c
560
- submodule: export sanitized GIT_CONFIG_PARAMETERS
@@ -533,10 +566,7 @@ of the repositories listed at
566
turned out to be a convoluted no-op; implement what it wanted to do
567
correctly.
568
536
- With a rethink of the merit of "sanitization" going on, we may end
537
- up doing the configuration propagation very differently, though.
538
-
539
- Will hold.
569
+ Everybody happy?
570
571
572
* mh/connect-leak (2016-04-28) 1 commit
@@ -549,10 +579,11 @@ of the repositories listed at
579
580
581
* sb/misc-cleanups (2016-04-28) 2 commits
552
- - submodule-config: don't shadow `cache`
553
- - config.c: drop local variable
582
+ (merged to 'next' on 2016-05-06 at 87bc8a5)
583
+ + submodule-config: don't shadow `cache`
584
+ + config.c: drop local variable
585
555
- Will merge to 'next'.
586
+ Will merge to 'master'.
587
588
589
* ew/fast-import-unpack-limit (2016-04-24) 1 commit
@@ -566,48 +597,16 @@ of the repositories listed at
597
($gmane/292562)
598
599
569
-* ld/p4-test-py3 (2016-04-26) 3 commits
570
- (merged to 'next' on 2016-04-27 at d5d5fca)
571
- + git-p4 tests: time_in_seconds should use $PYTHON_PATH
572
- + git-p4 tests: work with python3 as well as python2
573
- + git-p4 tests: cd to / before running python
574
-
575
- The test scripts for "git p4" (but not "git p4" implementation
576
- itself) has been updated so that they would work even on a system
577
- where the installed version of Python is python 3.
578
-
579
- Will merge to 'master'.
580
-
581
-
582
-* ls/p4-lfs-test-fix-2.7.0 (2016-04-29) 2 commits
583
- (merged to 'next' on 2016-04-29 at da56b67)
584
- + t9824: fix wrong reference value
585
- (merged to 'next' on 2016-04-27 at be87c63)
586
- + t9824: fix broken &&-chain in a subshell
587
-
588
- Fix a broken test.
589
-
590
- Will merge to 'master'.
591
-
592
-
593
-* sb/clone-shallow-passthru (2016-04-26) 1 commit
594
- (merged to 'next' on 2016-04-27 at 3112b24)
595
- + clone: add `--shallow-submodules` flag
596
-
597
- "git clone" learned "--shallow-submodules" option.
598
-
599
- Will merge to 'master'.
600
-
601
-
600
* ls/p4-lfs (2016-04-28) 3 commits
603
- - git-p4: fix Git LFS pointer parsing
604
- - travis-ci: express Linux/OS X dependency versions more clearly
605
- - travis-ci: update Git-LFS and P4 to the latest version
601
+ (merged to 'next' on 2016-05-06 at 3e1354d)
602
+ + git-p4: fix Git LFS pointer parsing
603
+ + travis-ci: express Linux/OS X dependency versions more clearly
604
+ + travis-ci: update Git-LFS and P4 to the latest version
605
606
Recent update to Git LFS broke "git p4" by changing the output from
607
its "lfs pointer" subcommand.
608
610
- Will merge to 'next'.
609
+ Will merge to 'master'.
610
611
612
* tb/convert-eol-autocrlf (2016-04-29) 10 commits
@@ -636,20 +635,6 @@ of the repositories listed at
635
in the middle.
636
637
639
-* bc/object-id (2016-04-25) 6 commits
640
- (merged to 'next' on 2016-04-29 at 02f13a4)
641
- + match-trees: convert several leaf functions to use struct object_id
642
- + tree-walk: convert tree_entry_extract() to use struct object_id
643
- + struct name_entry: use struct object_id instead of unsigned char sha1[20]
644
- + match-trees: convert shift_tree() and shift_tree_by() to use object_id
645
- + test-match-trees: convert to use struct object_id
646
- + sha1-name: introduce a get_oid() function
647
-
648
- Move from unsigned char[20] to struct object_id continues.
649
-
650
- Will merge to 'master'.
651
-
652
-
638
* ep/http-curl-trace (2016-05-02) 2 commits
639
. imap-send.c: introduce the GIT_TRACE_CURL environment variable
640
. http.c: implement the GIT_TRACE_CURL environment variable
@@ -684,32 +669,23 @@ of the repositories listed at
669
($gmane/292189)
670
671
687
-* bw/rebase-merge-entire-branch (2016-04-24) 1 commit
688
- (merged to 'next' on 2016-04-29 at 7a9487f)
689
- + git-rebase--merge: don't include absent parent as a base
690
-
691
- "git rebase -m" could be asked to rebase an entire branch starting
692
- from the root, but failed by assuming that there always is a parent
693
- commit to the first commit on the branch.
694
-
695
- Will merge to 'master'.
696
-
697
-
698
-* pb/commit-verbose-config (2016-05-02) 7 commits
699
- - t/t7507: tests for broken behavior of status
672
+* pb/commit-verbose-config (2016-05-05) 8 commits
673
+ - SQUASH???
674
- commit: add a commit.verbose config variable
675
- t7507-commit-verbose: improve test coverage by testing number of diffs
676
- parse-options.c: make OPTION_COUNTUP respect "unspecified" values
677
+ - t/t7507: improve test coverage
678
- t0040-parse-options: improve test coverage
679
- test-parse-options: print quiet as integer
680
- t0040-test-parse-options.sh: fix style issues
681
+ (this branch is used by jc/test-parse-options-expect.)
682
683
"git commit" learned to pay attention to "commit.verbose"
684
configuration variable and act as if "--verbose" option was
685
given from the command line.
686
687
Almost there.
712
- ($gmane/293410).
688
+ ($gmane/293663).
689
690
691
* jc/fsck-nul-in-commit (2016-04-14) 2 commits
@@ -736,21 +712,6 @@ of the repositories listed at
712
Will rebase to remove the comment after three-dash line and then merge.
713
714
739
-* jk/diff-compact-heuristic (2016-05-02) 3 commits
740
- (merged to 'next' on 2016-05-02 at 2a74763)
741
- + diff: undocument the compaction heuristic knobs for experimentation
742
- (merged to 'next' on 2016-04-22 at 0c117ea)
743
- + xdiff: implement empty line chunk heuristic
744
- + xdiff: add recs_match helper function
745
- (this branch is tangled with jc/diff-compact-always-use-blank-heuristics.)
746
-
747
- Patch output from "git diff" and friends has been tweaked to be
748
- more readable by using a blank line as a strong hint that the
749
- contents before and after it belong to a logically separate unit.
750
-
751
- Will merge to 'master'.
752
-
753
-
715
* sb/submodule-init (2016-05-03) 7 commits
716
(merged to 'next' on 2016-05-03 at 8a5fce4)
717
+ submodule init: redirect stdout to stderr
@@ -797,18 +758,6 @@ of the repositories listed at
758
Does the lack of response mean lack of interest and support?
759
760
800
-* jc/drop-git-spec-in (2016-04-27) 2 commits
801
- (merged to 'next' on 2016-04-27 at 2b85030)
802
- + Makefile: remove dependency on git.spec
803
- (merged to 'next' on 2016-04-22 at 531583f)
804
- + Makefile: stop pretending to support rpmbuild
805
-
806
- As nobody maintains our in-tree git.spec.in and distros use their
807
- own spec file, we stopped pretending that we support "make rpm".
808
-
809
- Will merge to 'master'.
810
-
811
-
761
* kn/ref-filter-branch-list (2016-04-25) 17 commits
762
- branch: implement '--format' option
763
- branch: use ref-filter printing APIs
@@ -848,29 +797,29 @@ of the repositories listed at
797
($gmane/292622).
798
799
851
-* dt/index-helper (2016-05-02) 19 commits
852
- . untracked-cache: config option
853
- . Add tracing to measure where most of the time is spent
854
- . index-helper: optionally automatically run
855
- . index-helper: autorun mode
856
- . index-helper: don't run if already running
857
- . index-helper: kill mode
858
- . watchman: add a config option to enable the extension
859
- . unpack-trees: preserve index extensions
860
- . update-index: enable/disable watchman support
861
- . index-helper: use watchman to avoid refreshing index with lstat()
862
- . watchman: add support to watchman to reduce refresh cost
863
- . read-cache: add watchman 'WAMA' extension
864
- . index-helper: add --detach
865
- . daemonize(): set a flag before exiting the main process
866
- . index-helper: log warnings
867
- . index-helper: add --strict
868
- . index-helper: new daemon for caching index and related stuff
869
- . read-cache: allow to keep mmap'd memory after reading
870
- . read-cache.c: fix constness of verify_hdr()
800
+* dt/index-helper (2016-05-05) 19 commits
801
+ - untracked-cache: config option
802
+ - trace: measure where most of the time is spent
803
+ - index-helper: optionally automatically run
804
+ - index-helper: autorun mode
805
+ - index-helper: don't run if already running
806
+ - index-helper: kill mode
807
+ - watchman: add a config option to enable the extension
808
+ - unpack-trees: preserve index extensions
809
+ - update-index: enable/disable watchman support
810
+ - index-helper: use watchman to avoid refreshing index with lstat()
811
+ - watchman: add support to watchman to reduce refresh cost
812
+ - read-cache: add watchman 'WAMA' extension
813
+ - index-helper: add --detach
814
+ - daemonize(): set a flag before exiting the main process
815
+ - index-helper: log warnings
816
+ - index-helper: add --strict
817
+ - index-helper: new daemon for caching index and related stuff
818
+ - read-cache: allow to keep mmap'd memory after reading
819
+ - read-cache.c: fix constness of verify_hdr()
820
821
Needs review. Reported to break its own tests.
873
- ($gmane/293461).
822
+ ($gmane/293687).
823
824
825
* jc/bundle (2016-03-03) 6 commits
@@ -896,3 +845,11 @@ of the repositories listed at
845
It has been reported that git-gui still uses the deprecated syntax,
846
which needs to be fixed before this final step can proceed.
847
($gmane/282594)
848
+
849
+--------------------------------------------------
850
+[Discarded]
851
+
852
+* jc/diff-compact-always-use-blank-heuristics (2016-04-29) 1 commit
853
+ . diff: enable "compaction heuristics" and lose experimentation knob
854
+
855
+ Superseded by the tip commit on the jk/diff-compact-heuristic topic.