What's cooking (2014/12 #02)
Junio C Hamano committed
Dec 10, 2014 at 14:35 UTC
5fefbbd09b4cfe0763de31657ecb390d591fd776
1 file changed
+389
-226
whats-cooking.txt
+389
-226
@@ -1,154 +1,254 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2014, #01; Wed, 3)
4
-X-master-at: b260d265e189728b26e50506ac6ffab6a7d588da
5
-X-next-at: a0de725a8ff02c1f2a9452c2234bee819242395c
3
+Subject: What's cooking in git.git (Dec 2014, #02; Wed, 10)
4
+X-master-at: c18b86734113ee2aeb0e140c922c8fbd4accc860
5
+X-next-at: 802437b789eb05ee52be21d578fe4cfed918b276
6
7
-What's cooking in git.git (Dec 2014, #01; Wed, 3)
7
+What's cooking in git.git (Dec 2014, #02; Wed, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-People, coming up with new topics is fine, but please pay attention
15
-to what is going around the area you are touching. Does your topic
16
-applied to either 'master' or 'maint' merge cleanly to 'next' and
17
-'pu'? If not, please coordinate with whoever is working in the same
18
-area.
19
-
14
You can find the changes described here in the integration branches
15
of the repositories listed at
16
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
19
+--------------------------------------------------
20
+[Graduated to "master"]
21
+
22
+* jh/empty-notes (2014-11-14) 9 commits
23
+ (merged to 'next' on 2014-11-18 at 9eeb338)
24
+ + t3301: modernize style
25
+ + notes: empty notes should be shown by 'git log'
26
+ + builtin/notes: add --allow-empty, to allow storing empty notes
27
+ + builtin/notes: split create_note() to clarify add vs. remove logic
28
+ + builtin/notes: simplify early exit code in add()
29
+ + builtin/notes: refactor note file path into struct note_data
30
+ + builtin/notes: improve naming
31
+ + t3301: verify that 'git notes' removes empty notes by default
32
+ + builtin/notes: fix premature failure when trying to add the empty blob
33
+
34
+ A request to store an empty note via "git notes" meant to remove
35
+ note from the object but with --allow-empty we will store a (surprise!)
36
+ note that is empty. In the longer run, we might want to deprecate
37
+ the somewhat unintuitive "emptying means deletion" behaviour.
38
+
39
+
40
+* jk/checkout-from-tree (2014-11-13) 1 commit
41
+ (merged to 'next' on 2014-11-14 at ddbffb0)
42
+ + checkout $tree: do not throw away unchanged index entries
43
+
44
+ "git checkout $treeish $path", when $path in the index and the
45
+ working tree already matched what is in $treeish at the $path,
46
+ still overwrote the $path unnecessarily.
47
+
48
+
49
+* jk/gitweb-with-newer-cgi-multi-param (2014-11-18) 1 commit
50
+ (merged to 'next' on 2014-11-18 at 6ac61fe)
51
+ + gitweb: hack around CGI's list-context param() handling
52
+
53
+ "gitweb" used to depend on a behaviour recent CGI.pm deprecated.
54
+
55
+
56
+* js/windows-open-eisdir-error (2014-11-17) 1 commit
57
+ (merged to 'next' on 2014-11-18 at 57b0d49)
58
+ + Windows: correct detection of EISDIR in mingw_open()
59
+
60
+ open() emulated on Windows platforms did not give EISDIR upon an
61
+ attempt to open a directory for writing.
62
+
63
+
64
+* mh/config-flip-xbit-back-after-checking (2014-11-18) 1 commit
65
+ (merged to 'next' on 2014-11-18 at 45f7d71)
66
+ + create_default_files(): don't set u+x bit on $GIT_DIR/config
67
+ (this branch is used by tb/config-core-filemode-check-on-broken-fs.)
68
+
69
+ "git init" (hence "git clone") initialized the per-repository
70
+ configuration file .git/config with x-bit by mistake.
71
+
72
+
73
+* rs/env-array-in-child-process (2014-11-10) 1 commit
74
+ (merged to 'next' on 2014-11-14 at 3f6ba07)
75
+ + use args member of struct child_process
76
+
77
+ Code cleanup.
78
+
79
+
80
+* rs/maint-config-use-labs (2014-11-17) 1 commit
81
+ (merged to 'next' on 2014-11-18 at 53c2404)
82
+ + use labs() for variables of type long instead of abs()
83
+
84
+ A few code paths used abs() when they should have used labs() on
85
+ long integers.
86
+
87
+
88
+* rs/receive-pack-use-labs (2014-11-17) 1 commit
89
+ (merged to 'next' on 2014-11-18 at c6d2d94)
90
+ + use labs() for variables of type long instead of abs()
91
+
92
+ A few code paths used abs() when they should have used labs() on
93
+ long integers.
94
+
95
+
96
+* sv/get-builtin (2014-11-13) 1 commit
97
+ (merged to 'next' on 2014-11-14 at 9497e17)
98
+ + builtin: move builtin retrieval to get_builtin()
99
+
100
+ Small code consolidation.
101
+
102
+
103
+* tq/git-ssh-command (2014-11-10) 1 commit
104
+ (merged to 'next' on 2014-11-14 at 83f5dae)
105
+ + git_connect: set ssh shell command in GIT_SSH_COMMAND
106
+
107
+ Allow passing extra set of arguments when ssh is invoked to create
108
+ an encrypted & authenticated connection, which is not possible with
109
+ existing GIT_SSH mechanism, which was designed more to match what
110
+ other programs with similar variables did, not necessarily to be
111
+ more useful.
112
+
113
--------------------------------------------------
114
[New Topics]
115
28
-* jc/exec-cmd-system-path-leak-fix (2014-11-30) 1 commit
29
- - system_path(): always return free'able memory to the caller
116
+* dm/compat-s-ifmt-for-zos (2014-12-04) 1 commit
117
+ - compat: convert modes to use portable file type values
118
+
119
+ Long overdue departure from the assumption that S_IFMT is shared by
120
+ everybody made in 2005.
121
31
- The function sometimes returned a non-freeable memory and some
32
- other times returned a piece of memory that must be freed.
122
+
123
+* jk/credential-quit (2014-12-04) 2 commits
124
+ - prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts
125
+ - credential: let helpers tell us to quit
126
+
127
+ Credential helpers are asked in turn until one of them give
128
+ positive response, which is cumbersome to turn off when you need to
129
+ run Git in an automated setting. The credential helper interface
130
+ learned to allow a helper to say "stop, don't ask other helpers."
131
+ Also GIT_TERMINAL_PROMPT environment can be set to false to disable
132
+ our built-in prompt mechanism for passwords.
133
134
Will merge to 'next'.
135
136
37
-* jc/hook-cleanup (2014-12-01) 1 commit
38
- - run-command.c: retire unused run_hook_with_custom_index()
137
+* mg/branch-d-m-f (2014-12-09) 2 commits
138
+ - branch: allow -f with -m and -d
139
+ - t3200-branch: test -M
140
+
141
+ "git branch -d" (delete) and "git branch -m" (move) learned to
142
+ honor "-f" (force) flag; unlike many other subcommands, the way to
143
+ force these have been with separate "-D/-M" options, which was
144
+ inconsistent.
145
146
Will merge to 'next'.
147
148
43
-* jk/push-simple (2014-11-30) 1 commit
44
- - push: truly use "simple" as default, not "upstream"
149
+* mg/doc-check-ignore-tracked-are-not-ignored (2014-12-04) 1 commit
150
+ - check-ignore: clarify treatment of tracked files
151
152
Will merge to 'next'.
153
154
49
-* jn/rerere-fail-on-auto-update-failure (2014-12-03) 2 commits
50
- - SQUASH???
51
- - rerere: error out on autoupdate failure
155
+* rt/completion-tag (2014-12-04) 1 commit
156
+ - completion: add git-tag options
157
158
+ Will merge to 'next'.
159
54
-* js/push-to-deploy (2014-11-30) 2 commits
55
- - t5516: more tests for receive.denyCurrentBranch=updateInstead
56
- - receive-pack: add another option for receive.denyCurrentBranch
57
- (this branch is used by jc/push-to-checkout.)
160
59
- "git push" into a repository with a working tree normally refuses
60
- to modify the branch that is checked out. The command learned to
61
- optionally do an equivalent of "git reset --hard" only when there
62
- is no change to the working tree and the index instead, which would
63
- be useful to "deploy" by pushing into a repository.
161
+* jk/for-each-reflog-ent-reverse (2014-12-05) 2 commits
162
+ - for_each_reflog_ent_reverse: turn leftover check into assertion
163
+ - for_each_reflog_ent_reverse: fix newlines on block boundaries
164
165
Will merge to 'next'.
166
167
68
-* jc/push-to-checkout (2014-12-01) 2 commits
69
- - receive-pack: support push-to-checkout hook
70
- - receive-pack: refactor updateInstead codepath
71
- (this branch uses js/push-to-deploy.)
168
+* po/doc-assume-unchanged (2014-12-09) 2 commits
169
+ - gitignore.txt: do not suggest assume-unchanged
170
+ - doc: make clear --assume-unchanged's user contract
171
73
- Extending the js/push-to-deploy topic, the behaviour of "git push"
74
- when updating the working tree and the index with an update to the
75
- branch that is checked out can be tweaked by push-to-checkout hook.
172
+ Fixes long-standing misunderstanding of what assume-unchanged is
173
+ about. Some text near what is removed by the bottom patch may also
174
+ have to be removed.
175
77
- Needs docs.
176
+ Will merge to 'next'.
177
178
80
-* lh/send-email-hide-x-mailer (2014-12-03) 2 commits
81
- - SQUASH???
82
- - send-email: add --[no-]xmailer option
179
+* tb/t0027-eol-conversion (2014-12-05) 1 commit
180
+ - t0027: check the eol conversion warnings
181
84
- "git send-email" normally identifies itself via X-Mailer: header
85
- in the message it sends out. A new command line flag allows the
86
- header to be squelched.
182
+ Will merge to 'next'.
183
184
89
-* nd/list-files (2014-12-01) 19 commits
90
- - list-files: -M aka diff-cached
91
- - list-files -F: show submodules with the new indicator '&'
92
- - list-files: add -F/--classify
93
- - list-files: show directories as well as files
94
- - list-files: do not show duplicate cached entries
95
- - list-files: sort output and remove duplicates
96
- - list-files: add -t back
97
- - list-files: add -1 short for --no-column
98
- - list-files: add -R/--recursive short for --max-depth=-1
99
- - list-files: -u does not imply showing stages
100
- - list-files: a user friendly version of ls-files and more
101
- - ls-files: support --max-depth
102
- - ls-files: add --column
103
- - ls-files: add --color to highlight file names
104
- - ls-files: buffer full item in strbuf before printing
105
- - ls_colors.c: highlight submodules like directories
106
- - ls_colors.c: add a function to color a file name
107
- - ls_colors.c: parse color.ls.* from config file
108
- - ls_colors.c: add $LS_COLORS parsing code
185
+* jk/always-allow-large-packets (2014-12-10) 1 commit
186
+ - pkt-line: allow writing of LARGE_PACKET_MAX buffers
187
110
- A new "git list-files" Porcelain command, "ls-files" with bells and
111
- whistles.
188
+ Will merge to 'next'.
189
190
114
-* nd/ls-tree-pathspec (2014-12-01) 5 commits
115
- - t3102: style modernization
116
- - t3102: document that ls-tree does not yet support negated pathspec
117
- - ls-tree: disable negative pathspec because it's not supported
118
- - ls-tree: remove path filtering logic in show_tree
119
- - tree.c: update read_tree_recursive callback to pass strbuf as base
191
+* jk/commit-date-approxidate (2014-12-10) 2 commits
192
+ - commit: always populate GIT_AUTHOR_* variables
193
+ - commit: loosen ident checks when generating template
194
121
- "git ls-tree" does not support path selection based on negative
122
- pathspecs, but did not error out when negative pathspecs are given.
195
+ Will merge to 'next'.
196
+
197
+
198
+* jk/read-packed-refs-without-path-max (2014-12-10) 3 commits
199
+ - read_packed_refs: use skip_prefix instead of static array
200
+ - read_packed_refs: pass strbuf to parse_ref_line
201
+ - read_packed_refs: use a strbuf for reading lines
202
203
Will merge to 'next'.
204
205
127
-* rj/t0050-passes (2014-11-30) 1 commit
128
- - t0050-*.sh: mark the rename (case change) test as passing
206
+* jn/dedup-doc-header (2014-12-09) 2 commits
207
+ - put string-list API documentation in one place
208
+ - put strbuf API documentation in one place
209
+
210
+ We would want to have an easy way for developers to learn about
211
+ APIs, and also a way to encourage them to keep the API
212
+ documentation up to date when they make changes. Having header
213
+ comments and API documentation duplicated in two different places
214
+ risked them going out of sync.
215
+
216
+ This removes the duplicates by dropping comments from the header;
217
+ it is just for discussion at this moment.
218
+
219
+
220
+* jn/doc-api-errors (2014-12-04) 1 commit
221
+ - doc: document error handling functions and conventions
222
+
223
+ For discussion.
224
+
225
+
226
+* js/fsck-tag-validation (2014-12-09) 2 commits
227
+ - index-pack: terminate object buffers with NUL
228
+ - fsck: properly bound "invalid tag name" error message
229
+
230
+ Follow-up to tag object format validation added in 2.2.
231
232
Will merge to 'next'.
233
234
133
-* rt/for-each-ref-spell-tcl-as-Tcl (2014-11-30) 1 commit
134
- - for-each-ref: correct spelling of Tcl in option description
235
+* js/test-hashmap-squelch-gcc (2014-12-09) 1 commit
236
+ - test-hashmap: squelch gcc compiler warning
237
238
Will merge to 'next'.
239
240
139
-* sb/ref-transaction-reflog (2014-12-03) 2 commits
140
- - refs.c: rename transaction.updates to transaction.ref_updates
141
- - refs.c: rename the transaction functions
142
- (this branch uses sb/ref-transaction-unify-to-update.)
241
+* ok/rebase-i-count-todo (2014-12-10) 1 commit
242
+ - Show number of TODO items for interactive rebase
243
+
244
+ Will merge to 'next'.
245
144
- Still under review discussion.
246
247
+* rw/apply-does-not-take-ignore-date (2014-12-09) 1 commit
248
+ - git-am.txt: --ignore-date flag is not passed to git-apply
249
147
-* ye/http-accept-language (2014-12-03) 2 commits
148
- - SQUASH???
149
- - http: send Accept-Language header if possible
250
151
- Still under review discussion.
251
+ Will merge to 'next'.
252
253
--------------------------------------------------
254
[Stalled]
@@ -297,12 +397,150 @@ of the repositories listed at
397
--------------------------------------------------
398
[Cooking]
399
300
-* jk/pack-bitmap (2014-11-30) 1 commit
301
- - pack-bitmap: do not use gcc packed attribute
400
+* jc/exec-cmd-system-path-leak-fix (2014-11-30) 1 commit
401
+ - system_path(): always return free'able memory to the caller
402
+
403
+ The function sometimes returned a non-freeable memory and some
404
+ other times returned a piece of memory that must be freed.
405
406
Will merge to 'next'.
407
408
409
+* jc/hook-cleanup (2014-12-01) 1 commit
410
+ (merged to 'next' on 2014-12-04 at 17059f5)
411
+ + run-command.c: retire unused run_hook_with_custom_index()
412
+
413
+ Remove unused code.
414
+
415
+ Will merge to 'master'.
416
+
417
+
418
+* jk/push-simple (2014-11-30) 1 commit
419
+ (merged to 'next' on 2014-12-04 at 00785c7)
420
+ + push: truly use "simple" as default, not "upstream"
421
+
422
+ Git 2.0 was supposed to make the "simple" mode for the default of
423
+ "git push", but it didn't.
424
+
425
+ Will merge to 'master'.
426
+
427
+
428
+* jn/rerere-fail-on-auto-update-failure (2014-12-03) 2 commits
429
+ - SQUASH???
430
+ - rerere: error out on autoupdate failure
431
+
432
+ Will be rerolled as a part of a larger series.
433
+
434
+
435
+* js/push-to-deploy (2014-11-30) 2 commits
436
+ - t5516: more tests for receive.denyCurrentBranch=updateInstead
437
+ - receive-pack: add another option for receive.denyCurrentBranch
438
+ (this branch is used by jc/push-to-checkout.)
439
+
440
+ "git push" into a repository with a working tree normally refuses
441
+ to modify the branch that is checked out. The command learned to
442
+ optionally do an equivalent of "git reset --hard" only when there
443
+ is no change to the working tree and the index instead, which would
444
+ be useful to "deploy" by pushing into a repository.
445
+
446
+ Will merge to 'next'.
447
+
448
+
449
+* jc/push-to-checkout (2014-12-01) 2 commits
450
+ - receive-pack: support push-to-checkout hook
451
+ - receive-pack: refactor updateInstead codepath
452
+ (this branch uses js/push-to-deploy.)
453
+
454
+ Extending the js/push-to-deploy topic, the behaviour of "git push"
455
+ when updating the working tree and the index with an update to the
456
+ branch that is checked out can be tweaked by push-to-checkout hook.
457
+
458
+ Needs docs.
459
+
460
+
461
+* lh/send-email-hide-x-mailer (2014-12-04) 4 commits
462
+ - SQUASH???
463
+ - test/send-email: --[no-]xmailer tests
464
+ - SQUASH???
465
+ - send-email: add --[no-]xmailer option
466
+
467
+ "git send-email" normally identifies itself via X-Mailer: header
468
+ in the message it sends out. A new command line flag allows the
469
+ header to be squelched.
470
+
471
+
472
+* nd/list-files (2014-12-01) 19 commits
473
+ - list-files: -M aka diff-cached
474
+ - list-files -F: show submodules with the new indicator '&'
475
+ - list-files: add -F/--classify
476
+ - list-files: show directories as well as files
477
+ - list-files: do not show duplicate cached entries
478
+ - list-files: sort output and remove duplicates
479
+ - list-files: add -t back
480
+ - list-files: add -1 short for --no-column
481
+ - list-files: add -R/--recursive short for --max-depth=-1
482
+ - list-files: -u does not imply showing stages
483
+ - list-files: a user friendly version of ls-files and more
484
+ - ls-files: support --max-depth
485
+ - ls-files: add --column
486
+ - ls-files: add --color to highlight file names
487
+ - ls-files: buffer full item in strbuf before printing
488
+ - ls_colors.c: highlight submodules like directories
489
+ - ls_colors.c: add a function to color a file name
490
+ - ls_colors.c: parse color.ls.* from config file
491
+ - ls_colors.c: add $LS_COLORS parsing code
492
+
493
+ A new "git list-files" Porcelain command, "ls-files" with bells and
494
+ whistles.
495
+
496
+
497
+* nd/ls-tree-pathspec (2014-12-01) 5 commits
498
+ - t3102: style modernization
499
+ - t3102: document that ls-tree does not yet support negated pathspec
500
+ - ls-tree: disable negative pathspec because it's not supported
501
+ - ls-tree: remove path filtering logic in show_tree
502
+ - tree.c: update read_tree_recursive callback to pass strbuf as base
503
+
504
+ "git ls-tree" does not support path selection based on negative
505
+ pathspecs, but did not error out when negative pathspecs are given.
506
+
507
+ Will merge to 'next'.
508
+
509
+
510
+* rj/t0050-passes (2014-11-30) 1 commit
511
+ - t0050-*.sh: mark the rename (case change) test as passing
512
+
513
+ Will merge to 'next'.
514
+
515
+
516
+* rt/for-each-ref-spell-tcl-as-Tcl (2014-11-30) 1 commit
517
+ - for-each-ref: correct spelling of Tcl in option description
518
+
519
+ Will merge to 'next'.
520
+
521
+
522
+* sb/ref-transaction-reflog (2014-12-03) 2 commits
523
+ - refs.c: rename transaction.updates to transaction.ref_updates
524
+ - refs.c: rename the transaction functions
525
+ (this branch uses sb/ref-transaction-unify-to-update.)
526
+
527
+ Will be rerolled as a part of a larger series.
528
+
529
+
530
+* ye/http-accept-language (2014-12-03) 2 commits
531
+ - SQUASH???
532
+ - http: send Accept-Language header if possible
533
+
534
+ Breaks various people ($gmane/260903).
535
+
536
+
537
+* jk/pack-bitmap (2014-11-30) 1 commit
538
+ (merged to 'next' on 2014-12-04 at eb457ad)
539
+ + pack-bitmap: do not use gcc packed attribute
540
+
541
+ Will merge to 'master'.
542
+
543
+
544
* nd/multiple-work-trees (2014-12-01) 34 commits
545
- git-common-dir: make "modules/" per-working-directory directory
546
- checkout: do not fail if target is an empty directory
@@ -343,62 +581,38 @@ of the repositories listed at
581
rely on symbolic links and make sharing of objects and refs safer
582
by making the borrowee and borrowers aware of each other.
583
346
- A few tests need some tweaks for MinGW ($gmane/{257756,257757}).
347
- Conflicts with rs/ref-transaction so ejected for now, waiting for a
348
- reroll.
349
-
584
585
* jc/unpack-trees-plug-leak (2014-11-17) 1 commit
352
- - unpack_trees: plug leakage of o->result
353
-
354
- Will merge to 'next'.
355
-
356
-
357
-* js/windows-open-eisdir-error (2014-11-17) 1 commit
358
- (merged to 'next' on 2014-11-18 at 57b0d49)
359
- + Windows: correct detection of EISDIR in mingw_open()
586
+ (merged to 'next' on 2014-12-04 at 9f1df30)
587
+ + unpack_trees: plug leakage of o->result
588
589
Will merge to 'master'.
590
591
364
-* rs/maint-config-use-labs (2014-11-17) 1 commit
365
- (merged to 'next' on 2014-11-18 at 53c2404)
366
- + use labs() for variables of type long instead of abs()
367
-
368
- Will merge to 'master'.
369
-
592
+* jk/colors (2014-12-09) 6 commits
593
+ (merged to 'next' on 2014-12-09 at 802437b)
594
+ + parse_color: drop COLOR_BACKGROUND macro
595
+ (merged to 'next' on 2014-12-04 at 8d2e37b)
596
+ + diff-highlight: allow configurable colors
597
+ + parse_color: recognize "no$foo" to clear the $foo attribute
598
+ + parse_color: support 24-bit RGB values
599
+ + parse_color: refactor color storage
600
+ + Merge branch 'jn/parse-config-slot' into jk/colors
601
+ (this branch uses jk/colors-fix.)
602
371
-* rs/receive-pack-use-labs (2014-11-17) 1 commit
372
- (merged to 'next' on 2014-11-18 at c6d2d94)
373
- + use labs() for variables of type long instead of abs()
603
+ "diff-highlight" filter (in contrib/) allows its color output
604
+ to be customized via configuration variables.
605
606
Will merge to 'master'.
607
608
378
-* jk/colors (2014-11-20) 5 commits
379
- - diff-highlight: allow configurable colors
380
- - parse_color: recognize "no$foo" to clear the $foo attribute
381
- - parse_color: support 24-bit RGB values
382
- - parse_color: refactor color storage
383
- - Merge branch 'jn/parse-config-slot' into jk/colors
384
- (this branch uses jk/colors-fix.)
385
-
386
- Will merge to 'next'.
387
-
388
-
609
* jk/colors-fix (2014-11-20) 3 commits
390
- - t4026: test "normal" color
391
- - config: fix parsing of "git config --get-color some.key -1"
392
- - docs: describe ANSI 256-color mode
610
+ (merged to 'next' on 2014-12-04 at 0d97d69)
611
+ + t4026: test "normal" color
612
+ + config: fix parsing of "git config --get-color some.key -1"
613
+ + docs: describe ANSI 256-color mode
614
(this branch is used by jk/colors.)
615
395
- Will merge to 'next'.
396
-
397
-
398
-* jk/gitweb-with-newer-cgi-multi-param (2014-11-18) 1 commit
399
- (merged to 'next' on 2014-11-18 at 6ac61fe)
400
- + gitweb: hack around CGI's list-context param() handling
401
-
616
Will merge to 'master'.
617
618
@@ -409,38 +623,40 @@ of the repositories listed at
623
624
625
* jk/no-perl-tests (2014-11-18) 2 commits
412
- - t960[34]: mark cvsimport tests as requiring perl
413
- - t0090: mark add-interactive test with PERL prerequisite
626
+ (merged to 'next' on 2014-12-04 at f166620)
627
+ + t960[34]: mark cvsimport tests as requiring perl
628
+ + t0090: mark add-interactive test with PERL prerequisite
629
415
- Will merge to 'next'.
630
+ Some tests that depend on perl lacked PERL prerequisite to protect
631
+ them, breaking build with NO_PERL configuration.
632
633
+ Will merge to 'master'.
634
418
-* jk/rebuild-perl-scripts-with-no-perl-seting-change (2014-11-18) 3 commits
419
- - Makefile: have python scripts depend on NO_PYTHON setting
420
- - Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macros
421
- - Makefile: have perl scripts depend on NO_PERL setting
422
-
423
- Will merge to 'next'.
635
636
+* jk/rebuild-perl-scripts-with-no-perl-seting-change (2014-11-18) 3 commits
637
+ (merged to 'next' on 2014-12-04 at 27382d3)
638
+ + Makefile: have python scripts depend on NO_PYTHON setting
639
+ + Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macros
640
+ + Makefile: have perl scripts depend on NO_PERL setting
641
426
-* mh/config-copy-string-from-git-path (2014-11-17) 1 commit
427
- - cmd_config(): make a copy of path obtained from git_path()
642
+ The build procedure did not bother fixing perl and python scripts
643
+ when NO_PERL and NO_PYTHON build-time configuration changed.
644
429
- Will merge to 'next'.
645
+ Will merge to 'master'.
646
647
432
-* mh/config-flip-xbit-back-after-checking (2014-11-18) 1 commit
433
- (merged to 'next' on 2014-11-18 at 45f7d71)
434
- + create_default_files(): don't set u+x bit on $GIT_DIR/config
435
- (this branch is used by tb/config-core-filemode-check-on-broken-fs.)
648
+* mh/config-copy-string-from-git-path (2014-11-17) 1 commit
649
+ (merged to 'next' on 2014-12-04 at 9c9518b)
650
+ + cmd_config(): make a copy of path obtained from git_path()
651
652
Will merge to 'master'.
653
654
655
* po/everyday-doc (2014-11-17) 1 commit
441
- - Documentation: change "gitlink" typo in git-push
656
+ (merged to 'next' on 2014-12-04 at 39d31fb)
657
+ + Documentation: change "gitlink" typo in git-push
658
443
- Will merge to 'next'.
659
+ Will merge to 'master'.
660
661
662
* ps/new-workdir-into-empty-directory (2014-12-03) 1 commit
@@ -450,24 +666,22 @@ of the repositories listed at
666
667
668
* rt/push-recurse-submodule-usage-string (2014-11-18) 1 commit
453
- - builtin/push.c: fix description of --recurse-submodules option
669
+ (merged to 'next' on 2014-12-04 at c43e23c)
670
+ + builtin/push.c: fix description of --recurse-submodules option
671
455
- Will merge to 'next'.
672
+ Will merge to 'master'.
673
674
675
* sb/copy-fd-errno (2014-11-17) 1 commit
676
- copy.c: make copy_fd preserve meaningful errno
677
461
- Jonathan seems to be working in the same area, having a moral
462
- equivalent. Have to drop either this or the other one.
678
+ Will be rerolled as a part of a larger series.
679
680
681
* sb/log-ref-write-fd (2014-11-20) 1 commit
682
- refs.c: add a function to append a reflog entry to a fd
683
468
- Moves a part of function around to add a helper that still only has
469
- one caller. Need to see how this helps in a bigger picture;
470
- conflicts with nd/multiple-work-trees.
684
+ Will be rerolled as a part of a larger series.
685
686
687
* sb/ref-transaction-unify-to-update (2014-11-20) 2 commits
@@ -477,29 +691,34 @@ of the repositories listed at
691
692
Code simplification.
693
480
- Will merge to 'next'.
694
+ Will be rerolled as a part of a larger series.
695
696
483
-* sv/doc-stripspace (2014-11-19) 1 commit
484
- - Documentation/git-stripspace: Update synopsis
697
+* sv/doc-stripspace (2014-12-04) 1 commit
698
+ (merged to 'next' on 2014-12-04 at 32fd559)
699
+ + Documentation/git-stripspace: add synopsis for --comment-lines
700
486
- Will merge to 'next'.
701
+ Will merge to 'master'.
702
703
704
* sv/typofix-apply-error-message (2014-11-17) 1 commit
490
- - apply: fix typo in an error message
705
+ (merged to 'next' on 2014-12-04 at de7547a)
706
+ + apply: fix typo in an error message
707
492
- Will merge to 'next'.
708
+ Will merge to 'master'.
709
710
711
* da/difftool-mergetool-simplify-reporting-status (2014-11-21) 5 commits
496
- - mergetools: stop setting $status in merge_cmd()
497
- - mergetool: simplify conditionals
498
- - difftool--helper: add explicit exit statement
499
- - mergetool--lib: remove use of $status global
500
- - mergetool--lib: remove no-op assignment to $status from setup_user_tool
712
+ (merged to 'next' on 2014-12-04 at c3c329f)
713
+ + mergetools: stop setting $status in merge_cmd()
714
+ + mergetool: simplify conditionals
715
+ + difftool--helper: add explicit exit statement
716
+ + mergetool--lib: remove use of $status global
717
+ + mergetool--lib: remove no-op assignment to $status from setup_user_tool
718
502
- Will merge to 'next'.
719
+ Code simplification.
720
+
721
+ Will merge to 'master'.
722
723
724
* dw/shell-basename-dashdash-before-stripping-leading-dash-from-login (2014-11-25) 1 commit
@@ -581,13 +800,12 @@ of the repositories listed at
800
Will merge to 'next'.
801
802
584
-* sb/string-list (2014-11-30) 4 commits
803
+* sb/string-list (2014-12-04) 3 commits
804
- string_list: remove string_list_insert_at_index() from its API
586
- - SQUASH???
805
- mailmap: use higher level string list functions
806
- string_list: document string_list_(insert,lookup)
807
590
- Will merge to 'next' after squashing the fixup.
808
+ Will merge to 'next'.
809
810
811
* sb/write-sha1-update-reflog (2014-11-24) 1 commit
@@ -599,7 +817,6 @@ of the repositories listed at
817
818
* tb/config-core-filemode-check-on-broken-fs (2014-11-21) 1 commit
819
- init-db: improve the filemode trustability check
602
- (this branch uses mh/config-flip-xbit-back-after-checking.)
820
821
Will merge to 'next'.
822
@@ -622,13 +839,6 @@ of the repositories listed at
839
Will cook in 'next'.
840
841
625
-* jk/checkout-from-tree (2014-11-13) 1 commit
626
- (merged to 'next' on 2014-11-14 at ddbffb0)
627
- + checkout $tree: do not throw away unchanged index entries
628
-
629
- Will merge to 'master'.
630
-
631
-
842
* mb/enable-lib-terminal-test-on-newer-darwin (2014-11-14) 1 commit
843
(merged to 'next' on 2014-11-14 at b2aae27)
844
+ t/lib-terminal: allow TTY tests to run under recent Mac OS
@@ -636,13 +846,6 @@ of the repositories listed at
846
We probably should drop this ($gmane/259609).
847
848
639
-* sv/get-builtin (2014-11-13) 1 commit
640
- (merged to 'next' on 2014-11-14 at 9497e17)
641
- + builtin: move builtin retrieval to get_builtin()
642
-
643
- Will merge to 'master'.
644
-
645
-
849
* br/imap-send-verbosity (2014-11-05) 1 commit
850
(merged to 'next' on 2014-11-12 at d9e58ec)
851
+ imap-send: use parse options API to determine verbosity
@@ -669,26 +872,6 @@ of the repositories listed at
872
Will merge to 'next'.
873
874
672
-* rs/env-array-in-child-process (2014-11-10) 1 commit
673
- (merged to 'next' on 2014-11-14 at 3f6ba07)
674
- + use args member of struct child_process
675
-
676
- Will merge to 'master'.
677
-
678
-
679
-* tq/git-ssh-command (2014-11-10) 1 commit
680
- (merged to 'next' on 2014-11-14 at 83f5dae)
681
- + git_connect: set ssh shell command in GIT_SSH_COMMAND
682
-
683
- Allow passing extra set of arguments when ssh is invoked to create
684
- an encrypted & authenticated connection, which is not possible with
685
- existing GIT_SSH mechanism, which was designed more to match what
686
- other programs with similar variables did, not necessarily to be
687
- more useful.
688
-
689
- Will merge to 'master'.
690
-
691
-
875
* nd/lockfile-absolute (2014-11-03) 1 commit
876
(merged to 'next' on 2014-11-06 at 68722a9)
877
+ lockfile.c: store absolute path
@@ -699,26 +882,6 @@ of the repositories listed at
882
Will cook in 'next'.
883
884
702
-* jh/empty-notes (2014-11-14) 9 commits
703
- (merged to 'next' on 2014-11-18 at 9eeb338)
704
- + t3301: modernize style
705
- + notes: empty notes should be shown by 'git log'
706
- + builtin/notes: add --allow-empty, to allow storing empty notes
707
- + builtin/notes: split create_note() to clarify add vs. remove logic
708
- + builtin/notes: simplify early exit code in add()
709
- + builtin/notes: refactor note file path into struct note_data
710
- + builtin/notes: improve naming
711
- + t3301: verify that 'git notes' removes empty notes by default
712
- + builtin/notes: fix premature failure when trying to add the empty blob
713
-
714
- A request to store an empty note via "git notes" meant to remove
715
- note from the object but with --allow-empty we will store a (surprise!)
716
- note that is empty. In the longer run, we might want to deprecate
717
- the somewhat unintuitive "emptying means deletion" behaviour.
718
-
719
- Will merge to 'master'.
720
-
721
-
885
* jc/merge-bases (2014-10-30) 2 commits
886
(merged to 'next' on 2014-11-06 at 491e576)
887
+ get_merge_bases(): always clean-up object flags