What's cooking (2015/09 #06)

Junio C Hamano committed Sep 23, 2015 at 15:53 UTC 49a1e5ee48904bfe562388041bdcdb3d8ad21d10
1 file changed +254 -207
whats-cooking.txt
+254 -207
@@ -1,150 +1,83 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Sep 2015, #05; Mon, 21)
3 +Subject: What's cooking in git.git (Sep 2015, #06; Wed, 23)
4 X-master-at: 8d530c4d64ffcc853889f7b385f554d53db375ed
5 -X-next-at: 95c432565effc19a24a53a40dfcd069a5b323853
5 +X-next-at: c07a1e8782dadcedeffd389aa9bce4fda5b0983c
6
7 -What's cooking in git.git (Sep 2015, #05; Mon, 21)
7 +What's cooking in git.git (Sep 2015, #06; Wed, 23)
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 tip of master gained l10n updates and a regression fix to "git
15 -send-email" and is now at v2.6.0-rc3. I am hoping that the remainder
16 -of the cycle will be uneventful and we can have some quality time
17 -reviewing large-ish topics that were floated but not reviewed quite
18 -well yet. I'll probably start spending some time pinging people
19 -about various topics that seem to have stalled.
14 +Not much has happened on the 'master' or 'next' fronts, but we have
15 +seen quite a lot of activities above that to prepare for the next
16 +cycle, which may or may not be a good sign. I am sending this out
17 +early in the middle of the week, as I'll likely to be offline all
18 +day tomorrow.
19
20 You can find the changes described here in the integration branches
21 of the repositories listed at
22
23 http://git-blame.blogspot.com/p/git-public-repositories.html
24
26 ---------------------------------------------------
27 -[Graduated to "master"]
28 -
29 -* bn/send-email-smtp-auth-error-message-fix (2015-09-21) 1 commit
30 - (merged to 'next' on 2015-09-21 at 59f2e59)
31 - + send-email: fix uninitialized var warning for $smtp_auth
32 -
33 - Fix a minor regression brought in to "git send-email" by a recent
34 - addition of the "--smtp-auth" option.
35 -
36 -
37 -* rj/mailmap-ramsay (2015-09-16) 1 commit
38 - (merged to 'next' on 2015-09-21 at cbd6470)
39 - + mailmap: update my entry with new email address
40 -
41 - Update and consolidate "git shortlog" output entries for Ramsay.
42 -
25 --------------------------------------------------
26 [New Topics]
27
46 -* mm/keyid-docs (2015-09-21) 3 commits
47 - - Documentation: explain optional arguments better
48 - - Documentation/grep: fix documentation of -O
49 - - Documentation: use 'keyid' consistently, not 'key-id'
28 +* ls/p4-translation-failure (2015-09-22) 2 commits
29 + - git-p4: handle "Translation of file content failed"
30 + - git-p4: add test case for "Translation of file content failed" error
31
51 - Very small number of options take a parameter that is optional
52 - (which is not a great UI element as they can only appear at the end
53 - of the command line). Add notice to documentation of each and
54 - every one of them.
32 + Work around "git p4" failing when the P4 depot records the contents
33 + in UTF-16 without UTF-16 BOM.
34
35 Will merge to 'next'.
36
37
59 -* nd/gc-auto-background-fix (2015-09-21) 1 commit
60 - - gc: save log from daemonized gc --auto and print it next time
61 -
62 - When "git gc --auto" is backgrounded, its diagnosis message is
63 - lost. Save it to a file in $GIT_DIR and show it next time the "gc
64 - --auto" is run.
65 -
66 ---------------------------------------------------
67 -[Stalled]
68 -
69 -* sb/remove-get-pathspec (2015-08-03) 1 commit
70 - - builtin/mv: remove get_pathspec()
71 -
72 - Will discard.
73 - ($gmane/276104)
74 -
75 -
76 -* nd/list-files (2015-02-09) 21 commits
77 - - t3080: tests for git-list-files
78 - - list-files: -M aka diff-cached
79 - - list-files -F: show submodules with the new indicator '&'
80 - - list-files: add -F/--classify
81 - - list-files: show directories as well as files
82 - - list-files: do not show duplicate cached entries
83 - - list-files: sort output and remove duplicates
84 - - list-files: add -t back
85 - - list-files: add -1 short for --no-column
86 - - list-files: add -R/--recursive short for --max-depth=-1
87 - - list-files: -u does not imply showing stages
88 - - list-files: make alias 'ls' default to 'list-files'
89 - - list-files: a user friendly version of ls-files and more
90 - - ls-files: support --max-depth
91 - - ls-files: add --column
92 - - ls-files: add --color to highlight file names
93 - - ls-files: buffer full item in strbuf before printing
94 - - ls_colors.c: highlight submodules like directories
95 - - ls_colors.c: add a function to color a file name
96 - - ls_colors.c: parse color.ls.* from config file
97 - - ls_colors.c: add $LS_COLORS parsing code
98 -
99 - A new "git list-files" Porcelain command, "ls-files" with bells and
100 - whistles.
38 +* mr/worktree-list (2015-09-23) 6 commits
39 + - SQUASH???
40 + - worktree: add 'list' command
41 + - worktree: add functions to get worktree details
42 + - worktree: refactor find_linked_symref function
43 + - SQUASH???
44 + - worktree: add top-level worktree.c
45
102 - Reroll to base on wt-status work ($gmane/265142) has seen some
103 - positive discussions.
46 + Add the "list" subcommand to "git worktree".
47
105 - Waiting for a further polished reroll ($gmane/265534).
48
49 +* jk/notes-dwim-doc (2015-09-22) 1 commit
50 + - notes: correct documentation of DWIMery for notes references
51
108 -* mh/numparse (2015-03-19) 14 commits
109 - . diff_opt_parse(): use convert_i() when handling --abbrev=<num>
110 - . diff_opt_parse(): use convert_i() when handling "-l<num>"
111 - . opt_arg(): simplify pointer handling
112 - . opt_arg(): report errors parsing option values
113 - . opt_arg(): use convert_i() in implementation
114 - . opt_arg(): val is always non-NULL
115 - . builtin_diff(): detect errors when parsing --unified argument
116 - . handle_revision_opt(): use convert_ui() when handling "--abbrev="
117 - . strtoul_ui(), strtol_i(): remove functions
118 - . handle_revision_opt(): use convert_i() when handling "-<digit>"
119 - . handle_revision_opt(): use skip_prefix() in many places
120 - . write_subdirectory(): use convert_ui() for parsing mode
121 - . cacheinfo_callback(): use convert_ui() when handling "--cacheinfo"
122 - . numparse: new module for parsing integral numbers
52 + The way how --ref/--notes to specify the notes tree reference are
53 + DWIMmed was not clearly documented.
54
124 - Many codepaths use unchecked use of strtol() and friends (or even
125 - worse, atoi()). Introduce a set of wrappers that try to be more
126 - careful.
55
128 - Waiting for a reroll.
129 - ($gmane/268058).
56 +* kn/for-each-branch (2015-09-23) 8 commits
57 + - branch: add '--points-at' option
58 + - branch.c: use 'ref-filter' APIs
59 + - branch.c: use 'ref-filter' data structures
60 + - branch: drop non-commit error reporting
61 + - branch: move 'current' check down to the presentation layer
62 + - branch: roll show_detached HEAD into regular ref_list
63 + - branch: bump get_head_description() to the top
64 + - branch: refactor width computation
65 + (this branch uses kn/for-each-tag and kn/for-each-tag-branch.)
66
67 + Update "git branch" that list existing branches, using the
68 + ref-filter API that is shared with "git tag" and "git
69 + for-each-ref".
70
132 -* kk/log-merges-config (2015-04-21) 5 commits
133 - - bash-completion: add support for git-log --merges= and log.merges
134 - - t4202-log: add tests for --merges=
135 - - Documentation: add git-log --merges= option and log.merges config. var
136 - - log: honor log.merges= option
137 - - revision: add --merges={show|only|hide} option
71
139 - "git log" (but not other commands in the "log" family) learned to
140 - pay attention to the log.merges configuration variable that can be
141 - set to "show" (the normal behaviour), "only" (hide non-merge
142 - commits), or "hide" (hide merge commits). --merges=(show|only|hide)
143 - can be used to override the setting from the command line.
72 +* jc/fsck-dropped-errors (2015-09-23) 1 commit
73 + - fsck: exit with non-zero when problems are found
74
145 - The documentation may need to be updated once more ($gmane/267250).
146 - Waiting for a reroll.
75 + There were some classes of errors that "git fsck" diagnosed to its
76 + standard error that did not cause it to exit with non-zero status.
77 +
78
79 +--------------------------------------------------
80 +[Stalled]
81
82 * mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
83 - t/lib-git-svn: check same httpd module dirs as lib-httpd
@@ -156,30 +89,6 @@ of the repositories listed at
89 with updated log message ($gmane/268061).
90
91
159 -* bw/portability-solaris (2015-07-20) 3 commits
160 - - tests: fix sed usage in tests to work around broken xpg4/sed on Solaris
161 - - tests: fix sed usage in tests to work around broken xpg4/sed on Solaris
162 - - tests: modify tr expressions so that xpg4/tr handles it on Solaris
163 -
164 - Needs another reroll?
165 - ($gmane/274296)
166 -
167 -
168 -* jc/clone-bundle (2015-04-30) 1 commit
169 - - repack: optionally create a clone.bundle
170 -
171 - Waiting for further work.
172 - Still an early WIP.
173 -
174 -
175 -* mg/index-read-error-messages (2015-06-01) 2 commits
176 - - messages: uniform error messages for index write
177 - - show-index: uniform error messages for index read
178 -
179 - The tip was RFC.
180 - Waiting for a reroll.
181 -
182 -
92 * wp/sha1-name-negative-match (2015-06-08) 2 commits
93 - sha1_name.c: introduce '^{/!-<negative pattern>}' notation
94 - test for '!' handling in rev-parse's named commits
@@ -187,19 +96,8 @@ of the repositories listed at
96 Introduce "branch^{/!-<pattern>}" notation to name a commit
97 reachable from branch that does not match the given pattern.
98
190 - Waiting for a reroll.
191 -
192 -
193 -* mk/utf8-no-iconv-warn (2015-06-08) 1 commit
194 - - utf8.c: print warning about disabled iconv
195 -
196 - Warn when a reencoding is requested in a build without iconv
197 - support, as the end user is likely to get an unexpected result. I
198 - think the same level of safety should be added to a build with
199 - iconv support when the specified encoding is not available, but the
200 - patch does not go there.
201 -
202 - Waiting for a reroll.
99 + Getting tired of waiting for a reroll.
100 + ($gmane/271213).
101
102
103 * ak/format-patch-odir-config (2015-06-19) 1 commit
@@ -240,54 +138,30 @@ of the repositories listed at
138
139 The fix in this patch is broken, unfortunately.
140
141 +--------------------------------------------------
142 +[Cooking]
143
244 -* pw/remote-set-url-fetch (2014-11-26) 1 commit
245 - . remote: add --fetch and --both options to set-url
246 -
247 - Ejected.
248 -
249 -
250 -* tr/remerge-diff (2014-11-10) 9 commits
251 - . t4213: avoid "|" in sed regexp
252 - . log --remerge-diff: show what the conflict resolution changed
253 - . name-hash: allow dir hashing even when !ignore_case
254 - . merge-recursive: allow storing conflict hunks in index
255 - . merge_diff_mode: fold all merge diff variants into an enum
256 - . combine-diff: do not pass revs->dense_combined_merges redundantly
257 - . merge-recursive: -Xindex-only to leave worktree unchanged
258 - . merge-recursive: internal flag to avoid touching the worktree
259 - . merge-recursive: remove dead conditional in update_stages()
260 -
261 - "log -p" output learns a new way to let users inspect a merge
262 - commit by showing the differences between the automerged result
263 - with conflicts the person who recorded the merge would have seen
264 - and the final conflict resolution that was recorded in the merge.
265 -
266 - Waiting for a reroll.
267 - ($gmane/256591).
268 -
269 -
270 -* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
271 - - perf-lib: add test_perf_cleanup target
272 - - perf-lib: split starting the test from the execution
144 +* mm/keyid-docs (2015-09-21) 3 commits
145 + (merged to 'next' on 2015-09-21 at f50ccab)
146 + + Documentation: explain optional arguments better
147 + + Documentation/grep: fix documentation of -O
148 + + Documentation: use 'keyid' consistently, not 'key-id'
149
274 - Add test_perf_cleanup shell function to the perf suite, that allows
275 - the script writers to define a test with a clean-up action.
150 + Very small number of options take a parameter that is optional
151 + (which is not a great UI element as they can only appear at the end
152 + of the command line). Add notice to documentation of each and
153 + every one of them.
154
277 - Will hold.
155 + Will merge to 'master'.
156
157
280 -* jc/show-branch (2014-03-24) 5 commits
281 - - show-branch: use commit slab to represent bitflags of arbitrary width
282 - - show-branch.c: remove "all_mask"
283 - - show-branch.c: abstract out "flags" operation
284 - - show-branch.c: lift all_mask/all_revs to a global static
285 - - show-branch.c: update comment style
158 +* nd/gc-auto-background-fix (2015-09-21) 1 commit
159 + - gc: save log from daemonized gc --auto and print it next time
160
287 - Waiting for the final step to lift the hard-limit.
161 + When "git gc --auto" is backgrounded, its diagnosis message is
162 + lost. Save it to a file in $GIT_DIR and show it next time the "gc
163 + --auto" is run.
164
289 ---------------------------------------------------
290 -[Cooking]
165
166 * jk/blame-first-parent (2015-09-16) 1 commit
167 (merged to 'next' on 2015-09-21 at 7580f6b)
@@ -299,8 +173,7 @@ of the repositories listed at
173 Will merge to 'master'.
174
175
302 -* jk/transfer-limit-protocol (2015-09-16) 3 commits
303 - - SQUASH???
176 +* jk/transfer-limit-protocol (2015-09-23) 2 commits
177 - submodule: allow only certain protocols for submodule fetches
178 - transport: add a protocol-whitelist environment variable
179
@@ -366,21 +239,36 @@ of the repositories listed at
239
240
241 * nd/ignore-then-not-ignore (2015-09-21) 2 commits
369 - - dir.c: don't exclude whole dir prematurely if neg pattern may match
370 - - dir.c: make last_exclude_matching_from_list() run til the end
242 + (merged to 'next' on 2015-09-21 at 2182591)
243 + + dir.c: don't exclude whole dir prematurely if neg pattern may match
244 + + dir.c: make last_exclude_matching_from_list() run til the end
245
246 Allow a later "!/abc/def" to override an earlier "/abc" that
247 appears in the same .gitignore file to make it easier to express
248 "everything in /abc directory is ignored, except for ...".
249
376 - Will merge to 'next'.
250 + Will merge to 'master'.
251
252
379 -* sb/submodule-parallel-fetch (2015-09-14) 2 commits
380 - - fetch: fetch submodules in parallel
253 +* sb/submodule-parallel-fetch (2015-09-23) 9 commits
254 + - submodules: allow parallel fetching, add tests and documentation
255 + - fetch_populated_submodules: use new parallel job processing
256 + - SQUASH???
257 + - run-command: add an asynchronous parallel child processor
258 + - run-command: factor out return value computation
259 + - strbuf: add strbuf_read_once to read without blocking
260 + - xread_nonblock: add functionality to read from fds without blocking
261 + - xread: poll on non blocking fds
262 - submodule.c: write "Fetching submodule <foo>" to stderr
263 (this branch uses sb/submodule-helper.)
264
265 + Add a framework to spawn a group of processes in parallel, and use
266 + it to run "git fetch --recurse-submodules" in parallel.
267 +
268 + It seems that the fundamentals are almost there, modulo polishing
269 + the overall structure to ensure that future enhancement can be made
270 + cleanly.
271 +
272
273 * mk/submodule-gitdir-path (2015-09-14) 2 commits
274 - path: implement common_dir handling in git_pathdup_submodule()
@@ -432,13 +320,13 @@ of the repositories listed at
320
321
322 * gb/filter-branch-progress (2015-09-21) 2 commits
435 - - SQUASH???
436 - - filter-branch: add passed/remaining seconds on progress
323 + (merged to 'next' on 2015-09-21 at 15e698d)
324 + + filter-branch: make report-progress more readable
325 + + filter-branch: add passed/remaining seconds on progress
326
327 Give progress meter to "git filter-branch".
328
440 - Undecided.
441 - ($gmane/278328).
329 + Will merge to 'master'.
330
331
332 * jk/interpret-trailers-outside-a-repository (2015-09-08) 1 commit
@@ -466,7 +354,7 @@ of the repositories listed at
354 Will merge to 'master'.
355
356
469 -* ls/p4-lfs (2015-09-21) 7 commits
357 +* ls/p4-lfs (2015-09-23) 7 commits
358 - git-p4: add Git LFS backend for large file system
359 - git-p4: add support for large file systems
360 - git-p4: check free space during streaming
@@ -478,7 +366,8 @@ of the repositories listed at
366 Teach "git p4" to send large blobs outside the repository by
367 talking to Git LFS.
368
481 - Is this ready for 'next' now?
369 + Expecting a reroll.
370 + ($gmane/278476).
371
372
373 * nd/clone-linked-checkout (2015-09-14) 5 commits
@@ -625,7 +514,7 @@ of the repositories listed at
514 + strtoul_ui: reject negative values
515 + Merge 'jk/git-path' into kn/for-each-tag
516 + Merge 'kn/for-each-tag-branch' into kn/for-each-tag
628 - (this branch uses kn/for-each-tag-branch.)
517 + (this branch is used by kn/for-each-branch; uses kn/for-each-tag-branch.)
518
519 The "ref-filter" code was taught about many parts of what "tag -l"
520 does and then "tag -l" is reimplemented in terms of "ref-filter".
@@ -661,12 +550,13 @@ of the repositories listed at
550
551
552 * bb/remote-get-url (2015-09-17) 1 commit
664 - - remote: add get-url subcommand
553 + (merged to 'next' on 2015-09-21 at c07a1e8)
554 + + remote: add get-url subcommand
555
556 "git remote" learned "get-url" subcommand to show the URL for a
557 given remote name used for fetching and pushing.
558
669 - Will merge to 'next'.
559 + Will merge to 'master'.
560
561
562 * sb/submodule-helper (2015-09-08) 4 commits
@@ -705,7 +595,7 @@ of the repositories listed at
595 + ref-filter: implement '--points-at' option
596 + tag: libify parse_opt_points_at()
597 + t6302: for-each-ref tests for ref-filter APIs
708 - (this branch is used by kn/for-each-tag.)
598 + (this branch is used by kn/for-each-branch and kn/for-each-tag.)
599
600 Originally merged to 'next' on 2015-07-15
601
@@ -772,3 +662,160 @@ of the repositories listed at
662 has been deprecated since October 2007.
663
664 Will keep in 'next' during the 2.6 cycle.
665 +
666 +--------------------------------------------------
667 +[Discarded]
668 +
669 +* sb/remove-get-pathspec (2015-08-03) 1 commit
670 + . builtin/mv: remove get_pathspec()
671 +
672 + ($gmane/276104)
673 +
674 +
675 +* nd/list-files (2015-02-09) 21 commits
676 + . t3080: tests for git-list-files
677 + . list-files: -M aka diff-cached
678 + . list-files -F: show submodules with the new indicator '&'
679 + . list-files: add -F/--classify
680 + . list-files: show directories as well as files
681 + . list-files: do not show duplicate cached entries
682 + . list-files: sort output and remove duplicates
683 + . list-files: add -t back
684 + . list-files: add -1 short for --no-column
685 + . list-files: add -R/--recursive short for --max-depth=-1
686 + . list-files: -u does not imply showing stages
687 + . list-files: make alias 'ls' default to 'list-files'
688 + . list-files: a user friendly version of ls-files and more
689 + . ls-files: support --max-depth
690 + . ls-files: add --column
691 + . ls-files: add --color to highlight file names
692 + . ls-files: buffer full item in strbuf before printing
693 + . ls_colors.c: highlight submodules like directories
694 + . ls_colors.c: add a function to color a file name
695 + . ls_colors.c: parse color.ls.* from config file
696 + . ls_colors.c: add $LS_COLORS parsing code
697 +
698 + A new "git list-files" Porcelain command, "ls-files" with bells and
699 + whistles.
700 +
701 + Reroll to base on wt-status work ($gmane/265142) has seen some
702 + positive discussions.
703 +
704 + ($gmane/265534).
705 +
706 +
707 +* mh/numparse (2015-03-19) 14 commits
708 + . diff_opt_parse(): use convert_i() when handling --abbrev=<num>
709 + . diff_opt_parse(): use convert_i() when handling "-l<num>"
710 + . opt_arg(): simplify pointer handling
711 + . opt_arg(): report errors parsing option values
712 + . opt_arg(): use convert_i() in implementation
713 + . opt_arg(): val is always non-NULL
714 + . builtin_diff(): detect errors when parsing --unified argument
715 + . handle_revision_opt(): use convert_ui() when handling "--abbrev="
716 + . strtoul_ui(), strtol_i(): remove functions
717 + . handle_revision_opt(): use convert_i() when handling "-<digit>"
718 + . handle_revision_opt(): use skip_prefix() in many places
719 + . write_subdirectory(): use convert_ui() for parsing mode
720 + . cacheinfo_callback(): use convert_ui() when handling "--cacheinfo"
721 + . numparse: new module for parsing integral numbers
722 +
723 + Many codepaths use unchecked use of strtol() and friends (or even
724 + worse, atoi()). Introduce a set of wrappers that try to be more
725 + careful.
726 +
727 + ($gmane/268058).
728 +
729 +
730 +* kk/log-merges-config (2015-04-21) 5 commits
731 + . bash-completion: add support for git-log --merges= and log.merges
732 + . t4202-log: add tests for --merges=
733 + . Documentation: add git-log --merges= option and log.merges config. var
734 + . log: honor log.merges= option
735 + . revision: add --merges={show|only|hide} option
736 +
737 + "git log" (but not other commands in the "log" family) learned to
738 + pay attention to the log.merges configuration variable that can be
739 + set to "show" (the normal behaviour), "only" (hide non-merge
740 + commits), or "hide" (hide merge commits). --merges=(show|only|hide)
741 + can be used to override the setting from the command line.
742 +
743 + The documentation may need to be updated once more ($gmane/267250).
744 +
745 +
746 +* bw/portability-solaris (2015-07-20) 3 commits
747 + . tests: fix sed usage in tests to work around broken xpg4/sed on Solaris
748 + . tests: fix sed usage in tests to work around broken xpg4/sed on Solaris
749 + . tests: modify tr expressions so that xpg4/tr handles it on Solaris
750 +
751 + ($gmane/274296)
752 +
753 +
754 +* jc/clone-bundle (2015-04-30) 1 commit
755 + . repack: optionally create a clone.bundle
756 +
757 + Still an early WIP.
758 +
759 +
760 +* mg/index-read-error-messages (2015-06-01) 2 commits
761 + . messages: uniform error messages for index write
762 + . show-index: uniform error messages for index read
763 +
764 + The tip was RFC.
765 + Waiting for a reroll.
766 +
767 +
768 +* mk/utf8-no-iconv-warn (2015-06-08) 1 commit
769 + . utf8.c: print warning about disabled iconv
770 +
771 + Warn when a reencoding is requested in a build without iconv
772 + support, as the end user is likely to get an unexpected result. I
773 + think the same level of safety should be added to a build with
774 + iconv support when the specified encoding is not available, but the
775 + patch does not go there.
776 +
777 + ($gmane/277424).
778 +
779 +
780 +* pw/remote-set-url-fetch (2014-11-26) 1 commit
781 + . remote: add --fetch and --both options to set-url
782 +
783 + Ejected.
784 +
785 +
786 +* tr/remerge-diff (2014-11-10) 9 commits
787 + . t4213: avoid "|" in sed regexp
788 + . log --remerge-diff: show what the conflict resolution changed
789 + . name-hash: allow dir hashing even when !ignore_case
790 + . merge-recursive: allow storing conflict hunks in index
791 + . merge_diff_mode: fold all merge diff variants into an enum
792 + . combine-diff: do not pass revs->dense_combined_merges redundantly
793 + . merge-recursive: -Xindex-only to leave worktree unchanged
794 + . merge-recursive: internal flag to avoid touching the worktree
795 + . merge-recursive: remove dead conditional in update_stages()
796 +
797 + "log -p" output learns a new way to let users inspect a merge
798 + commit by showing the differences between the automerged result
799 + with conflicts the person who recorded the merge would have seen
800 + and the final conflict resolution that was recorded in the merge.
801 +
802 + Waiting for a reroll.
803 + ($gmane/256591).
804 +
805 +
806 +* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
807 + . perf-lib: add test_perf_cleanup target
808 + . perf-lib: split starting the test from the execution
809 +
810 + Add test_perf_cleanup shell function to the perf suite, that allows
811 + the script writers to define a test with a clean-up action.
812 +
813 +
814 +* jc/show-branch (2014-03-24) 5 commits
815 + . show-branch: use commit slab to represent bitflags of arbitrary width
816 + . show-branch.c: remove "all_mask"
817 + . show-branch.c: abstract out "flags" operation
818 + . show-branch.c: lift all_mask/all_revs to a global static
819 + . show-branch.c: update comment style
820 +
821 + Waiting for the final step to lift the hard-limit.