What's cooking (2016/07 #01)
Junio C Hamano committed
Jul 1, 2016 at 16:46 UTC
121758b726044f5954c9d295615abcf5971536d6
1 file changed
+167
-126
whats-cooking.txt
+167
-126
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2016, #10; Wed, 29)
3
+Subject: What's cooking in git.git (Jul 2016, #01; Fri, 1)
4
X-master-at: cf4c2cfe52be5bd973a4838f73a35d3959ce2f43
5
-X-next-at: 9717e00580637967d08d52f0b50bbe27721a2120
5
+X-next-at: fa5e50e3639a0a6cbe9c3df13ce7aa2e6f3a4fcb
6
7
-What's cooking in git.git (Jun 2016, #10; Wed, 29)
7
+What's cooking in git.git (Jul 2016, #01; Fri, 1)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -23,117 +23,37 @@ of the repositories listed at
23
--------------------------------------------------
24
[New Topics]
25
26
-* cc/apply-am (2016-06-28) 41 commits
27
- - apply: use error_errno() where possible
28
- - builtin/am: use apply api in run_apply()
29
- - apply: change error_routine when be_silent is set
30
- - usage: add get_error_routine() and get_warn_routine()
31
- - usage: add set_warn_routine()
32
- - apply: don't print on stdout when be_silent is set
33
- - apply: make 'be_silent' incompatible with 'apply_verbosely'
34
- - apply: add 'be_silent' variable to 'struct apply_state'
35
- - write_or_die: use warning() instead of fprintf(stderr, ...)
36
- - environment: add set_index_file()
37
- - apply: make some parsing functions static again
38
- - apply: move libified code from builtin/apply.c to apply.{c,h}
39
- - apply: rename and move opt constants to apply.h
40
- - builtin/apply: rename option parsing functions
41
- - builtin/apply: make create_one_file() return -1 on error
42
- - builtin/apply: make try_create_file() return -1 on error
43
- - builtin/apply: make write_out_results() return -1 on error
44
- - builtin/apply: make write_out_one_result() return -1 on error
45
- - builtin/apply: make create_file() return -1 on error
46
- - builtin/apply: make add_index_file() return -1 on error
47
- - builtin/apply: make add_conflicted_stages_file() return -1 on error
48
- - builtin/apply: make remove_file() return -1 on error
49
- - builtin/apply: make build_fake_ancestor() return -1 on error
50
- - builtin/apply: change die_on_unsafe_path() to check_unsafe_path()
51
- - builtin/apply: make gitdiff_*() return -1 on error
52
- - builtin/apply: make gitdiff_*() return 1 at end of header
53
- - builtin/apply: make parse_traditional_patch() return -1 on error
54
- - builtin/apply: make apply_all_patches() return 128 or 1 on error
55
- - builtin/apply: move check_apply_state() to apply.c
56
- - builtin/apply: make check_apply_state() return -1 instead of die()ing
57
- - apply: make init_apply_state() return -1 instead of exit()ing
58
- - builtin/apply: move init_apply_state() to apply.c
59
- - builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ing
60
- - builtin/apply: make parse_whitespace_option() return -1 instead of die()ing
61
- - builtin/apply: make parse_single_patch() return -1 on error
62
- - builtin/apply: make parse_chunk() return a negative integer on error
63
- - builtin/apply: make find_header() return -128 instead of die()ing
64
- - builtin/apply: read_patch_file() return -1 instead of die()ing
65
- - builtin/apply: make apply_patch() return -1 or -128 instead of die()ing
66
- - apply: move 'struct apply_state' to apply.h
67
- - apply: make some names more specific
68
-
69
- "git am" has been taught to make an internal call to "git apply"'s
70
- innards without spawning the latter as a separate process.
71
-
72
- Needs review.
73
-
74
-
75
-* dp/autoconf-curl-ssl (2016-06-28) 1 commit
76
- - ./configure.ac: detect SSL in libcurl using curl-config
77
-
78
- The ./configure script generated from configure.ac was taught how
79
- to detect support of SSL by libcurl better.
80
-
81
- Needs review.
82
-
83
-
84
-* js/color-on-windows-comment (2016-06-28) 1 commit
85
- (merged to 'next' on 2016-06-28 at 38a2ea1)
86
- + color.h: remove obsolete comment about limitations on Windows
87
-
88
- For a long time, we carried an in-code comment that said our
89
- colored output would work only when we use fprintf/fputs on
90
- Windows, which no longer is the case for the past few years.
91
-
92
- Will merge to 'master'.
93
-
94
-
95
-* js/sign-empty-commit-fix (2016-06-29) 1 commit
96
- - commit -S: avoid invalid pointer with empty message
97
-
98
- "git commit --amend --allow-empty-message -S" for a commit without
99
- any message body could have misidentified where the header of the
100
- commit object ends.
101
-
102
- Will merge to 'next'.
103
-
104
-
105
-* js/t3404-grammo-fix (2016-06-29) 1 commit
106
- - t3404: fix a grammo (commands are ran -> commands are run)
107
-
108
- Will merge to 'next'.
109
-
110
-
111
-* ls/p4-tmp-refs (2016-06-29) 1 commit
112
- - git-p4: place temporary refs used for branch import under refs/git-p4-tmp
26
+* jk/common-main (2016-07-01) 1 commit
27
+ - Merge branch 'jk/common-main-2.8' into jk/common-main
28
+ (this branch uses jk/common-main-2.8.)
29
114
- "git p4" used a location outside $GIT_DIR/refs/ to place its
115
- temporary branches, which has been moved to refs/git-p4-tmp/.
30
117
- Needs an ack from "git p4" experts.
31
+* jk/common-main-2.8 (2016-07-01) 5 commits
32
+ - common-main: call git_setup_gettext()
33
+ - common-main: call restore_sigpipe_to_default()
34
+ - common-main: call sanitize_stdfds()
35
+ - common-main: call git_extract_argv0_path()
36
+ - add an extra level of indirection to main()
37
+ (this branch is used by jk/common-main.)
38
39
+ There are certain house-keeping tasks that need to be performed at
40
+ the very beginning of any Git program, and programs that are not
41
+ built-in commands had to do them exactly the same way as "git"
42
+ potty does. It was easy to make mistakes in one-off standalone
43
+ programs (like test helpers). A common "main()" function that
44
+ calls cmd_main() of individual program has been introduced to
45
+ make it harder to make mistakes.
46
120
-* jc/pull-rebase-ff (2016-06-29) 1 commit
121
- - pull: fast-forward "pull --rebase=true"
47
123
- "git pull --rebase", when there is no new commits on our side since
124
- we forked from the upstream, should be able to fast-forward without
125
- invoking "git rebase", but it didn't.
126
-
127
- Needs a real log message and a few tests.
48
+* nd/ita-cleanup (2016-07-01) 3 commits
49
+ - grep: fix grepping for "intent to add" files
50
+ - t7810-grep.sh: fix a whitespace inconsistency
51
+ - t7810-grep.sh: fix duplicated test name
52
129
-
130
-* ps/rebase-i-auto-unstash-upon-abort (2016-06-29) 1 commit
131
- - rebase -i: restore autostash on abort
132
-
133
- "git rebase -i --autostash" did not restore the auto-stashed change
134
- when the operation was aborted.
135
-
136
- Will merge to 'next'.
53
+ Git does not know what the contents in the index should be for a
54
+ path added with "git add -N" yet, so "git grep --cached" should not
55
+ show hits (or show lack of hits, with -L) in such a path. But we
56
+ did by mistake, which has been corrected.
57
58
--------------------------------------------------
59
[Stalled]
@@ -273,6 +193,119 @@ of the repositories listed at
193
--------------------------------------------------
194
[Cooking]
195
196
+* cc/apply-am (2016-06-28) 41 commits
197
+ - apply: use error_errno() where possible
198
+ - builtin/am: use apply api in run_apply()
199
+ - apply: change error_routine when be_silent is set
200
+ - usage: add get_error_routine() and get_warn_routine()
201
+ - usage: add set_warn_routine()
202
+ - apply: don't print on stdout when be_silent is set
203
+ - apply: make 'be_silent' incompatible with 'apply_verbosely'
204
+ - apply: add 'be_silent' variable to 'struct apply_state'
205
+ - write_or_die: use warning() instead of fprintf(stderr, ...)
206
+ - environment: add set_index_file()
207
+ - apply: make some parsing functions static again
208
+ - apply: move libified code from builtin/apply.c to apply.{c,h}
209
+ - apply: rename and move opt constants to apply.h
210
+ - builtin/apply: rename option parsing functions
211
+ - builtin/apply: make create_one_file() return -1 on error
212
+ - builtin/apply: make try_create_file() return -1 on error
213
+ - builtin/apply: make write_out_results() return -1 on error
214
+ - builtin/apply: make write_out_one_result() return -1 on error
215
+ - builtin/apply: make create_file() return -1 on error
216
+ - builtin/apply: make add_index_file() return -1 on error
217
+ - builtin/apply: make add_conflicted_stages_file() return -1 on error
218
+ - builtin/apply: make remove_file() return -1 on error
219
+ - builtin/apply: make build_fake_ancestor() return -1 on error
220
+ - builtin/apply: change die_on_unsafe_path() to check_unsafe_path()
221
+ - builtin/apply: make gitdiff_*() return -1 on error
222
+ - builtin/apply: make gitdiff_*() return 1 at end of header
223
+ - builtin/apply: make parse_traditional_patch() return -1 on error
224
+ - builtin/apply: make apply_all_patches() return 128 or 1 on error
225
+ - builtin/apply: move check_apply_state() to apply.c
226
+ - builtin/apply: make check_apply_state() return -1 instead of die()ing
227
+ - apply: make init_apply_state() return -1 instead of exit()ing
228
+ - builtin/apply: move init_apply_state() to apply.c
229
+ - builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ing
230
+ - builtin/apply: make parse_whitespace_option() return -1 instead of die()ing
231
+ - builtin/apply: make parse_single_patch() return -1 on error
232
+ - builtin/apply: make parse_chunk() return a negative integer on error
233
+ - builtin/apply: make find_header() return -128 instead of die()ing
234
+ - builtin/apply: read_patch_file() return -1 instead of die()ing
235
+ - builtin/apply: make apply_patch() return -1 or -128 instead of die()ing
236
+ - apply: move 'struct apply_state' to apply.h
237
+ - apply: make some names more specific
238
+
239
+ "git am" has been taught to make an internal call to "git apply"'s
240
+ innards without spawning the latter as a separate process.
241
+
242
+ Needs review.
243
+
244
+
245
+* dp/autoconf-curl-ssl (2016-06-28) 1 commit
246
+ - ./configure.ac: detect SSL in libcurl using curl-config
247
+
248
+ The ./configure script generated from configure.ac was taught how
249
+ to detect support of SSL by libcurl better.
250
+
251
+ Needs review.
252
+
253
+
254
+* js/color-on-windows-comment (2016-06-28) 1 commit
255
+ (merged to 'next' on 2016-06-28 at 38a2ea1)
256
+ + color.h: remove obsolete comment about limitations on Windows
257
+
258
+ For a long time, we carried an in-code comment that said our
259
+ colored output would work only when we use fprintf/fputs on
260
+ Windows, which no longer is the case for the past few years.
261
+
262
+ Will merge to 'master'.
263
+
264
+
265
+* js/sign-empty-commit-fix (2016-06-29) 1 commit
266
+ - commit -S: avoid invalid pointer with empty message
267
+
268
+ "git commit --amend --allow-empty-message -S" for a commit without
269
+ any message body could have misidentified where the header of the
270
+ commit object ends.
271
+
272
+ Will merge to 'next'.
273
+
274
+
275
+* js/t3404-grammo-fix (2016-06-29) 1 commit
276
+ - t3404: fix a grammo (commands are ran -> commands are run)
277
+
278
+ Will merge to 'next'.
279
+
280
+
281
+* ls/p4-tmp-refs (2016-06-29) 1 commit
282
+ - git-p4: place temporary refs used for branch import under refs/git-p4-tmp
283
+
284
+ "git p4" used a location outside $GIT_DIR/refs/ to place its
285
+ temporary branches, which has been moved to refs/git-p4-tmp/.
286
+
287
+ Needs an ack from "git p4" experts.
288
+
289
+
290
+* jc/pull-rebase-ff (2016-06-29) 1 commit
291
+ - pull: fast-forward "pull --rebase=true"
292
+
293
+ "git pull --rebase", when there is no new commits on our side since
294
+ we forked from the upstream, should be able to fast-forward without
295
+ invoking "git rebase", but it didn't.
296
+
297
+ Needs a real log message and a few tests.
298
+
299
+
300
+* ps/rebase-i-auto-unstash-upon-abort (2016-06-29) 1 commit
301
+ - rebase -i: restore autostash on abort
302
+
303
+ "git rebase -i --autostash" did not restore the auto-stashed change
304
+ when the operation was aborted.
305
+
306
+ Will merge to 'next'.
307
+
308
+
309
* dg/subtree-rebase-test (2016-06-28) 1 commit
310
- contrib/subtree: Add a test for subtree rebase that loses commits
311
@@ -328,12 +361,19 @@ of the repositories listed at
361
Will merge to 'next'.
362
363
331
-* po/range-doc (2016-06-27) 3 commits
364
+* po/range-doc (2016-07-01) 3 commits
365
- doc: give headings for the two and three dot notations
366
- doc: show the actual left, right, and boundary marks
367
- doc: use 'symmetric difference' consistently
368
336
- Expecting a reroll.
369
+ Clarify various ways to specify the "revision ranges" in the
370
+ documentation.
371
+
372
+ Will hold.
373
+
374
+ There is another one that tries to clarify r1..r2 excludes r1
375
+ itself, which is not queued here waiting for the conclusion of a
376
+ review discussion. Otherwise looked good.
377
378
379
* sb/submodule-parallel-fetch (2016-06-27) 2 commits
@@ -488,8 +528,7 @@ of the repositories listed at
528
Will merge to 'master'.
529
530
491
-* nd/icase (2016-06-27) 13 commits
492
- - SQUASH???
531
+* nd/icase (2016-07-01) 12 commits
532
- grep.c: reuse "icase" variable
533
- diffcore-pickaxe: support case insensitive match on non-ascii
534
- diffcore-pickaxe: Add regcomp_or_die()
@@ -506,7 +545,7 @@ of the repositories listed at
545
"git grep -i" has been taught to fold case in non-ascii locales
546
correctly.
547
509
- Modulo minor possible nits, this round looked mostly sensible.
548
+ Will merge to 'next'.
549
550
551
* mj/log-show-signature-conf (2016-06-24) 3 commits
@@ -592,8 +631,8 @@ of the repositories listed at
631
The ref-store abstraction was introduced to the refs API so that we
632
can plug in different backends to store references.
633
595
- Is everybody happy with this version?
596
- If so, will merge to 'next'.
634
+ Needs a fixup.
635
+ ($gmane/298137)
636
637
638
* mh/update-ref-errors (2016-06-20) 6 commits
@@ -731,16 +770,18 @@ of the repositories listed at
770
Will merge to 'master'.
771
772
734
-* jk/big-and-future-archive-tar (2016-06-21) 2 commits
773
+* jk/big-and-future-archive-tar (2016-07-01) 5 commits
774
+ - archive-tar: drop return value
775
- archive-tar: write extended headers for far-future mtime
776
- archive-tar: write extended headers for file sizes >= 8GB
777
+ - t5000: test tar files that overflow ustar headers
778
+ - t9300: factor out portable "head -c" replacement
779
780
"git archive" learned to handle files that are larger than 8GB and
781
commits far in the future than expressible by the traditional US-TAR
782
format.
783
742
- Expecting a reroll.
743
- ($gmane/298119)
784
+ Will merge to 'next'.
785
786
787
* jk/gpg-interface-cleanup (2016-06-17) 7 commits
@@ -827,15 +868,13 @@ of the repositories listed at
868
Will merge to 'master'.
869
870
830
-* lf/recv-sideband-cleanup (2016-06-29) 2 commits
831
- - SQUASH???
871
+* lf/recv-sideband-cleanup (2016-07-01) 1 commit
872
- sideband.c: refactor recv_sideband()
873
874
Code simplification. It however seems to add unnecessary trailing
875
output in some cases.
876
837
- Queued with fixup from Nico.
838
- Waiting for response from Lukas.
877
+ Will merge to 'next'.
878
879
880
* nd/test-lib-httpd-show-error-log-in-verbose (2016-06-13) 1 commit
@@ -1014,7 +1053,9 @@ of the repositories listed at
1053
Comments?
1054
1055
1017
-* va/i18n-even-more (2016-06-17) 38 commits
1056
+* va/i18n-even-more (2016-07-01) 39 commits
1057
+ (merged to 'next' on 2016-07-01 at fa5e50e3)
1058
+ + t5541: become resilient to GETTEXT_POISON
1059
(merged to 'next' on 2016-06-28 at 5919dfa)
1060
+ i18n: branch: mark comment when editing branch description for translation
1061
+ i18n: unmark die messages for translation
@@ -1064,9 +1105,10 @@ of the repositories listed at
1105
Will merge to 'master'.
1106
1107
1067
-* nd/worktree-lock (2016-06-13) 6 commits
1108
+* nd/worktree-lock (2016-07-01) 7 commits
1109
- worktree.c: find_worktree() search by path suffix
1110
- worktree: add "unlock" command
1111
+ - fixup! worktree: add "lock" command
1112
- worktree: add "lock" command
1113
- worktree.c: add is_worktree_locked()
1114
- worktree.c: add is_main_worktree()
@@ -1078,8 +1120,7 @@ of the repositories listed at
1120
command learned a dedicated command pair to create and remoev such
1121
a file, so that the users do not have to do this with editor.
1122
1081
- Is everybody happy with this version?
1082
- If so, will merge to 'next'.
1123
+ Need to squash one fixup before merging to 'next'.
1124
1125
1126
* jk/upload-pack-hook (2016-06-02) 7 commits