1 To: git@vger.kernel.org
3 Subject: What's cooking in git.git (Mar 2014, #07; Fri, 28)
4 X-master-at: 96e67c86f817b4fbd492b12f57dae4bd821571ba
5 X-next-at: f39dc61b64e8fe9f0fb9ad70df8bb78bf1f5f911
7 What's cooking in git.git (Mar 2014, #07; Fri, 28)
8 --------------------------------------------------
10 Here are the topics that have been cooking. Commits prefixed with
11 '-' are only in 'pu' (proposed updates) while commits prefixed with
14 More topics merged to 'master', many of which are fallouts from GSoC
17 You can find the changes described here in the integration branches
18 of the repositories listed at
20 http://git-blame.blogspot.com/p/git-public-repositories.html
22 --------------------------------------------------
23 [Graduated to "master"]
25 * ah/doc-gitk-config (2014-03-20) 1 commit
26 (merged to 'next' on 2014-03-20 at d671b60)
27 + Documentation/gitk: document the location of the configulation file
30 * bg/rebase-off-of-previous-branch (2014-03-19) 1 commit
31 (merged to 'next' on 2014-03-21 at 916b759)
32 + rebase: allow "-" short-hand for the previous branch
34 "git rebase" learned to interpret a lone "-" as "@{-1}", the
35 branch that we were previously on.
38 * bp/commit-p-editor (2014-03-18) 7 commits
39 (merged to 'next' on 2014-03-21 at 23b6b06)
40 + run-command: mark run_hook_with_custom_index as deprecated
41 + merge hook tests: fix and update tests
42 + merge: fix GIT_EDITOR override for commit hook
43 + commit: fix patch hunk editing with "commit -p -m"
44 + test patch hunk editing with "commit -p -m"
45 + merge hook tests: use 'test_must_fail' instead of '!'
46 + merge hook tests: fix missing '&&' in test
48 When it is not necessary to edit a commit log message (e.g. "git
49 commit -m" is given a message without specifying "-e"), we used to
50 disable the spawning of the editor by overriding GIT_EDITOR, but
51 this means all the uses of the editor, other than to edit the
52 commit log message, are also affected.
55 * fr/add-interactive-argv-array (2014-03-18) 1 commit
56 (merged to 'next' on 2014-03-20 at 9d65f3d)
57 + add: use struct argv_array in run_add_interactive()
60 * jk/pack-bitmap (2014-03-17) 1 commit
61 (merged to 'next' on 2014-03-20 at bba6246)
62 + pack-objects: turn off bitmaps when skipping objects
64 Instead of dying when asked to (re)pack with the reachability
65 bitmap when a bitmap cannot be built, just (re)pack without
66 producing a bitmap in such a case, with a warning.
69 * jk/pack-bitmap-progress (2014-03-17) 2 commits
70 (merged to 'next' on 2014-03-20 at c7a83f9)
71 + pack-objects: show reused packfile objects in "Counting objects"
72 + pack-objects: show progress for reused packfiles
74 The progress output while repacking and transferring objects showed
75 an apparent large silence while writing the objects out of existing
76 packfiles, when the reachability bitmap was in use.
79 * jk/subtree-prefix (2014-03-17) 1 commit
80 (merged to 'next' on 2014-03-20 at 81367fa)
81 + subtree: initialize "prefix" variable
83 A stray environment variable $prefix could have leaked into and
84 affected the behaviour of the "subtree" script.
87 * ys/fsck-commit-parsing (2014-03-19) 2 commits
88 (merged to 'next' on 2014-03-21 at 2728983)
89 + fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant
90 + fsck.c:fsck_ident(): ident points at a const string
92 --------------------------------------------------
95 * jc/apply-ignore-whitespace (2014-03-26) 1 commit
96 - apply --ignore-space-change: lines with and without leading whitespaces do not match
98 An RFC. "--ignore-space-change" option of "git apply" ignored the
99 spaces at the beginning of line too aggressively, which is
100 inconsistent with the option of the same name "diff" and "git diff"
106 * jc/rev-parse-argh-dashed-multi-words (2014-03-24) 3 commits
107 - parse-options: make sure argh string does not have SP or _
108 - update-index: teach --cacheinfo a new syntax "mode,sha1,path"
109 - parse-options: multi-word argh should use dash to separate words
110 (this branch uses ib/rev-parse-parseopt-argh.)
112 Make sure that the help text given to describe the "<param>" part
113 of the "git cmd --option=<param>" does not contain SP or _,
114 e.g. "--gpg-sign=<key-id>" option for "git commit" is not spelled
115 as "--gpg-sign=<key id>".
117 Will merge to 'next'.
120 * jk/commit-dates-parsing-fix (2014-03-26) 1 commit
121 - t4212: loosen far-in-future test for AIX
123 I think we agreed that a simpler test would be a better way
127 * mr/msvc-link-with-invalidcontinue (2014-03-28) 1 commit
128 - MSVC: link in invalidcontinue.obj for better POSIX compatibility
130 Will merge to 'next'.
133 * mr/msvc-link-with-lcurl (2014-03-27) 1 commit
134 (merged to 'next' on 2014-03-28 at 3281dab)
135 + MSVC: allow linking with the cURL library
137 Will merge to 'master'.
140 * wt/doc-submodule-name-path-confusion-1 (2014-03-27) 1 commit
141 (merged to 'next' on 2014-03-28 at 225f241)
142 + doc: submodule.* config are keyed by submodule names
144 Will merge to 'master'.
147 * wt/doc-submodule-name-path-confusion-2 (2014-03-27) 1 commit
148 (merged to 'next' on 2014-03-28 at ec5bcf3)
149 + doc: submodule.*.branch config is keyed by name
151 Will merge to 'master'.
154 * ep/shell-command-substitution (2014-03-25) 2 commits
155 (merged to 'next' on 2014-03-28 at 99a512a)
156 + git-am.sh: use the $(...) construct for command substitution
157 + check-builtins.sh: use the $(...) construct for command substitution
159 Will merge to 'master'.
161 --------------------------------------------------
164 * tr/merge-recursive-index-only (2014-02-05) 3 commits
165 - merge-recursive: -Xindex-only to leave worktree unchanged
166 - merge-recursive: internal flag to avoid touching the worktree
167 - merge-recursive: remove dead conditional in update_stages()
168 (this branch is used by tr/remerge-diff.)
173 * tr/remerge-diff (2014-02-26) 5 commits
174 . log --remerge-diff: show what the conflict resolution changed
175 . name-hash: allow dir hashing even when !ignore_case
176 . merge-recursive: allow storing conflict hunks in index
177 . revision: fold all merge diff variants into an enum merge_diff_mode
178 . combine-diff: do not pass revs->dense_combined_merges redundantly
179 (this branch uses tr/merge-recursive-index-only.)
181 "log -p" output learns a new way to let users inspect a merge
182 commit by showing the differences between the automerged result
183 with conflicts the person who recorded the merge would have seen
184 and the final conflict resolution that was recorded in the merge.
186 RFC. This latest round clashes with the kb/fast-hashmap topic in
190 * sz/mingw-index-pack-threaded (2014-03-19) 1 commit
191 - Enable index-pack threading in msysgit.
193 Still under discussion among Windows folks. A failure report
194 exists ($gmane/245170).
197 * bc/blame-crlf-test (2014-02-18) 1 commit
198 - blame: add a failing test for a CRLF issue.
200 I have a feeling that a fix for this should be fairly isolated and
201 trivial (it should be just the matter of paying attention to the
202 crlf settings when synthesizing the fake commit)---perhaps somebody
203 can squash in a fix to this?
206 * jk/makefile (2014-02-05) 16 commits
208 - move LESS/LV pager environment to Makefile
209 - Makefile: teach scripts to include make variables
211 - Makefile: auto-build C strings from make variables
212 - Makefile: drop *_SQ variables
214 - Makefile: add c-quote helper function
215 - Makefile: introduce sq function for shell-quoting
216 - Makefile: always create files via make-var
217 - Makefile: store GIT-* sentinel files in MAKE/
218 - Makefile: prefer printf to echo for GIT-*
219 - Makefile: use tempfile/mv strategy for GIT-*
220 - Makefile: introduce make-var helper function
221 - Makefile: fix git-instaweb dependency on gitweb
222 - Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
224 Simplify the Makefile rules and macros that exist primarily for
225 quoting purposes, and make it easier to robustly express the
231 * kb/fast-hashmap-pack-struct (2014-02-24) 1 commit
232 - hashmap.h: make sure map entries are tightly packed
234 I am inclined to drop this; an alternative is to replace it with
235 the "more portable" one that uses #pragma, which I am willing to
236 try doing so on 'pu', though.
239 * po/everyday-doc (2014-01-27) 1 commit
240 - Make 'git help everyday' work
242 This may make the said command to emit something, but the source is
243 not meant to be formatted into a manual pages to begin with, and
244 also its contents are a bit stale. It may be a good first step in
245 the right direction, but needs more work to at least get the
246 mark-up right before public consumption.
251 * jk/branch-at-publish-rebased (2014-01-17) 5 commits
252 - t1507 (rev-parse-upstream): fix typo in test title
253 - implement @{publish} shorthand
254 - branch_get: provide per-branch pushremote pointers
255 - branch_get: return early on error
256 - sha1_name: refactor upstream_mark
258 Give an easier access to the tracking branches from "other" side in
259 a triangular workflow by introducing B@{publish} that works in a
260 similar way to how B@{upstream} does.
262 Meant to be used as a basis for whatever Ram wants to build on.
267 * rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
268 - merge: drop unused arg from abort_commit method signature
269 - merge: make prepare_to_commit responsible for write_merge_state
270 - t7505: ensure cleanup after hook blocks merge
271 - t7505: add missing &&
273 Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
274 run during "git merge". The log message stresses too much on one
275 hook, prepare-commit-msg, but it would equally apply to other hooks
276 like post-merge, I think.
278 Waiting for a reroll.
281 * jl/submodule-recursive-checkout (2013-12-26) 5 commits
282 - Teach checkout to recursively checkout submodules
283 - submodule: teach unpack_trees() to update submodules
284 - submodule: teach unpack_trees() to repopulate submodules
285 - submodule: teach unpack_trees() to remove submodule contents
286 - submodule: prepare for recursive checkout of submodules
291 * jc/graph-post-root-gap (2013-12-30) 3 commits
292 - WIP: document what we want at the end
293 - graph: remove unused code a bit
294 - graph: stuff the current commit into graph->columns[]
296 This was primarily a RFH ($gmane/239580).
299 * hv/submodule-ignore-fix (2013-12-06) 4 commits
300 - disable complete ignorance of submodules for index <-> HEAD diff
301 - always show committed submodules in summary after commit
302 - teach add -f option for ignored submodules
303 - fix 'git add' to skip submodules configured as ignored
305 Teach "git add" to be consistent with "git status" when changes to
306 submodules are set to be ignored, to avoid surprises after checking
307 with "git status" to see there isn't any change to be further added
308 and then see that "git add ." adds changes to them.
310 I think a reroll is coming, so this may need to be replaced, but I
311 needed some practice with heavy conflict resolution. It conflicts
312 with two changes to "git add" that have been scheduled for Git 2.0
313 quite badly, and I think I got the resolution right this time.
315 Waiting for a reroll.
318 * np/pack-v4 (2013-09-18) 90 commits
319 . packv4-parse.c: add tree offset caching
320 . t1050: replace one instance of show-index with verify-pack
321 . index-pack, pack-objects: allow creating .idx v2 with .pack v4
322 . unpack-objects: decode v4 trees
323 . unpack-objects: allow to save processed bytes to a buffer
326 Nico and Duy advancing the eternal vaporware pack-v4. This is here
327 primarily for wider distribution of the preview edition.
329 Temporarily ejected from 'pu', to try out jk/pack-bitmap, which
330 this topic conflicts with.
333 * tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
334 - perf-lib: add test_perf_cleanup target
335 - perf-lib: split starting the test from the execution
337 Add test_perf_cleanup shell function to the perf suite, that allows
338 the script writers to define a test with a clean-up action.
343 * jc/format-patch (2013-04-22) 2 commits
344 - format-patch: --inline-single
345 - format-patch: rename "no_inline" field
347 A new option to send a single patch to the standard output to be
348 appended at the bottom of a message. I personally have no need for
349 this, but it was easy enough to cobble together. Tests, docs and
350 stripping out more MIMEy stuff are left as exercises to interested
354 * jc/show-branch (2014-03-24) 5 commits
355 - show-branch: use commit slab to represent bitflags of arbitrary width
356 - show-branch.c: remove "all_mask"
357 - show-branch.c: abstract out "flags" operation
358 - show-branch.c: lift all_mask/all_revs to a global static
359 - show-branch.c: update comment style
361 Waiting for the final step to lift the hard-limit before sending it out.
363 --------------------------------------------------
366 * jk/tests-cleanup (2014-03-21) 12 commits
367 (merged to 'next' on 2014-03-26 at 4a72b49)
368 + t0001: drop subshells just for "cd"
369 + t0001: drop useless subshells
370 + t0001: use test_must_fail
371 + t0001: use test_config_global
372 + t0001: use test_path_is_*
373 + t0001: make symlink reinit test more careful
374 + t: prefer "git config --file" to GIT_CONFIG
375 + t: prefer "git config --file" to GIT_CONFIG with test_must_fail
376 + t: stop using GIT_CONFIG to cross repo boundaries
377 + t: drop useless sane_unset GIT_* calls
378 + t/test-lib: drop redundant unset of GIT_CONFIG
379 + t/Makefile: stop setting GIT_CONFIG
380 (this branch uses dt/tests-with-env-not-subshell.)
382 Will merge to 'master'.
385 * ca/doc-config-third-party (2014-03-21) 1 commit
386 (merged to 'next' on 2014-03-25 at 731e011)
387 + config.txt: third-party tools may and do use their own variables
389 Will merge to 'master'.
392 * dw/doc-status-no-longer-shows-pound-prefix (2014-03-21) 1 commit
393 (merged to 'next' on 2014-03-25 at 2683eb6)
394 + doc: status, remove leftover statement about '#' prefix
396 Will merge to 'master'.
399 * js/userdiff-cc (2014-03-21) 10 commits
400 (merged to 'next' on 2014-03-25 at 8c0e585)
401 + userdiff: have 'cpp' hunk header pattern catch more C++ anchor points
402 + t4018: test cases showing that the cpp pattern misses many anchor points
403 + t4018: test cases for the built-in cpp pattern
404 + t4018: reduce test files for pattern compilation tests
405 + t4018: convert custom pattern test to the new infrastructure
406 + t4018: convert java pattern test to the new infrastructure
407 + t4018: convert perl pattern tests to the new infrastructure
408 + t4018: an infrastructure to test hunk headers
409 + userdiff: support unsigned and long long suffixes of integer constants
410 + userdiff: support C++ ->* and .* operators in the word regexp
412 Improves the pattern to match the hunk-header for C/C++.
414 Will merge to 'master'.
417 * dp/makefile-charset-lib-doc (2014-03-23) 1 commit
418 (merged to 'next' on 2014-03-25 at b32e3ad)
419 + Makefile: describe CHARSET_LIB better
421 Will merge to 'master'.
424 * ib/rev-parse-parseopt-argh (2014-03-23) 2 commits
425 (merged to 'next' on 2014-03-25 at d9083ed)
426 + t1502: protect runs of SPs used in the indentation
427 + rev-parse --parseopt: option argument name hints
428 (this branch is used by jc/rev-parse-argh-dashed-multi-words.)
430 Teaches the "rev-parse --parseopt" mechanism used by scripted
431 Porcelains to parse command line options and give help text how to
432 supply argv-help (the placeholder string for an option parameter,
433 e.g. "key-id" in "--gpg-sign=<key-id>").
435 Will merge to 'master'.
438 * rs/pickaxe-i (2014-03-24) 10 commits
439 (merged to 'next' on 2014-03-25 at 3b6f21f)
440 + pickaxe: simplify kwset loop in contains()
441 + pickaxe: call strlen only when necessary in diffcore_pickaxe_count()
442 + pickaxe: move pickaxe() after pickaxe_match()
443 + pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe()
444 + pickaxe: honor -i when used with -S and --pickaxe-regex
445 + t4209: use helper functions to test --author
446 + t4209: use helper functions to test --grep
447 + t4209: factor out helper function test_log_icase()
448 + t4209: factor out helper function test_log()
449 + t4209: set up expectations up front
451 Allow the options -i/--regexp-ignore-case, --pickaxe-regex, and -S
452 to be used together and work as expected to perform a pickaxe
453 search using case-insensitive regular expression matching.
455 Will merge to 'master'.
458 * an/branch-config-message (2014-03-24) 1 commit
459 (merged to 'next' on 2014-03-26 at 26f9741)
460 + branch.c: install_branch_config: simplify if chain
462 Will merge to 'master'.
465 * as/grep-fullname-config (2014-03-20) 1 commit
466 (merged to 'next' on 2014-03-28 at 810a076)
467 + grep: add grep.fullName config variable
469 Add a configuration variable to force --full-name to be default for
472 This may cause regressions on scripted users that do not expect
478 * nd/gc-aggressive (2014-03-17) 4 commits
479 - gc --aggressive: three phase repacking
480 - gc --aggressive: make --depth configurable
481 - pack-objects: support --keep
482 - environment.c: fix constness for odb_pack_keep()
485 * dt/tests-with-env-not-subshell (2014-03-19) 1 commit
486 (merged to 'next' on 2014-03-25 at 19fe25f)
487 + tests: use "env" to run commands with temporary env-var settings
488 (this branch is used by jk/tests-cleanup.)
490 Will merge to 'master'.
493 * hs/simplify-bit-setting-in-fsck-tree (2014-03-20) 1 commit
494 (merged to 'next' on 2014-03-25 at 08efd68)
495 + fsck: use bitwise-or assignment operator to set flag
497 Will merge to 'master'.
500 * mm/status-porcelain-format-i18n-fix (2014-03-26) 1 commit
501 (merged to 'next' on 2014-03-26 at 41680fc)
502 + status: disable translation when --porcelain is used
504 Will merge to 'master'.
507 * ap/remote-hg-skip-null-bookmarks (2014-03-25) 1 commit
508 (merged to 'next' on 2014-03-25 at a8cd922)
509 + remote-hg: do not fail on invalid bookmarks
511 Will merge to 'master'.
514 * cn/fetch-prune-overlapping-destination (2014-03-26) 2 commits
515 (merged to 'next' on 2014-03-28 at 954513a)
516 + fetch: handle overlaping refspecs on --prune
517 + fetch: add a failing test for prunning with overlapping refspecs
519 Protect refs in a hierarchy that can come from more than one remote
520 hierarcies from incorrect removal by "git fetch --prune".
522 Since I didn't get any responses to my earlier "Comments?", I ended
523 up reading it myself again and found a small leak, whose fix has
524 been squashed in to the tip commit.
526 Will merge to 'master'.
529 * nd/multiple-work-trees (2014-03-25) 28 commits
530 - count-objects: report unused files in $GIT_DIR/repos/...
531 - gc: support prune --repos
532 - gc: style change -- no SP before closing bracket
533 - prune: strategies for linked checkouts
534 - checkout: detach if the branch is already checked out elsewhere
535 - checkout: clean up half-prepared directories in --to mode
536 - checkout: support checking out into a new working directory
537 - use new wrapper write_file() for simple file writing
538 - wrapper.c: wrapper to open a file, fprintf then close
539 - setup.c: support multi-checkout repo setup
540 - setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
541 - setup.c: convert check_repository_format_gently to use strbuf
542 - setup.c: detect $GIT_COMMON_DIR in is_git_directory()
543 - setup.c: convert is_git_directory() to use strbuf
544 - git-stash: avoid hardcoding $GIT_DIR/logs/....
545 - *.sh: avoid hardcoding $GIT_DIR/hooks/...
546 - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
547 - $GIT_COMMON_DIR: a new environment variable
548 - commit: use SEQ_DIR instead of hardcoding "sequencer"
549 - fast-import: use git_path() for accessing .git dir instead of get_git_dir()
550 - reflog: avoid constructing .lock path with git_path
551 - *.sh: respect $GIT_INDEX_FILE
552 - git_path(): be aware of file relocation in $GIT_DIR
553 - path.c: group git_path(), git_pathdup() and strbuf_git_path() together
554 - path.c: rename vsnpath() to do_git_path()
555 - git_snpath(): retire and replace with strbuf_git_path()
556 - path.c: make get_pathname() call sites return const char *
557 - path.c: make get_pathname() return strbuf instead of static buffer
559 A replacement for contrib/workdir/git-new-workdir that does not
560 rely on symbolic links and make sharing of objects and refs safer
561 by making the borrowee and borrowers aware of each other.
564 * ks/tree-diff-nway (2014-03-27) 19 commits
565 - combine-diff: speed it up, by using multiparent diff tree-walker directly
566 - tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
567 - Portable alloca for Git
568 - tree-diff: reuse base str(buf) memory on sub-tree recursion
569 - tree-diff: no need to call "full" diff_tree_sha1 from show_path()
570 - tree-diff: rework diff_tree interface to be sha1 based
571 - tree-diff: diff_tree() should now be static
572 - tree-diff: remove special-case diff-emitting code for empty-tree cases
573 (merged to 'next' on 2014-03-25 at cfcbdac)
574 + tree-diff: simplify tree_entry_pathcmp
575 + tree-diff: show_path prototype is not needed anymore
576 + tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
577 + tree-diff: move all action-taking code out of compare_tree_entry()
578 + tree-diff: don't assume compare_tree_entry() returns -1,0,1
579 (merged to 'next' on 2014-03-21 at d872679)
580 + tree-diff: consolidate code for emitting diffs and recursion in one place
581 + tree-diff: show_tree() is not needed
582 + tree-diff: no need to pass match to skip_uninteresting()
583 + tree-diff: no need to manually verify that there is no mode change for a path
584 + combine-diff: move changed-paths scanning logic into its own function
585 + combine-diff: move show_log_first logic/action out of paths scanning
587 Instead of running N pair-wise diff-trees when inspecting a
588 N-parent merge, find the set of paths that were touched by walking
589 N+1 trees in parallel. These set of paths can then be turned into
590 N pair-wise diff-tree results to be processed through rename
591 detections and such. And N=2 case nicely degenerates to the usual
592 2-way diff-tree, which is very nice.
595 * nd/log-show-linear-break (2014-03-25) 2 commits
596 (merged to 'next' on 2014-03-28 at ea4a8db)
597 + log: add --show-linear-break to help see non-linear history
598 + object.h: centralize object flag allocation
600 Attempts to show where a single-strand-of-pearls break in "git log"
603 Will merge to 'master'.
606 * cc/interpret-trailers (2014-03-26) 12 commits
607 - trailers: add documentation for 'git interpret-trailers'
608 - trailer: add tests for commands in config file
609 - trailer: execute command from 'trailer.<name>.command'
610 - trailer: add tests for "git interpret-trailers"
611 - trailer: add interpret-trailers command
612 - trailer: put all the processing together and print
613 - trailer: parse trailers from stdin
614 - trailer: process command line trailer arguments
615 - trailer: read and process config information
616 - Move lower case functions into wrapper.c
617 - trailer: process trailers from stdin and arguments
618 - trailers: add data structures and basic functions
620 A new filter to programatically edit the tail end of the commit log