1 To: git@vger.kernel.org
3 Subject: What's cooking in git.git (Apr 2014, #01; Fri, 4)
4 X-master-at: e4eef26d985177e4bdd32bf58b6ae40e7ae67289
5 X-next-at: 3e70902d3cca37d1cd975a63c61e4c0966946084
7 What's cooking in git.git (Apr 2014, #01; Fri, 4)
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', some of which are fallouts from GSoC
15 microprojects, some are updates to docs. C/C++ funcname pattern
18 I haven't reverted the merge of that "submodule update" topic yet; I
19 should do that soonish.
21 You can find the changes described here in the integration branches
22 of the repositories listed at
24 http://git-blame.blogspot.com/p/git-public-repositories.html
26 --------------------------------------------------
27 [Graduated to "master"]
29 * ap/remote-hg-skip-null-bookmarks (2014-03-25) 1 commit
30 (merged to 'next' on 2014-03-25 at a8cd922)
31 + remote-hg: do not fail on invalid bookmarks
34 * cb/aix (2014-03-31) 2 commits
35 (merged to 'next' on 2014-04-01 at dd6b3d8)
36 + tests: don't rely on strerror text when testing rmdir failure
37 + dir.c: make git_fnmatch() not inline
40 * cn/fetch-prune-overlapping-destination (2014-03-26) 2 commits
41 (merged to 'next' on 2014-03-28 at 954513a)
42 + fetch: handle overlaping refspecs on --prune
43 + fetch: add a failing test for prunning with overlapping refspecs
45 Protect refs in a hierarchy that can come from more than one remote
46 hierarcies from incorrect removal by "git fetch --prune".
49 * ep/shell-command-substitution (2014-03-25) 2 commits
50 (merged to 'next' on 2014-03-28 at 99a512a)
51 + git-am.sh: use the $(...) construct for command substitution
52 + check-builtins.sh: use the $(...) construct for command substitution
55 * jc/fix-diff-no-index-diff-opt-parse (2014-03-31) 1 commit
56 (merged to 'next' on 2014-04-01 at b8ae26b)
57 + diff-no-index: correctly diagnose error return from diff_opt_parse()
59 "diff --no-index -Mq a b" fell into an infinite loop.
62 * nd/gc-aggressive (2014-03-31) 2 commits
63 (merged to 'next' on 2014-04-01 at e9f89b3)
64 + environment.c: fix constness for odb_pack_keep()
65 + gc --aggressive: make --depth configurable
67 Allow tweaking the maximum length of the delta-chain produced by
71 * nd/log-show-linear-break (2014-03-25) 2 commits
72 (merged to 'next' on 2014-03-28 at ea4a8db)
73 + log: add --show-linear-break to help see non-linear history
74 + object.h: centralize object flag allocation
76 Attempts to show where a single-strand-of-pearls break in "git log"
80 * rs/pickaxe-i (2014-03-24) 10 commits
81 (merged to 'next' on 2014-03-25 at 3b6f21f)
82 + pickaxe: simplify kwset loop in contains()
83 + pickaxe: call strlen only when necessary in diffcore_pickaxe_count()
84 + pickaxe: move pickaxe() after pickaxe_match()
85 + pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe()
86 + pickaxe: honor -i when used with -S and --pickaxe-regex
87 + t4209: use helper functions to test --author
88 + t4209: use helper functions to test --grep
89 + t4209: factor out helper function test_log_icase()
90 + t4209: factor out helper function test_log()
91 + t4209: set up expectations up front
93 Allow the options -i/--regexp-ignore-case, --pickaxe-regex, and -S
94 to be used together and work as expected to perform a pickaxe
95 search using case-insensitive regular expression matching.
97 --------------------------------------------------
100 * ib/rev-parse-parseopt-argh (2014-04-01) 1 commit
101 (merged to 'next' on 2014-04-01 at 025578d)
102 + rev-parse: fix typo in example on manpage
104 Finishing touch to a new topic scheduled for 2.0
106 Will merge to 'master'.
109 * mh/lockfile (2014-04-02) 22 commits
110 - lockfile: allow new file contents to be written while retaining lock
111 - lockfile: extract a function reset_lock_file()
112 - remove_lock_file(): call rollback_lock_file()
113 - struct lock_file: rename lock_filename field to staging_filename
114 - lockfile: also keep track of the filename of the file being locked
115 - lock_file(): exit early if lockfile cannot be opened
116 - commit_lock_file(): don't work with a fixed-length buffer
117 - resolve_symlink(): use a strbuf internally
118 - lockfile: use strbufs when handling (most) paths
119 - config: change write_error() to take a (struct lock_file *) argument
120 - delete_ref_loose(): don't muck around in the lock_file's filename
121 - lockfile: define a constant LOCK_SUFFIX_LEN
122 - lockfile.c: document the various states of lock_file objects
123 - api-lockfile: expand the documentation
124 - struct lock_file: replace on_list field with flags field
125 - lock_file(): always add lock_file object to lock_file_list
126 - hold_lock_file_for_append(): release lock on errors
127 - lockfile: unlock file if lockfile permissions cannot be adjusted
128 - rollback_lock_file(): set fd to -1
129 - rollback_lock_file(): do not clear filename redundantly
130 - try_merge_strategy(): remove redundant lock_file allocation
131 - t3204: test deleting references when lock files already exist
134 * mh/update-ref-batch-create-fix (2014-04-02) 1 commit
135 (merged to 'next' on 2014-04-04 at 97e3f12)
136 + update-ref: fail create operation over stdin if ref already exists
138 Will merge to 'master'.
141 * jk/pack-bitmap (2014-04-04) 1 commit
142 - add `ignore_missing_links` mode to revwalk
144 Will merge to 'next'.
146 --------------------------------------------------
149 * tr/merge-recursive-index-only (2014-02-05) 3 commits
150 - merge-recursive: -Xindex-only to leave worktree unchanged
151 - merge-recursive: internal flag to avoid touching the worktree
152 - merge-recursive: remove dead conditional in update_stages()
153 (this branch is used by tr/remerge-diff.)
158 * tr/remerge-diff (2014-02-26) 5 commits
159 . log --remerge-diff: show what the conflict resolution changed
160 . name-hash: allow dir hashing even when !ignore_case
161 . merge-recursive: allow storing conflict hunks in index
162 . revision: fold all merge diff variants into an enum merge_diff_mode
163 . combine-diff: do not pass revs->dense_combined_merges redundantly
164 (this branch uses tr/merge-recursive-index-only.)
166 "log -p" output learns a new way to let users inspect a merge
167 commit by showing the differences between the automerged result
168 with conflicts the person who recorded the merge would have seen
169 and the final conflict resolution that was recorded in the merge.
171 Needs to be rebased, now kb/fast-hashmap topic is in.
174 * sz/mingw-index-pack-threaded (2014-03-19) 1 commit
175 - Enable index-pack threading in msysgit.
177 What is the status of this topic? A failure report exists
178 ($gmane/245170), and I am aware of Duy's $gmane/245034 but that was
179 where the discussion stalled. Is everybody waiting for everybody
180 else to get the discussion unstuck?
183 * bc/blame-crlf-test (2014-02-18) 1 commit
184 - blame: add a failing test for a CRLF issue.
186 I have a feeling that a fix for this should be fairly isolated and
187 trivial (it should be just the matter of paying attention to the
188 crlf settings when synthesizing the fake commit)---perhaps somebody
189 can squash in a fix to this?
192 * jk/makefile (2014-02-05) 16 commits
194 - move LESS/LV pager environment to Makefile
195 - Makefile: teach scripts to include make variables
197 - Makefile: auto-build C strings from make variables
198 - Makefile: drop *_SQ variables
200 - Makefile: add c-quote helper function
201 - Makefile: introduce sq function for shell-quoting
202 - Makefile: always create files via make-var
203 - Makefile: store GIT-* sentinel files in MAKE/
204 - Makefile: prefer printf to echo for GIT-*
205 - Makefile: use tempfile/mv strategy for GIT-*
206 - Makefile: introduce make-var helper function
207 - Makefile: fix git-instaweb dependency on gitweb
208 - Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
210 Simplify the Makefile rules and macros that exist primarily for
211 quoting purposes, and make it easier to robustly express the
217 * po/everyday-doc (2014-01-27) 1 commit
218 - Make 'git help everyday' work
220 This may make the said command to emit something, but the source is
221 not meant to be formatted into a manual pages to begin with, and
222 also its contents are a bit stale. It may be a good first step in
223 the right direction, but needs more work to at least get the
224 mark-up right before public consumption.
229 * jk/branch-at-publish-rebased (2014-01-17) 5 commits
230 - t1507 (rev-parse-upstream): fix typo in test title
231 - implement @{publish} shorthand
232 - branch_get: provide per-branch pushremote pointers
233 - branch_get: return early on error
234 - sha1_name: refactor upstream_mark
236 Give an easier access to the tracking branches from "other" side in
237 a triangular workflow by introducing B@{publish} that works in a
238 similar way to how B@{upstream} does.
240 Meant to be used as a basis for whatever Ram wants to build on.
245 * rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
246 - merge: drop unused arg from abort_commit method signature
247 - merge: make prepare_to_commit responsible for write_merge_state
248 - t7505: ensure cleanup after hook blocks merge
249 - t7505: add missing &&
251 Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
252 run during "git merge". The log message stresses too much on one
253 hook, prepare-commit-msg, but it would equally apply to other hooks
254 like post-merge, I think.
256 Waiting for a reroll.
259 * jl/submodule-recursive-checkout (2013-12-26) 5 commits
260 - Teach checkout to recursively checkout submodules
261 - submodule: teach unpack_trees() to update submodules
262 - submodule: teach unpack_trees() to repopulate submodules
263 - submodule: teach unpack_trees() to remove submodule contents
264 - submodule: prepare for recursive checkout of submodules
269 * jc/graph-post-root-gap (2013-12-30) 3 commits
270 - WIP: document what we want at the end
271 - graph: remove unused code a bit
272 - graph: stuff the current commit into graph->columns[]
274 This was primarily a RFH ($gmane/239580).
277 * np/pack-v4 (2013-09-18) 90 commits
278 . packv4-parse.c: add tree offset caching
279 . t1050: replace one instance of show-index with verify-pack
280 . index-pack, pack-objects: allow creating .idx v2 with .pack v4
281 . unpack-objects: decode v4 trees
282 . unpack-objects: allow to save processed bytes to a buffer
285 Nico and Duy advancing the eternal vaporware pack-v4. This is here
286 primarily for wider distribution of the preview edition.
288 Needs to be rebased, now the pack-bitmap series is in.
291 * tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
292 - perf-lib: add test_perf_cleanup target
293 - perf-lib: split starting the test from the execution
295 Add test_perf_cleanup shell function to the perf suite, that allows
296 the script writers to define a test with a clean-up action.
301 * jc/format-patch (2013-04-22) 2 commits
302 - format-patch: --inline-single
303 - format-patch: rename "no_inline" field
305 A new option to send a single patch to the standard output to be
306 appended at the bottom of a message. I personally have no need for
307 this, but it was easy enough to cobble together. Tests, docs and
308 stripping out more MIMEy stuff are left as exercises to interested
312 * jc/show-branch (2014-03-24) 5 commits
313 - show-branch: use commit slab to represent bitflags of arbitrary width
314 - show-branch.c: remove "all_mask"
315 - show-branch.c: abstract out "flags" operation
316 - show-branch.c: lift all_mask/all_revs to a global static
317 - show-branch.c: update comment style
319 Waiting for the final step to lift the hard-limit before sending it out.
321 --------------------------------------------------
324 * mr/opt-set-ptr (2014-03-31) 3 commits
325 (merged to 'next' on 2014-04-03 at a26385b)
326 + parse-options: remove unused OPT_SET_PTR
327 + parse-options: add cast to correct pointer type to OPT_SET_PTR
328 + MSVC: fix t0040-parse-options crash
330 OPT_SET_PTR() implementation was broken on IL32P64 platforms;
331 it turns out that the macro is not used by any real user.
334 * mt/patch-id-stable (2014-03-31) 3 commits
335 - patch-id-test: test --stable and --unstable flags
336 - patch-id: document new behaviour
337 - patch-id: make it stable against hunk reordering
339 Introduce a new way to compute patch-id for a patch that is not
340 affected by the order of the paths that appear in the input.
342 Will merge to 'next' and keep it there for the remainder of this cycle.
345 * jl/nor-or-nand-and (2014-03-31) 4 commits
346 - code and test: fix misuses of "nor"
347 - comments: fix misuses of "nor"
348 - contrib: fix misuses of "nor"
349 - Documentation: fix misuses of "nor"
351 Eradicate mistaken use of "nor" (that is, essentially "nor" used
352 not in "neither A nor B" ;-)) from in-code comments, command output
353 strings, and documentations.
355 Will merge to 'next'.
358 * mh/ref-transaction (2014-04-01) 27 commits
359 - ref_transaction_commit(): work with transaction->updates in place
360 - struct ref_update: add type field
361 - struct ref_update: add a lock member
362 - ref_transaction_commit(): introduce temporary variables
363 - struct ref_update: store refname as a FLEX_ARRAY
364 - struct ref_update: rename field "ref_name" to "refname"
365 - refs: remove API function update_refs()
366 - update-ref --stdin: reimplement using reference transactions
367 - refs: add a concept of a reference transaction
368 - update-ref --stdin: harmonize error messages
369 - update-ref --stdin: improve the error message for unexpected EOF
370 - t1400: test one mistake at a time
371 - update-ref --stdin -z: deprecate interpreting the empty string as zeros
372 - update-ref.c: extract a new function, parse_next_sha1()
373 - t1400: test that stdin -z update treats empty <newvalue> as zeros
374 - update-ref --stdin: simplify error messages for missing oldvalues
375 - update-ref --stdin: make error messages more consistent
376 - update-ref --stdin: improve error messages for invalid values
377 - update-ref.c: extract a new function, parse_refname()
378 - parse_cmd_verify(): copy old_sha1 instead of evaluating <oldvalue> twice
379 - update-ref --stdin: read the whole input at once
380 - update_refs(): fix constness
381 - refs.h: rename the action_on_err constants
382 - t1400: add some more tests involving quoted arguments
383 - parse_arg(): really test that argument is properly terminated
384 - t1400: provide more usual input to the command
385 - t1400: fix name and expected result of one test
387 Update "update-ref --stdin [-z]" and then introduce a transactional
388 support for (multi-)reference updates.
390 Replaced with an unpublished "v3".
393 * jc/apply-ignore-whitespace (2014-03-26) 1 commit
394 (merged to 'next' on 2014-04-04 at 53779a7)
395 + apply --ignore-space-change: lines with and without leading whitespaces do not match
397 "--ignore-space-change" option of "git apply" ignored the
398 spaces at the beginning of line too aggressively, which is
399 inconsistent with the option of the same name "diff" and "git diff"
402 Will keep in 'next' for the remainder of this cycle.
405 * jc/rev-parse-argh-dashed-multi-words (2014-03-24) 3 commits
406 (merged to 'next' on 2014-03-31 at 1c48649)
407 + parse-options: make sure argh string does not have SP or _
408 + update-index: teach --cacheinfo a new syntax "mode,sha1,path"
409 + parse-options: multi-word argh should use dash to separate words
411 Make sure that the help text given to describe the "<param>" part
412 of the "git cmd --option=<param>" does not contain SP or _,
413 e.g. "--gpg-sign=<key-id>" option for "git commit" is not spelled
414 as "--gpg-sign=<key id>".
416 Will merge to 'master'.
419 * jk/commit-dates-parsing-fix (2014-04-01) 2 commits
420 (merged to 'next' on 2014-04-04 at c16eeb0)
421 + t4212: loosen far-in-future test for AIX
422 + date: recognize bogus FreeBSD gmtime output
424 Will merge to 'master' and later to 'maint'.
427 * mr/msvc-link-with-invalidcontinue (2014-03-28) 1 commit
428 (merged to 'next' on 2014-03-31 at 051a29e)
429 + MSVC: link in invalidcontinue.obj for better POSIX compatibility
431 Will merge to 'master'.
434 * as/grep-fullname-config (2014-03-20) 1 commit
435 (merged to 'next' on 2014-03-28 at 810a076)
436 + grep: add grep.fullName config variable
438 Add a configuration variable to force --full-name to be default for
441 This may cause regressions on scripted users that do not expect
444 Will keep in 'next' for the remainder of this cycle.
447 * nd/multiple-work-trees (2014-03-25) 28 commits
448 - count-objects: report unused files in $GIT_DIR/repos/...
449 - gc: support prune --repos
450 - gc: style change -- no SP before closing bracket
451 - prune: strategies for linked checkouts
452 - checkout: detach if the branch is already checked out elsewhere
453 - checkout: clean up half-prepared directories in --to mode
454 - checkout: support checking out into a new working directory
455 - use new wrapper write_file() for simple file writing
456 - wrapper.c: wrapper to open a file, fprintf then close
457 - setup.c: support multi-checkout repo setup
458 - setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
459 - setup.c: convert check_repository_format_gently to use strbuf
460 - setup.c: detect $GIT_COMMON_DIR in is_git_directory()
461 - setup.c: convert is_git_directory() to use strbuf
462 - git-stash: avoid hardcoding $GIT_DIR/logs/....
463 - *.sh: avoid hardcoding $GIT_DIR/hooks/...
464 - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
465 - $GIT_COMMON_DIR: a new environment variable
466 - commit: use SEQ_DIR instead of hardcoding "sequencer"
467 - fast-import: use git_path() for accessing .git dir instead of get_git_dir()
468 - reflog: avoid constructing .lock path with git_path
469 - *.sh: respect $GIT_INDEX_FILE
470 - git_path(): be aware of file relocation in $GIT_DIR
471 - path.c: group git_path(), git_pathdup() and strbuf_git_path() together
472 - path.c: rename vsnpath() to do_git_path()
473 - git_snpath(): retire and replace with strbuf_git_path()
474 - path.c: make get_pathname() call sites return const char *
475 - path.c: make get_pathname() return strbuf instead of static buffer
477 A replacement for contrib/workdir/git-new-workdir that does not
478 rely on symbolic links and make sharing of objects and refs safer
479 by making the borrowee and borrowers aware of each other.
484 * ks/tree-diff-nway (2014-03-27) 19 commits
485 - combine-diff: speed it up, by using multiparent diff tree-walker directly
486 - tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
487 - Portable alloca for Git
488 (merged to 'next' on 2014-03-31 at 16a7bd4)
489 + tree-diff: reuse base str(buf) memory on sub-tree recursion
490 + tree-diff: no need to call "full" diff_tree_sha1 from show_path()
491 + tree-diff: rework diff_tree interface to be sha1 based
492 + tree-diff: diff_tree() should now be static
493 + tree-diff: remove special-case diff-emitting code for empty-tree cases
494 (merged to 'next' on 2014-03-25 at cfcbdac)
495 + tree-diff: simplify tree_entry_pathcmp
496 + tree-diff: show_path prototype is not needed anymore
497 + tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
498 + tree-diff: move all action-taking code out of compare_tree_entry()
499 + tree-diff: don't assume compare_tree_entry() returns -1,0,1
500 (merged to 'next' on 2014-03-21 at d872679)
501 + tree-diff: consolidate code for emitting diffs and recursion in one place
502 + tree-diff: show_tree() is not needed
503 + tree-diff: no need to pass match to skip_uninteresting()
504 + tree-diff: no need to manually verify that there is no mode change for a path
505 + combine-diff: move changed-paths scanning logic into its own function
506 + combine-diff: move show_log_first logic/action out of paths scanning
508 Instead of running N pair-wise diff-trees when inspecting a
509 N-parent merge, find the set of paths that were touched by walking
510 N+1 trees in parallel. These set of paths can then be turned into
511 N pair-wise diff-tree results to be processed through rename
512 detections and such. And N=2 case nicely degenerates to the usual
513 2-way diff-tree, which is very nice.
515 The preparatory steps are all in 'next'.
517 Will merge to 'next' and keep it there for the remainder of this cycle.
520 * cc/interpret-trailers (2014-04-01) 11 commits
521 - Documentation: add documentation for 'git interpret-trailers'
522 - trailer: add tests for commands in config file
523 - trailer: execute command from 'trailer.<name>.command'
524 - trailer: add tests for "git interpret-trailers"
525 - trailer: add interpret-trailers command
526 - trailer: put all the processing together and print
527 - trailer: parse trailers from stdin
528 - trailer: process command line trailer arguments
529 - trailer: read and process config information
530 - trailer: process trailers from stdin and arguments
531 - trailer: add data structures and basic functions
533 A new filter to programatically edit the tail end of the commit log
536 Will merge to 'next'.
538 --------------------------------------------------
541 * hv/submodule-ignore-fix (2013-12-06) 4 commits
542 . disable complete ignorance of submodules for index <-> HEAD diff
543 . always show committed submodules in summary after commit
544 . teach add -f option for ignored submodules
545 . fix 'git add' to skip submodules configured as ignored
547 Being reworked in a new topic.
550 * kb/fast-hashmap-pack-struct (2014-02-24) 1 commit
551 . hashmap.h: make sure map entries are tightly packed