What's cooking (2013/05 #07)

Junio C Hamano committed May 24, 2013 at 14:10 UTC 4e1f1d5c8a7e76bbe9bd869a8098e67086627d62
1 file changed +223 -68
whats-cooking.txt
+223 -68
@@ -1,25 +1,27 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (May 2013, #06; Tue, 21)
4 -X-master-at: 5e49f30c85ecacec98631462fa73f1148a01637c
5 -X-next-at: 6bd1cbc7f99e9924e7312d52e6ec62d01f81905f
3 +Subject: What's cooking in git.git (May 2013, #07; Fri, 24)
4 +X-master-at: edca4152560522a431a51fc0a06147fc680b5b18
5 +X-next-at: ea353ceddcd1414717ea6ae8fce60c7b4d705849
6
7 -What's cooking in git.git (May 2013, #06; Tue, 21)
7 +What's cooking in git.git (May 2013, #07; Fri, 24)
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 -The final version of 1.8.3 is expected to be tagged late this week.
14 +There are topics that are still in 'next', not because they needed
15 +more testing, but only because we already were in the -rc period.
16 +Now that 1.8.3 is out, we will start merging them to 'master' (and
17 +some to 'maint' for 1.8.3.1) in the middle of the next week, after
18 +waiting for a few days to make sure we can have a clean start of the
19 +post 1.8.3 maint branch (with brown paper bag fixes and nothing
20 +else).
21
16 -I have kept many late topics outside 'next' during the -rc period
17 -primarily because the original plan was to keep the -rc period short
18 -for this cycle, and because rebuilding 'next' after the release will
19 -make it a lot more cumbersome to maintain the "What's cooking"
20 -report if we have many topics on 'next' already. But we ended up
21 -having to do an extra -rc3 so I merged a bunch of topics including
22 -the late ones to 'next' with this pushout.
22 +The post 1.8.3 cycle will start early next month, at which time the
23 +'next' branch will be rewound and rebuilt. Until then, I expect
24 +that my patch queue may stay leaky while I take a bit of break.
25
26 You can find the changes described here in the integration branches
27 of the repositories listed at
@@ -29,30 +31,67 @@ of the repositories listed at
31 --------------------------------------------------
32 [New Topics]
33
32 -* dm/unbash-subtree (2013-05-21) 1 commit
33 - - contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash
34 +* mh/reflife (2013-05-22) 17 commits
35 + - refs: document the lifetime of the refname passed to each_ref_fn
36 + - object_array_entry: copy name before storing in name field
37 + - find_first_merges(): remove unnecessary code
38 + - find_first_merges(): initialize merges variable using initializer
39 + - fsck: don't put a void*-shaped peg in a char*-shaped hole
40 + - object_array_remove_duplicates(): rewrite to reduce copying
41 + - object_array: add function object_array_filter()
42 + - get_revision_internal(): make check less mysterious
43 + - gc_boundary(): move the check "alloc <= nr" to caller
44 + - revision: split some overly-long lines
45 + - cmd_diff(): make it obvious which cases are exclusive of each other
46 + - cmd_diff(): rename local variable "list" -> "entry"
47 + - cmd_diff(): use an object_array for holding trees
48 + - builtin_diff_tree(): make it obvious that function wants two entries
49 + - add_rev_cmdline(): make a copy of the name argument
50 + - fetch: make own copies of refnames
51 + - describe: make own copy of refname
52
53 + Define memory ownership and lifetime rules for what for-each-ref
54 + feeds to its callbacks (in short, "you do not own it, so make a
55 + copy if you want to keep it").
56
36 -* fc/transport-helper-no-refspec (2013-05-21) 2 commits
37 - - transport-helper: check if the dry-run is supported
38 - - transport-helper: barf when user tries old:new
57 + Some parts are still RFC.
58
59
41 -* rr/die-on-missing-upstream (2013-05-21) 2 commits
42 - - sha1_name: fix error message for @{<N>}, @{<date>}
43 - - sha1_name: fix error message for @{u}
60 +* th/bisect-skip-report-range-fix (2013-05-22) 1 commit
61 + - bisect: Fix log output for multi-parent skip ranges
62
45 - When a reflog notation is used for implicit "current branch", we
46 - did not say which branch and worse said "branch ''".
63 + Fix for an additional bisect log comments.
64
65 + Will merge to 'next'.
66 +
67 +
68 +* mm/mediawiki-https-fail-message (2013-05-23) 1 commit
69 + - git-remote-mediawiki: better error message when HTTP(S) access fails
70 +
71 + Hint users when https:// connection failed to check the
72 + certificate; it is a good hint if we assumie that it is common
73 + error for the end users to make.
74 +
75 + Will merge to 'next'.
76 +
77 +
78 +* tg/maint-zsh-svn-remote-prompt (2013-05-22) 1 commit
79 + - prompt: fix show upstream with svn and zsh
80 +
81 + zsh prompt script that borrowed from bash prompt script did not
82 + work due to slight differences in array variable notation between
83 + these two shells.
84 +
85 + Will merge to 'next'.
86 +
87 +
88 +* tr/push-no-verify-doc (2013-05-23) 1 commit
89 + - Document push --no-verify
90 +
91 + "git push --[no-]verify" was not documented.
92 +
93 + Will merge to 'next'.
94
49 -* jc/show-branch (2013-05-21) 5 commits
50 - - show-branch: use commit slab to represent bitflags of arbitrary width
51 - - show-branch.c: remove "all_mask"
52 - - show-branch.c: abstract out "flags" operation
53 - - show-branch.c: lift all_mask/all_revs to a global static
54 - - show-branch.c: update comment style
55 - (this branch uses jk/commit-info-slab.)
95
96 --------------------------------------------------
97 [Stalled]
@@ -116,6 +155,49 @@ of the repositories listed at
155 --------------------------------------------------
156 [Cooking]
157
158 +* dm/unbash-subtree (2013-05-21) 1 commit
159 + - contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash
160 +
161 + It turns out that git-subtree script does not have to be run with
162 + bash.
163 +
164 + Will merge to 'next'.
165 +
166 +
167 +* fc/transport-helper-no-refspec (2013-05-21) 2 commits
168 + - transport-helper: check if the dry-run is supported
169 + - transport-helper: barf when user tries old:new
170 +
171 + With "export" remote-helper protocol, (1) a push that tries to
172 + update a remote ref whose name is different from the pushing side
173 + does not work yet, and (2) the helper may not know how to do
174 + --dry-run, so detect such problematic cases and disable them for
175 + now.
176 +
177 + Will merge to 'next'.
178 +
179 +
180 +* rr/die-on-missing-upstream (2013-05-22) 2 commits
181 + - sha1_name: fix error message for @{<N>}, @{<date>}
182 + - sha1_name: fix error message for @{u}
183 +
184 + When a reflog notation is used for implicit "current branch", we
185 + did not say which branch and worse said "branch ''".
186 +
187 + Waiting for series of rerolls to settle.
188 +
189 +
190 +* jc/show-branch (2013-05-21) 5 commits
191 + - show-branch: use commit slab to represent bitflags of arbitrary width
192 + - show-branch.c: remove "all_mask"
193 + - show-branch.c: abstract out "flags" operation
194 + - show-branch.c: lift all_mask/all_revs to a global static
195 + - show-branch.c: update comment style
196 + (this branch uses jk/commit-info-slab.)
197 +
198 + Waiting for the final step to lift the hard-limit before sending it out.
199 +
200 +
201 * fc/remote-bzr (2013-05-16) 6 commits
202 - remote-bzr: trivial cleanups
203 - remote-bzr: change global repo
@@ -127,8 +209,10 @@ of the repositories listed at
209 The ones near the tip conflicted with the hotfix for 1.8.3 so I
210 discarded them for now.
211
212 + Expecting a reroll on top of 1.8.3
213 +
214
131 -* jx/clean-interactive (2013-05-20) 15 commits
215 +* jx/clean-interactive (2013-05-22) 15 commits
216 - test: add t7301 for git-clean--interactive
217 - git-clean: add documentation for interactive git-clean
218 - git-clean: add ask each interactive action
@@ -145,6 +229,8 @@ of the repositories listed at
229 - path.c: refactor relative_path(), not only strip prefix
230 - test: add test cases for relative_path
231
232 + Still under discussion, e.g. $gmane/225139.
233 +
234
235 * tr/test-v-and-v-subtest-only (2013-05-16) 6 commits
236 - test-lib: support running tests under valgrind in parallel
@@ -164,26 +250,36 @@ of the repositories listed at
250 (merged to 'next' on 2013-05-21 at f76baf3)
251 + Documentation/merge-options.txt: restore `-e` option
252
253 + Will merge to 'master'.
254 +
255
256 * rr/zsh-color-prompt (2013-05-17) 3 commits
257 - prompt: colorize ZSH prompt
258 - prompt: factor out gitstring coloring logic
259 - prompt: introduce GIT_PS1_STATESEPARATOR
260
261 + Will merge to 'next'.
262 +
263
264 * an/diff-index-doc (2013-05-20) 1 commit
265 (merged to 'next' on 2013-05-21 at 6e1459b)
266 + Documentation/diff-index: mention two modes of operation
267
268 + Will merge to 'master'.
269 +
270
271 * fc/contrib-related (2013-05-20) 1 commit
272 - Add new git-related helper to contrib
273
274 + Waiting the design review for this earliest part to settle.
275 +
276
277 * mc/describe-first-parent (2013-05-20) 1 commit
278 (merged to 'next' on 2013-05-21 at 2e02ffc)
279 + describe: Add --first-parent option
280
281 + Will merge to 'master'.
282 +
283
284 * rs/tar-tests (2013-05-20) 6 commits
285 (merged to 'next' on 2013-05-21 at aed12a7)
@@ -194,6 +290,8 @@ of the repositories listed at
290 + t5000, t5003: create directories for extracted files lazily
291 + t5000: integrate export-subst tests into regular tests
292
293 + Will merge to 'master'.
294 +
295
296 * da/darwin (2013-05-21) 4 commits
297 (merged to 'next' on 2013-05-21 at 0497edb)
@@ -205,6 +303,8 @@ of the repositories listed at
303 Newer MacOS X encourages the programs to compile and link with
304 their CommonCrypto, not with OpenSSL.
305
306 + Will merge to 'master'.
307 +
308
309 * fc/macos-x-clipped-write (2013-05-17) 1 commit
310 (merged to 'next' on 2013-05-21 at 510b0dd)
@@ -213,6 +313,8 @@ of the repositories listed at
313 Mac OS X does not like to write(2) more than INT_MAX number of
314 bytes.
315
316 + Will merge to 'master'.
317 +
318
319 * fc/remote-hg (2013-05-21) 41 commits
320 - remote-hg: remove files before modifications
@@ -260,6 +362,9 @@ of the repositories listed at
362 The remainder are to be rerolled on top of the bottom-two, so I
363 flipped the order of the series.
364
365 + Will merge the bottom two to 'next'.
366 + Leaving the remainder up to Felipe to reroll or advance to 'next'.
367 +
368
369 * hv/config-from-blob (2013-05-12) 5 commits
370 - do not die when error in config parsing of buf occurs
@@ -268,6 +373,9 @@ of the repositories listed at
373 - config: drop cf validity check in get_next_char()
374 - config: factor out config file stack management
375
376 + Will see a resubmit.
377 + $gmane/223964
378 +
379
380 * jc/t5551-posix-sed-bre (2013-05-12) 1 commit
381 (merged to 'next' on 2013-05-21 at d597ca1)
@@ -275,6 +383,8 @@ of the repositories listed at
383
384 POSIX fix for a test script.
385
386 + Will merge to 'master'.
387 +
388
389 * jk/fetch-always-update-tracking (2013-05-12) 4 commits
390 (merged to 'next' on 2013-05-21 at f7e4b16)
@@ -291,6 +401,8 @@ of the repositories listed at
401 chance, and we have been updating them when we run "git push" which
402 already breaks the original "predictability" anyway.
403
404 + Will merge to 'master'.
405 +
406
407 * nd/clone-connectivity-shortcut (2013-05-11) 4 commits
408 - clone: open a shortcut for connectivity check
@@ -298,6 +410,9 @@ of the repositories listed at
410 - fetch-pack: prepare updated shallow file before fetching the pack
411 - clone: let the user know when check_everything_connected is run
412
413 + Needs some minor fixups.
414 + $gmane/223584
415 +
416
417 * rr/rebase-autostash (2013-05-12) 7 commits
418 - rebase: implement --[no-]autostash and rebase.autostash
@@ -308,6 +423,11 @@ of the repositories listed at
423 - rebase -i: don't error out if $state_dir already exists
424 - am: tighten a conditional that checks for $dotest
425
426 + This is from v3 with some "Fixed" message in $gmane/224111 without
427 + a reroll yet. Also there was an attempt to follow-up, but it was
428 + never completed.
429 + $gmane/224125
430 +
431
432 * kb/ancestry-path-threedots (2013-05-16) 2 commits
433 (merged to 'next' on 2013-05-21 at 5d75bd3)
@@ -319,6 +439,8 @@ of the repositories listed at
439 not pay attention to the fact that the merge base between A and B
440 was the bottom of the range being specified.
441
442 + Will merge to 'master'.
443 +
444
445 * kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits
446 - revision.c: make default history consider bottom commits
@@ -343,6 +465,8 @@ of the repositories listed at
465
466 Will not be a 1.8.3 material, but is an important topic.
467
468 + Will merge to 'next'.
469 +
470
471 * jc/strbuf-branchname-fix (2013-05-16) 1 commit
472 (merged to 'next' on 2013-05-21 at 5db8872)
@@ -352,6 +476,8 @@ of the repositories listed at
476 incorrectly when your previous branch was "frotz" (it should be
477 rewritten to "git merge frotz~22" instead).
478
479 + Will merge to 'master'.
480 +
481
482 * mk/combine-diff-context-horizon-fix (2013-05-15) 1 commit
483 (merged to 'next' on 2013-05-21 at f462c02)
@@ -360,6 +486,8 @@ of the repositories listed at
486 "git diff -c -p" was not showing a deleted line from a hunk when
487 another hunk immediately begins where the earlier one ends.
488
489 + Will merge to 'master'.
490 +
491
492 * mm/color-auto-default (2013-05-15) 2 commits
493 - make color.ui default to 'auto'
@@ -371,6 +499,8 @@ of the repositories listed at
499 expedite it, as this change is not all that important to deserve a
500 major version bump.
501
502 + I'd vote for merging this without waiting for 2.0.
503 +
504
505 * tr/coverage (2013-05-13) 4 commits
506 (merged to 'next' on 2013-05-21 at 8480007)
@@ -382,6 +512,8 @@ of the repositories listed at
512 Update the test coverage support that was left to bitrot for some
513 time.
514
515 + Will merge to 'master'.
516 +
517
518 * mg/more-textconv (2013-05-10) 7 commits
519 (merged to 'next' on 2013-05-21 at 701cdb7)
@@ -396,6 +528,9 @@ of the repositories listed at
528 Make "git grep" and "git show" pay attention to --textconv when
529 dealing with blob objects.
530
531 + I thought this was pretty well designed and executed, but it seems
532 + there are some doubts on the list.
533 +
534
535 * jh/shorten-refname (2013-05-07) 4 commits
536 - t1514: refname shortening is done after dereferencing symbolic refs
@@ -409,6 +544,8 @@ of the repositories listed at
544 ref that points at remotes/origin/something, then it should show
545 "origin/something" and it already does).
546
547 + Expecting a reroll, as an early part of a larger series.
548 +
549
550 * nd/clone-local-with-colon (2013-05-07) 1 commit
551 (merged to 'next' on 2013-05-21 at 3e293bd)
@@ -418,6 +555,8 @@ of the repositories listed at
555 over git-over-ssh specified in the scp style. Detect this case and
556 clone from a local repository at "foo/bar:baz".
557
558 + Will merge to 'master'.
559 +
560
561 * nd/warn-ambiguous-object-name (2013-05-07) 1 commit
562 - get_sha1: improve ambiguity warning regarding SHA-1 and ref names
@@ -438,6 +577,8 @@ of the repositories listed at
577 + completion: synchronize zsh wrapper
578 + completion: cleanup zsh wrapper
579
580 + Will merge to 'master'.
581 +
582
583 * rs/empty-archive (2013-05-09) 2 commits
584 (merged to 'next' on 2013-05-21 at 3e9e288)
@@ -446,6 +587,8 @@ of the repositories listed at
587
588 Fixes tests added in 1.8.2 era that are broken on BSDs.
589
590 + Will merge to 'master'.
591 +
592
593 * vv/help-unknown-ref (2013-05-08) 2 commits
594 (merged to 'next' on 2013-05-21 at 77a2941)
@@ -456,6 +599,8 @@ of the repositories listed at
599 and give an error message that is more specific than "foo is not
600 something we can merge".
601
602 + Will merge to 'master'.
603 +
604
605 * fc/fast-export-persistent-marks (2013-05-07) 3 commits
606 (merged to 'next' on 2013-05-21 at 10b8214)
@@ -467,6 +612,8 @@ of the repositories listed at
612 arbitrary object name and parsing object when only presence and
613 type information is necessary, etc.
614
615 + Will merge to 'master'.
616 +
617
618 * jc/core-checkstat-2.0 (2013-05-06) 2 commits
619 - core.statinfo: remove as promised in Git 2.0
@@ -474,6 +621,8 @@ of the repositories listed at
621
622 The bottom one is a fix for a breakage of a new feature in 1.8.2.
623
624 + Will merge to 'next' (the bottom one only).
625 +
626
627 * jk/packed-refs-race (2013-05-06) 4 commits
628 - for_each_ref: load all loose refs before packed refs
@@ -481,6 +630,8 @@ of the repositories listed at
630 - add a stat_validity struct
631 - resolve_ref: close race condition for packed refs
632
633 + What is the status of this thing?
634 +
635
636 * fc/at-head (2013-05-08) 13 commits
637 - sha1_name: compare variable with constant, not constant with variable
@@ -500,6 +651,8 @@ of the repositories listed at
651 Instead of typing four capital letters "HEAD", you can say "@"
652 instead.
653
654 + Will merge to 'next'.
655 +
656
657 * jk/lookup-object-prefer-latest (2013-05-02) 1 commit
658 (merged to 'next' on 2013-05-06 at cc59dcc)
@@ -508,6 +661,8 @@ of the repositories listed at
661 Optimizes object lookup when the object hashtable starts to become
662 crowded.
663
664 + Will merge to 'master'.
665 +
666
667 * jk/subtree-do-not-push-if-split-fails (2013-05-01) 1 commit
668 (merged to 'next' on 2013-05-06 at 81bdf37)
@@ -516,6 +671,8 @@ of the repositories listed at
671 "git subtree" (in contrib/) had one codepath with loose error
672 checks to lose data at the remote side.
673
674 + Will merge to 'master'.
675 +
676
677 * fc/completion (2013-04-27) 9 commits
678 (merged to 'next' on 2013-05-21 at aba6ef1)
@@ -529,8 +686,7 @@ of the repositories listed at
686 + completion: document tilde expansion failure in tests
687 + completion: add file completion tests
688
532 - I think this is ready for 'next'; not that it matters during the
533 - prerelease feature freeze.
689 + Will merge to 'master'.
690
691
692 * jk/test-output (2013-05-06) 3 commits
@@ -544,7 +700,7 @@ of the repositories listed at
700 inconsistently between the test framework and t/Makefile, and logic
701 to summarize the results looked at a wrong place.
702
547 - Will cook in 'next'.
703 + Will merge to 'master'.
704
705
706 * rj/sparse (2013-04-28) 10 commits
@@ -560,30 +716,7 @@ of the repositories listed at
716 + compat/fnmatch/fnmatch.c: Fix a sparse error
717 + compat/regex/regexec.c: Fix some sparse warnings
718
563 - Will cook in 'next'.
564 -
565 -
566 -* js/transport-helper-error-reporting-fix (2013-04-28) 13 commits
567 - (merged to 'next' on 2013-04-29 at 8cc4bb8)
568 - + git-remote-testgit: build it to run under $SHELL_PATH
569 - + git-remote-testgit: further remove some bashisms
570 - + git-remote-testgit: avoid process substitution
571 - (merged to 'next' on 2013-04-25 at 3358f1a)
572 - + t5801: "VAR=VAL shell_func args" is forbidden
573 - (merged to 'next' on 2013-04-22 at 5ba6467)
574 - + transport-helper: update remote helper namespace
575 - + transport-helper: trivial code shuffle
576 - + transport-helper: warn when refspec is not used
577 - + transport-helper: clarify pushing without refspecs
578 - + transport-helper: update refspec documentation
579 - + transport-helper: clarify *:* refspec
580 - + transport-helper: improve push messages
581 - + transport-helper: mention helper name when it dies
582 - + transport-helper: report errors properly
583 - (this branch is tangled with fc/transport-helper-error-reporting.)
584 -
585 - Finishing touches to fc/transport-helper-error-reporting topic.
586 - Will cook in 'next'.
719 + Will merge to 'master'.
720
721
722 * mh/fetch-into-shallow (2013-05-02) 2 commits
@@ -592,7 +725,7 @@ of the repositories listed at
725 (merged to 'next' on 2013-04-29 at a167d3e)
726 + upload-pack: ignore 'shallow' lines with unknown obj-ids
727
595 - Will cook in 'next'.
728 + Will merge to 'master'.
729
730
731 * jh/checkout-auto-tracking (2013-04-21) 8 commits
@@ -612,7 +745,7 @@ of the repositories listed at
745 remote "origin" may be what uniquely map its own branch to
746 remotes/some/where/foo but that some/where may not be "origin".
747
615 - Will cook in 'next'.
748 + Will merge to 'master'.
749
750
751 * jc/prune-all (2013-04-25) 4 commits
@@ -630,7 +763,7 @@ of the repositories listed at
763 Update "git gc" and "git reflog" with a new parsing function for
764 expiry dates.
765
633 - Will cook in 'next'.
766 + Will merge to 'master'.
767
768
769 * as/check-ignore (2013-04-29) 6 commits
@@ -646,7 +779,7 @@ of the repositories listed at
779 Enhance "check-ignore" (1.8.2 update) to work more like "check-attr"
780 over bidi-pipes.
781
649 - Will cook in 'next'.
782 + Will merge to 'master'.
783
784
785 * mh/packed-refs-various (2013-05-01) 33 commits
@@ -689,7 +822,7 @@ of the repositories listed at
822 Updates reading and updating packed-refs file, correcting corner
823 case bugs.
824
692 - Will cook in 'next'.
825 + Will merge to 'master'.
826
827
828 * fc/transport-helper-error-reporting (2013-05-10) 12 commits
@@ -713,7 +846,31 @@ of the repositories listed at
846 Update transport helper to report errors and maintain ref hierarchy
847 used to keep track of remote helper state better.
848
716 - Will cook in 'next'.
849 + Will merge to 'master'.
850 +
851 +
852 +* js/transport-helper-error-reporting-fix (2013-04-28) 13 commits
853 + (merged to 'next' on 2013-04-29 at 8cc4bb8)
854 + + git-remote-testgit: build it to run under $SHELL_PATH
855 + + git-remote-testgit: further remove some bashisms
856 + + git-remote-testgit: avoid process substitution
857 + (merged to 'next' on 2013-04-25 at 3358f1a)
858 + + t5801: "VAR=VAL shell_func args" is forbidden
859 + (merged to 'next' on 2013-04-22 at 5ba6467)
860 + + transport-helper: update remote helper namespace
861 + + transport-helper: trivial code shuffle
862 + + transport-helper: warn when refspec is not used
863 + + transport-helper: clarify pushing without refspecs
864 + + transport-helper: update refspec documentation
865 + + transport-helper: clarify *:* refspec
866 + + transport-helper: improve push messages
867 + + transport-helper: mention helper name when it dies
868 + + transport-helper: report errors properly
869 + (this branch is tangled with fc/transport-helper-error-reporting.)
870 +
871 + Finishing touches to fc/transport-helper-error-reporting topic.
872 +
873 + Will merge to 'master'.
874
875
876 * jk/submodule-subdirectory-ok (2013-04-24) 3 commits
@@ -726,7 +883,7 @@ of the repositories listed at
883 Allow various subcommands of "git submodule" to be run not from the
884 top of the working tree of the superproject.
885
729 - Will cook in 'next'.
886 + What's the status of this one?
887
888
889 * jl/submodule-mv (2013-04-23) 5 commits
@@ -742,7 +899,7 @@ of the repositories listed at
899 inclusing relocating its working tree and adjusting the paths in
900 the .gitmodules file.
901
745 - Will cook in 'next'.
902 + What's the status of this one?
903
904
905 * jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
@@ -804,8 +961,6 @@ of the repositories listed at
961 as/check-ignore and tr/line-log; I've already asked Duy to hold
962 this and later rebase on top of them.
963
807 - Will defer.
808 -
964
965 * tr/line-log (2013-04-22) 13 commits
966 (merged to 'next' on 2013-04-22 at 8f2c1de)
@@ -827,7 +982,7 @@ of the repositories listed at
982 + Export rewrite_parents() for 'log -L'
983 + Refactor parse_loc
984
830 - Will cook in 'next'.
985 + Will merge to 'master'.
986
987
988 * jc/push-2.0-default-to-simple (2013-04-03) 1 commit