What's cooking (2014/12 #01)
Junio C Hamano committed
Dec 3, 2014 at 12:59 UTC
5d91b73d120f78a6cad50e73c50f40b806585677
1 file changed
+406
-254
whats-cooking.txt
+406
-254
@@ -1,20 +1,21 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2014, #04; Wed, 26)
3
+Subject: What's cooking in git.git (Dec 2014, #01; Wed, 3)
4
X-master-at: b260d265e189728b26e50506ac6ffab6a7d588da
5
X-next-at: a0de725a8ff02c1f2a9452c2234bee819242395c
6
7
-What's cooking in git.git (Nov 2014, #04; Wed, 26)
7
+What's cooking in git.git (Dec 2014, #01; Wed, 3)
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
-I haven't had time to write comments (they are essentially release
15
-notes entries to be used when/if the topic graduates to 'master')
16
-for new topics, but I am pushing this out to show the current state
17
-of affairs.
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
20
You can find the changes described here in the integration branches
21
of the repositories listed at
@@ -22,74 +23,357 @@ of the repositories listed at
23
http://git-blame.blogspot.com/p/git-public-repositories.html
24
25
--------------------------------------------------
25
-[Graduated to "master"]
26
+[New Topics]
27
27
-* cc/interpret-trailers (2014-11-10) 2 commits
28
- (merged to 'next' on 2014-11-14 at fa0ccc6)
29
- + trailer: display a trailer without its trailing newline
30
- + trailer: ignore comment lines inside the trailers
31
- (this branch is used by cc/interpret-trailers-more.)
28
+* jc/exec-cmd-system-path-leak-fix (2014-11-30) 1 commit
29
+ - system_path(): always return free'able memory to the caller
30
+
31
+ The function sometimes returned a non-freeable memory and some
32
+ other times returned a piece of memory that must be freed.
33
+
34
+ Will merge to 'next'.
35
+
36
+
37
+* jc/hook-cleanup (2014-12-01) 1 commit
38
+ - run-command.c: retire unused run_hook_with_custom_index()
39
+
40
+ Will merge to 'next'.
41
+
42
+
43
+* jk/push-simple (2014-11-30) 1 commit
44
+ - push: truly use "simple" as default, not "upstream"
45
+
46
+ Will merge to 'next'.
47
+
48
+
49
+* jn/rerere-fail-on-auto-update-failure (2014-12-03) 2 commits
50
+ - SQUASH???
51
+ - rerere: error out on autoupdate failure
52
+
53
+
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.)
58
+
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.
64
+
65
+ Will merge to 'next'.
66
+
67
+
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.)
72
+
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.
76
+
77
+ Needs docs.
78
+
79
+
80
+* lh/send-email-hide-x-mailer (2014-12-03) 2 commits
81
+ - SQUASH???
82
+ - send-email: add --[no-]xmailer option
83
+
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.
87
+
88
+
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
109
33
- Small fixes to a new experimental command already in 'master'.
110
+ A new "git list-files" Porcelain command, "ls-files" with bells and
111
+ whistles.
112
113
36
-* da/difftool (2014-11-14) 1 commit
37
- (merged to 'next' on 2014-11-17 at 231f559)
38
- + difftool: honor --trust-exit-code for builtin tools
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
120
40
- Fix-up to a new feature in 'master'.
121
+ "git ls-tree" does not support path selection based on negative
122
+ pathspecs, but did not error out when negative pathspecs are given.
123
124
+ Will merge to 'next'.
125
43
-* jc/doc-commit-only (2014-11-07) 1 commit
44
- (merged to 'next' on 2014-11-14 at 29c70d2)
45
- + Documentation/git-commit: clarify that --only/--include records the working tree contents
126
127
+* rj/t0050-passes (2014-11-30) 1 commit
128
+ - t0050-*.sh: mark the rename (case change) test as passing
129
48
-* mh/doc-remote-helper-xref (2014-11-11) 1 commit
49
- (merged to 'next' on 2014-11-14 at a7f6230)
50
- + doc: add some crossrefs between manual pages
130
+ Will merge to 'next'.
131
132
53
-* sn/tutorial-status-output-example (2014-11-13) 1 commit
54
- (merged to 'next' on 2014-11-14 at 0fe4930)
55
- + gittutorial: fix output of 'git status'
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
135
136
+ Will merge to 'next'.
137
58
-* sv/submitting-final-patch (2014-11-13) 1 commit
59
- (merged to 'next' on 2014-11-14 at 9e1220f)
60
- + SubmittingPatches: final submission is To: maintainer and CC: list
138
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.)
143
63
-* ta/tutorial-modernize (2014-11-11) 1 commit
64
- (merged to 'next' on 2014-11-14 at c45f0ac)
65
- + gittutorial.txt: remove reference to ancient Git version
144
+ Still under review discussion.
145
146
68
-* tb/no-relative-file-url (2014-11-13) 1 commit
69
- (merged to 'next' on 2014-11-14 at 96e9227)
70
- + t5705: the file:// URL should be absolute
147
+* ye/http-accept-language (2014-12-03) 2 commits
148
+ - SQUASH???
149
+ - http: send Accept-Language header if possible
150
+
151
+ Still under review discussion.
152
153
--------------------------------------------------
73
-[New Topics]
154
+[Stalled]
155
+
156
+* ms/submodule-update-config-doc (2014-11-03) 1 commit
157
+ - submodule: clarify documentation for update subcommand
158
+
159
+ Needs a reroll ($gmane/259037).
160
+
161
+
162
+* je/quiltimport-no-fuzz (2014-10-21) 2 commits
163
+ - git-quiltimport: flip the default not to allow fuzz
164
+ - git-quiltimport.sh: allow declining fuzz with --exact option
165
+
166
+ "quiltimport" drove "git apply" always with -C1 option to reduce
167
+ context of the patch in order to give more chance to somewhat stale
168
+ patches to apply. Add an "--exact" option to disable, and also
169
+ "-C$n" option to customize this behaviour. The top patch
170
+ optionally flips the default to "--exact".
171
+
172
+ Tired of waiting for an Ack; will discard.
173
+
174
+
175
+* jc/push-cert-hmac-optim (2014-09-25) 2 commits
176
+ - receive-pack: truncate hmac early and convert only necessary bytes
177
+ - sha1_to_hex: split out "hex-format n bytes" helper and use it
178
+
179
+ This is "we could do this if we wanted to", not "we measured and it
180
+ improves performance critical codepath".
181
+
182
+ Will perhaps drop.
183
+
184
+
185
+* mt/patch-id-stable (2014-06-10) 1 commit
186
+ - patch-id: change default to stable
187
+
188
+ Teaches "git patch-id" to compute the patch ID that does not change
189
+ when the files in a single patch is reordered. As this new algorithm
190
+ is backward incompatible, the last bit to flip it to be the default
191
+ is left out of 'master' for now.
192
+
193
+ Nobody seems to be jumping up & down requesting this last step,
194
+ which makes the result somewhat backward incompatible.
195
+ Will perhaps drop.
196
+
197
+
198
+* tr/remerge-diff (2014-11-10) 9 commits
199
+ - t4213: avoid "|" in sed regexp
200
+ - log --remerge-diff: show what the conflict resolution changed
201
+ - name-hash: allow dir hashing even when !ignore_case
202
+ - merge-recursive: allow storing conflict hunks in index
203
+ - merge_diff_mode: fold all merge diff variants into an enum
204
+ - combine-diff: do not pass revs->dense_combined_merges redundantly
205
+ - merge-recursive: -Xindex-only to leave worktree unchanged
206
+ - merge-recursive: internal flag to avoid touching the worktree
207
+ - merge-recursive: remove dead conditional in update_stages()
208
+
209
+ "log -p" output learns a new way to let users inspect a merge
210
+ commit by showing the differences between the automerged result
211
+ with conflicts the person who recorded the merge would have seen
212
+ and the final conflict resolution that was recorded in the merge.
213
+
214
+ Waiting for a reroll ($gmane/256591).
215
+
216
+
217
+* hv/submodule-config (2014-11-11) 4 commits
218
+ - do not die on error of parsing fetchrecursesubmodules option
219
+ - use new config API for worktree configurations of submodules
220
+ - extract functions for submodule config set and lookup
221
+ - implement submodule config cache for lookup of submodule names
222
+
223
+ Kicked back to 'pu' per request ($gmane/255610).
224
+
225
+
226
+* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
227
+ - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
228
+ - git-add--interactive: Preserve diff heading when splitting hunks
229
+
230
+ Waiting for a reroll.
231
+
232
+
233
+* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
234
+ - gitweb: Harden UTF-8 handling in generated links
235
+
236
+ $gmane/250758?
237
+
238
+
239
+* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
240
+ - userdiff: support Java try keyword
241
+ - userdiff: support C# async methods and correct C# keywords
242
+
243
+ Reviews sent; waiting for a response.
244
+
245
+
246
+* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
247
+ - git-rebase: print name of rev when using shorthand
248
+
249
+ Teach "git rebase -" to report the concrete name of the branch
250
+ (i.e. the previous one).
251
+
252
+ But it stops short and does not do the same for "git rebase @{-1}".
253
+ Expecting a reroll.
254
+
255
+
256
+* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
257
+ - merge: drop unused arg from abort_commit method signature
258
+ - merge: make prepare_to_commit responsible for write_merge_state
259
+ - t7505: ensure cleanup after hook blocks merge
260
+ - t7505: add missing &&
261
+
262
+ Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
263
+ run during "git merge". The log message stresses too much on one
264
+ hook, prepare-commit-msg, but it would equally apply to other hooks
265
+ like post-merge, I think.
266
+
267
+ Waiting for a reroll.
268
+
269
+
270
+* jc/graph-post-root-gap (2013-12-30) 3 commits
271
+ - WIP: document what we want at the end
272
+ - graph: remove unused code a bit
273
+ - graph: stuff the current commit into graph->columns[]
274
+
275
+ This was primarily a RFH ($gmane/239580).
276
+
277
+
278
+* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
279
+ - perf-lib: add test_perf_cleanup target
280
+ - perf-lib: split starting the test from the execution
281
+
282
+ Add test_perf_cleanup shell function to the perf suite, that allows
283
+ the script writers to define a test with a clean-up action.
284
+
285
+ Will hold.
286
+
287
+
288
+* jc/show-branch (2014-03-24) 5 commits
289
+ - show-branch: use commit slab to represent bitflags of arbitrary width
290
+ - show-branch.c: remove "all_mask"
291
+ - show-branch.c: abstract out "flags" operation
292
+ - show-branch.c: lift all_mask/all_revs to a global static
293
+ - show-branch.c: update comment style
294
+
295
+ Waiting for the final step to lift the hard-limit before sending it out.
296
+
297
+--------------------------------------------------
298
+[Cooking]
299
+
300
+* jk/pack-bitmap (2014-11-30) 1 commit
301
+ - pack-bitmap: do not use gcc packed attribute
302
+
303
+ Will merge to 'next'.
304
+
305
+
306
+* nd/multiple-work-trees (2014-12-01) 34 commits
307
+ - git-common-dir: make "modules/" per-working-directory directory
308
+ - checkout: do not fail if target is an empty directory
309
+ - t2025: add a test to make sure grafts is working from a linked checkout
310
+ - checkout: don't require a work tree when checking out into a new one
311
+ - git_path(): keep "info/sparse-checkout" per work-tree
312
+ - count-objects: report unused files in $GIT_DIR/worktrees/...
313
+ - gc: support prune --worktrees
314
+ - gc: factor out gc.pruneexpire parsing code
315
+ - gc: style change -- no SP before closing parenthesis
316
+ - checkout: clean up half-prepared directories in --to mode
317
+ - checkout: reject if the branch is already checked out elsewhere
318
+ - prune: strategies for linked checkouts
319
+ - checkout: support checking out into a new working directory
320
+ - use new wrapper write_file() for simple file writing
321
+ - wrapper.c: wrapper to open a file, fprintf then close
322
+ - setup.c: support multi-checkout repo setup
323
+ - setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
324
+ - setup.c: convert check_repository_format_gently to use strbuf
325
+ - setup.c: detect $GIT_COMMON_DIR in is_git_directory()
326
+ - setup.c: convert is_git_directory() to use strbuf
327
+ - git-stash: avoid hardcoding $GIT_DIR/logs/....
328
+ - *.sh: avoid hardcoding $GIT_DIR/hooks/...
329
+ - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
330
+ - $GIT_COMMON_DIR: a new environment variable
331
+ - commit: use SEQ_DIR instead of hardcoding "sequencer"
332
+ - fast-import: use git_path() for accessing .git dir instead of get_git_dir()
333
+ - reflog: avoid constructing .lock path with git_path
334
+ - *.sh: respect $GIT_INDEX_FILE
335
+ - git_path(): be aware of file relocation in $GIT_DIR
336
+ - path.c: group git_path(), git_pathdup() and strbuf_git_path() together
337
+ - path.c: rename vsnpath() to do_git_path()
338
+ - git_snpath(): retire and replace with strbuf_git_path()
339
+ - path.c: make get_pathname() call sites return const char *
340
+ - path.c: make get_pathname() return strbuf instead of static buffer
341
+
342
+ A replacement for contrib/workdir/git-new-workdir that does not
343
+ rely on symbolic links and make sharing of objects and refs safer
344
+ by making the borrowee and borrowers aware of each other.
345
+
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
+
350
351
* 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()
360
361
+ Will merge to 'master'.
362
+
363
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
+
370
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()
374
375
+ Will merge to 'master'.
376
+
377
378
* jk/colors (2014-11-20) 5 commits
379
- diff-highlight: allow configurable colors
@@ -99,6 +383,8 @@ of the repositories listed at
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
389
* jk/colors-fix (2014-11-20) 3 commits
390
- t4026: test "normal" color
@@ -106,69 +392,105 @@ of the repositories listed at
392
- docs: describe ANSI 256-color mode
393
(this branch is used by jk/colors.)
394
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
402
+ Will merge to 'master'.
403
+
404
405
* jk/lock-ref-sha1-basic-return-errors (2014-11-20) 1 commit
406
- lock_ref_sha1_basic: do not die on locking errors
407
408
+ Will merge to 'next'.
409
+
410
411
* 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
414
415
+ Will merge to 'next'.
416
+
417
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'.
424
+
425
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()
428
429
+ Will merge to 'next'.
430
+
431
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.)
436
437
+ Will merge to 'master'.
438
+
439
440
* po/everyday-doc (2014-11-17) 1 commit
441
- Documentation: change "gitlink" typo in git-push
442
443
+ Will merge to 'next'.
444
+
445
144
-* ps/new-workdir-into-empty-directory (2014-11-20) 1 commit
145
- - git-new-workdir: Don't fail if the target directory is empty
446
+* ps/new-workdir-into-empty-directory (2014-12-03) 1 commit
447
+ - git-new-workdir: don't fail if the target directory is empty
448
+
449
+ Will merge to 'next'.
450
451
452
* rt/push-recurse-submodule-usage-string (2014-11-18) 1 commit
453
- builtin/push.c: fix description of --recurse-submodules option
454
455
+ Will merge to 'next'.
456
+
457
458
* sb/copy-fd-errno (2014-11-17) 1 commit
459
- copy.c: make copy_fd preserve meaningful errno
460
461
+ Jonathan seems to be working in the same area, having a moral
462
+ equivalent. Have to drop either this or the other one.
463
+
464
465
* sb/log-ref-write-fd (2014-11-20) 1 commit
466
- refs.c: add a function to append a reflog entry to a fd
467
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.
471
+
472
473
* sb/ref-transaction-unify-to-update (2014-11-20) 2 commits
474
- refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
475
- refs.c: make ref_transaction_create a wrapper for ref_transaction_update
476
+ (this branch is used by sb/ref-transaction-reflog.)
477
+
478
+ Code simplification.
479
+
480
+ Will merge to 'next'.
481
482
483
* sv/doc-stripspace (2014-11-19) 1 commit
484
- Documentation/git-stripspace: Update synopsis
485
486
+ Will merge to 'next'.
487
+
488
489
* sv/typofix-apply-error-message (2014-11-17) 1 commit
490
- apply: fix typo in an error message
491
492
+ Will merge to 'next'.
493
+
494
495
* da/difftool-mergetool-simplify-reporting-status (2014-11-21) 5 commits
496
- mergetools: stop setting $status in merge_cmd()
@@ -177,15 +499,21 @@ of the repositories listed at
499
- mergetool--lib: remove use of $status global
500
- mergetool--lib: remove no-op assignment to $status from setup_user_tool
501
502
+ Will merge to 'next'.
503
+
504
505
* dw/shell-basename-dashdash-before-stripping-leading-dash-from-login (2014-11-25) 1 commit
506
- git-sh-setup.sh: use dashdash with basename call
507
508
+ Will merge to 'next'.
509
+
510
511
* jc/refer-to-t-readme-from-submitting-patches (2014-11-24) 2 commits
512
- t/README: justify why "! grep foo" is sufficient
513
- SubmittingPatches: refer to t/README for tests
514
515
+ Will merge to 'next'.
516
+
517
518
* jc/t9001-modernise (2014-11-25) 5 commits
519
- t9001: style modernisation phase #5
@@ -199,14 +527,20 @@ of the repositories listed at
527
* js/t5000-dont-copy-bin-sh (2014-11-24) 1 commit
528
- t5000 on Windows: do not mistake "sh.exe" as "sh"
529
530
+ Will merge to 'next'.
531
+
532
533
* mg/add-ignore-errors (2014-11-21) 1 commit
534
- add: ignore only ignored files
535
536
+ Will merge to 'next'.
537
+
538
539
* mh/find-uniq-abbrev (2014-11-26) 1 commit
540
- sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev
541
542
+ Will merge to 'next'.
543
+
544
545
* mh/simplify-repack-without-refs (2014-11-25) 7 commits
546
- sort_string_list(): rename to string_list_sort()
@@ -217,229 +551,58 @@ of the repositories listed at
551
- prune_remote(): initialize both delete_refs lists in a single loop
552
- prune_remote(): exit early if there are no stale references
553
554
+ Will merge to 'next'.
555
+
556
557
* pb/am-message-id-footer (2014-11-25) 2 commits
558
- git-am: add --message-id/--no-message-id
559
- git-mailinfo: add --message-id
560
561
+ Will merge to 'next'.
562
+
563
564
* pb/send-email-te (2014-11-25) 2 commits
565
- git-send-email: add --transfer-encoding option
566
- git-send-email: delay creation of MIME headers
567
(this branch is used by jc/t9001-modernise.)
568
569
+ Will merge to 'next'.
570
+
571
572
* pw/remote-set-url-fetch (2014-11-26) 1 commit
573
- remote: add --fetch and --both options to set-url
574
575
+ Still under discussion.
576
+
577
578
* rj/no-xopen-source-for-cygwin (2014-11-24) 1 commit
579
- git-compat-util.h: don't define _XOPEN_SOURCE on cygwin
580
581
+ Will merge to 'next'.
582
240
-* sb/string-list (2014-11-25) 3 commits
583
+
584
+* sb/string-list (2014-11-30) 4 commits
585
- string_list: remove string_list_insert_at_index() from its API
586
+ - SQUASH???
587
- mailmap: use higher level string list functions
588
- string_list: document string_list_(insert,lookup)
589
590
+ Will merge to 'next' after squashing the fixup.
591
+
592
593
* sb/write-sha1-update-reflog (2014-11-24) 1 commit
594
- refs.c: move reflog updates into its own function
595
596
+ Moves a part of function around to add a helper that still only has
597
+ one caller. Need to see how this helps in a bigger picture.
598
+
599
600
* tb/config-core-filemode-check-on-broken-fs (2014-11-21) 1 commit
601
- init-db: improve the filemode trustability check
602
(this branch uses mh/config-flip-xbit-back-after-checking.)
603
254
---------------------------------------------------
255
-[Stalled]
256
-
257
-* je/quiltimport-no-fuzz (2014-10-21) 2 commits
258
- - git-quiltimport: flip the default not to allow fuzz
259
- - git-quiltimport.sh: allow declining fuzz with --exact option
260
-
261
- "quiltimport" drove "git apply" always with -C1 option to reduce
262
- context of the patch in order to give more chance to somewhat stale
263
- patches to apply. Add an "--exact" option to disable, and also
264
- "-C$n" option to customize this behaviour. The top patch
265
- optionally flips the default to "--exact".
266
-
267
- Waiting for an Ack.
268
-
269
-
270
-* jc/push-cert-hmac-optim (2014-09-25) 2 commits
271
- - receive-pack: truncate hmac early and convert only necessary bytes
272
- - sha1_to_hex: split out "hex-format n bytes" helper and use it
273
-
274
- This is "we could do this if we wanted to", not "we measured and it
275
- improves performance critical codepath".
276
-
277
- Will perhaps drop.
278
-
279
-
280
-* nd/multiple-work-trees (2014-09-27) 32 commits
281
- . t2025: add a test to make sure grafts is working from a linked checkout
282
- . checkout: don't require a work tree when checking out into a new one
283
- . git_path(): keep "info/sparse-checkout" per work-tree
284
- . count-objects: report unused files in $GIT_DIR/worktrees/...
285
- . gc: support prune --worktrees
286
- . gc: factor out gc.pruneexpire parsing code
287
- . gc: style change -- no SP before closing parenthesis
288
- . checkout: clean up half-prepared directories in --to mode
289
- . checkout: reject if the branch is already checked out elsewhere
290
- . prune: strategies for linked checkouts
291
- . checkout: support checking out into a new working directory
292
- . use new wrapper write_file() for simple file writing
293
- . wrapper.c: wrapper to open a file, fprintf then close
294
- . setup.c: support multi-checkout repo setup
295
- . setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
296
- . setup.c: convert check_repository_format_gently to use strbuf
297
- . setup.c: detect $GIT_COMMON_DIR in is_git_directory()
298
- . setup.c: convert is_git_directory() to use strbuf
299
- . git-stash: avoid hardcoding $GIT_DIR/logs/....
300
- . *.sh: avoid hardcoding $GIT_DIR/hooks/...
301
- . git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
302
- . $GIT_COMMON_DIR: a new environment variable
303
- . commit: use SEQ_DIR instead of hardcoding "sequencer"
304
- . fast-import: use git_path() for accessing .git dir instead of get_git_dir()
305
- . reflog: avoid constructing .lock path with git_path
306
- . *.sh: respect $GIT_INDEX_FILE
307
- . git_path(): be aware of file relocation in $GIT_DIR
308
- . path.c: group git_path(), git_pathdup() and strbuf_git_path() together
309
- . path.c: rename vsnpath() to do_git_path()
310
- . git_snpath(): retire and replace with strbuf_git_path()
311
- . path.c: make get_pathname() call sites return const char *
312
- . path.c: make get_pathname() return strbuf instead of static buffer
313
-
314
- A replacement for contrib/workdir/git-new-workdir that does not
315
- rely on symbolic links and make sharing of objects and refs safer
316
- by making the borrowee and borrowers aware of each other.
317
-
318
- A few tests need some tweaks for MinGW ($gmane/{257756,257757}).
319
- Conflicts with rs/ref-transaction so ejected for now, waiting for a
320
- reroll.
321
-
322
-
323
-* mt/patch-id-stable (2014-06-10) 1 commit
324
- - patch-id: change default to stable
325
-
326
- Teaches "git patch-id" to compute the patch ID that does not change
327
- when the files in a single patch is reordered. As this new algorithm
328
- is backward incompatible, the last bit to flip it to be the default
329
- is left out of 'master' for now.
330
-
331
- Nobody seems to be jumping up & down requesting this last step,
332
- which makes the result somewhat backward incompatible.
333
- Will perhaps drop.
334
-
335
-
336
-* tr/remerge-diff (2014-11-10) 9 commits
337
- - t4213: avoid "|" in sed regexp
338
- - log --remerge-diff: show what the conflict resolution changed
339
- - name-hash: allow dir hashing even when !ignore_case
340
- - merge-recursive: allow storing conflict hunks in index
341
- - merge_diff_mode: fold all merge diff variants into an enum
342
- - combine-diff: do not pass revs->dense_combined_merges redundantly
343
- - merge-recursive: -Xindex-only to leave worktree unchanged
344
- - merge-recursive: internal flag to avoid touching the worktree
345
- - merge-recursive: remove dead conditional in update_stages()
346
-
347
- "log -p" output learns a new way to let users inspect a merge
348
- commit by showing the differences between the automerged result
349
- with conflicts the person who recorded the merge would have seen
350
- and the final conflict resolution that was recorded in the merge.
351
-
352
- Waiting for a reroll ($gmane/256591).
353
-
354
-
355
-* hv/submodule-config (2014-11-11) 4 commits
356
- - do not die on error of parsing fetchrecursesubmodules option
357
- - use new config API for worktree configurations of submodules
358
- - extract functions for submodule config set and lookup
359
- - implement submodule config cache for lookup of submodule names
360
-
361
- Kicked back to 'pu' per request ($gmane/255610).
362
-
604
+ Will merge to 'next'.
605
364
-* jk/pack-bitmap (2014-08-04) 1 commit
365
- - pack-bitmap: do not use gcc packed attribute
366
-
367
- Hold, waiting for Karsten's replacement.
368
-
369
-
370
-* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
371
- - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
372
- - git-add--interactive: Preserve diff heading when splitting hunks
373
-
374
- Waiting for a reroll.
375
-
376
-
377
-* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
378
- - gitweb: Harden UTF-8 handling in generated links
379
-
380
- $gmane/250758?
381
-
382
-
383
-* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
384
- - userdiff: support Java try keyword
385
- - userdiff: support C# async methods and correct C# keywords
386
-
387
- Reviews sent; waiting for a response.
388
-
389
-
390
-* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
391
- - git-rebase: print name of rev when using shorthand
392
-
393
- Teach "git rebase -" to report the concrete name of the branch
394
- (i.e. the previous one).
395
-
396
- But it stops short and does not do the same for "git rebase @{-1}".
397
- Expecting a reroll.
398
-
399
-
400
-* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
401
- - merge: drop unused arg from abort_commit method signature
402
- - merge: make prepare_to_commit responsible for write_merge_state
403
- - t7505: ensure cleanup after hook blocks merge
404
- - t7505: add missing &&
405
-
406
- Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
407
- run during "git merge". The log message stresses too much on one
408
- hook, prepare-commit-msg, but it would equally apply to other hooks
409
- like post-merge, I think.
410
-
411
- Waiting for a reroll.
412
-
413
-
414
-* jc/graph-post-root-gap (2013-12-30) 3 commits
415
- - WIP: document what we want at the end
416
- - graph: remove unused code a bit
417
- - graph: stuff the current commit into graph->columns[]
418
-
419
- This was primarily a RFH ($gmane/239580).
420
-
421
-
422
-* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
423
- - perf-lib: add test_perf_cleanup target
424
- - perf-lib: split starting the test from the execution
425
-
426
- Add test_perf_cleanup shell function to the perf suite, that allows
427
- the script writers to define a test with a clean-up action.
428
-
429
- Will hold.
430
-
431
-
432
-* jc/show-branch (2014-03-24) 5 commits
433
- - show-branch: use commit slab to represent bitflags of arbitrary width
434
- - show-branch.c: remove "all_mask"
435
- - show-branch.c: abstract out "flags" operation
436
- - show-branch.c: lift all_mask/all_revs to a global static
437
- - show-branch.c: update comment style
438
-
439
- Waiting for the final step to lift the hard-limit before sending it out.
440
-
441
---------------------------------------------------
442
-[Cooking]
606
607
* jk/approxidate-avoid-y-d-m-over-future-dates (2014-11-13) 2 commits
608
(merged to 'next' on 2014-11-14 at 3c11a1b)
@@ -456,7 +619,7 @@ of the repositories listed at
619
(1) ISO-like format is used, and
620
(2) the string can make sense interpreted as both y-m-d and y-d-m.
621
459
- Will cook in 'next' throughout the remainder of the cycle.
622
+ Will cook in 'next'.
623
624
625
* jk/checkout-from-tree (2014-11-13) 1 commit
@@ -470,9 +633,7 @@ of the repositories listed at
633
(merged to 'next' on 2014-11-14 at b2aae27)
634
+ t/lib-terminal: allow TTY tests to run under recent Mac OS
635
473
- Will cook in 'next' throughout the remainder of the cycle.
474
-
475
- We probably should drop this, though. ($gmane/259609).
636
+ We probably should drop this ($gmane/259609).
637
638
639
* sv/get-builtin (2014-11-13) 1 commit
@@ -487,7 +648,7 @@ of the repositories listed at
648
+ imap-send: use parse options API to determine verbosity
649
(this branch is used by br/imap-send-via-libcurl.)
650
490
- Will cook in 'next' throughout the remainder of the cycle.
651
+ Will cook in 'next'.
652
653
654
* br/imap-send-via-libcurl (2014-11-10) 1 commit
@@ -495,7 +656,7 @@ of the repositories listed at
656
+ git-imap-send: use libcurl for implementation
657
(this branch uses br/imap-send-verbosity.)
658
498
- Will cook in 'next' throughout the remainder of the cycle.
659
+ Will cook in 'next'.
660
661
662
* cc/interpret-trailers-more (2014-11-10) 4 commits
@@ -505,12 +666,7 @@ of the repositories listed at
666
- Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
667
(this branch uses jc/conflict-hint.)
668
508
-
509
-* js/push-to-update (2014-11-13) 1 commit
510
- - Add another option for receive.denyCurrentBranch
511
-
512
- Still being discussed but we seem to have agreed what the desired
513
- semantics should be.
669
+ Will merge to 'next'.
670
671
672
* rs/env-array-in-child-process (2014-11-10) 1 commit
@@ -533,12 +689,6 @@ of the repositories listed at
689
Will merge to 'master'.
690
691
536
-* ms/submodule-update-config-doc (2014-11-03) 1 commit
537
- - submodule: clarify documentation for update subcommand
538
-
539
- Needs a reroll ($gmane/259037).
540
-
541
-
692
* nd/lockfile-absolute (2014-11-03) 1 commit
693
(merged to 'next' on 2014-11-06 at 68722a9)
694
+ lockfile.c: store absolute path
@@ -546,7 +696,7 @@ of the repositories listed at
696
The lockfile API can get confused which file to clean up when the
697
process moved the $cwd after creating a lockfile.
698
549
- Will cook in 'next' throughout the remainder of the cycle.
699
+ Will cook in 'next'.
700
701
702
* jh/empty-notes (2014-11-14) 9 commits
@@ -566,13 +716,15 @@ of the repositories listed at
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
722
* jc/merge-bases (2014-10-30) 2 commits
723
(merged to 'next' on 2014-11-06 at 491e576)
724
+ get_merge_bases(): always clean-up object flags
725
+ bisect: clean flags after checking merge bases
726
575
- Will cook in 'next' throughout the remainder of the cycle.
727
+ Will cook in 'next'.
728
729
730
* jc/strbuf-add-lines-avoid-sp-ht-sequence (2014-10-27) 1 commit
@@ -583,7 +735,7 @@ of the repositories listed at
735
line, resulting in "# \t<indented text>\n" when the payload began
736
with a HT. Instead, produce "#\t<indented text>\n".
737
586
- Will cook in 'next' throughout the remainder of the cycle.
738
+ Will cook in 'next'.
739
740
741
* nd/untracked-cache (2014-10-27) 19 commits
@@ -607,6 +759,8 @@ of the repositories listed at
759
- untracked cache: record .gitignore information and dir hierarchy
760
- dir.c: optionally compute sha-1 of a .gitignore file
761
762
+ Comments?
763
+
764
765
* zk/grep-color-words (2014-10-27) 2 commits
766
(merged to 'next' on 2014-10-28 at 4d0457c)
@@ -630,7 +784,7 @@ of the repositories listed at
784
Unlike all the other hints given in the commit log editor, the list
785
of conflicted paths were appended at the end without commented out.
786
633
- Will cook in 'next' throughout the remainder of the cycle.
787
+ Will cook in 'next'.
788
789
790
* jc/diff-b-m (2014-10-23) 1 commit
@@ -639,7 +793,7 @@ of the repositories listed at
793
794
Fix long-standing bug in "diff -B -M" output.
795
642
- Will cook in 'next' throughout the remainder of the cycle.
796
+ Will cook in 'next'.
797
798
799
* jc/checkout-local-track-report (2014-10-14) 1 commit
@@ -650,7 +804,7 @@ of the repositories listed at
804
local branch by setting its branch.*.merge to branch name (not a
805
full refname) incorrectly said that the upstream is gone.
806
653
- Will cook in 'next' throughout the remainder of the cycle.
807
+ Will cook in 'next'.
808
809
810
* jc/clone-borrow (2014-10-15) 1 commit
@@ -659,7 +813,7 @@ of the repositories listed at
813
814
Allow "git clone --reference" to be used more safely.
815
662
- Will cook in 'next' throughout the remainder of the cycle.
816
+ Will cook in 'next'.
817
818
--------------------------------------------------
819
[Discarded]
@@ -736,5 +890,3 @@ of the repositories listed at
890
891
* sb/simplify-repack-without-refs (2014-11-20) 1 commit
892
. refs.c: use a string_list for repack_without_refs
739
-
740
-