1 To: git@vger.kernel.org
3 Subject: What's cooking in git.git (Jul 2015, #03; Fri, 10)
4 X-master-at: e59f6c2d348d465e3147b11098126d3965686098
5 X-next-at: 8463c8d6f0c5700d7d5cf215888040724599e56f
7 What's cooking in git.git (Jul 2015, #03; Fri, 10)
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 As there is at least one new topic in 2.5-rc that has a real and
15 severe breakage, we may need to delay the final by at least a few
16 weeks. Note that when I say "Will merge to 'master'", I am not
17 saying if that happens before or after the upcoming release, at
20 Projects from GSoC students and Ensimag students have also been a
21 pleasure to work with. I'd have to say that this year is much
22 better than some previous years.
24 You can find the changes described here in the integration branches
25 of the repositories listed at
27 http://git-blame.blogspot.com/p/git-public-repositories.html
29 --------------------------------------------------
30 [Graduated to "master"]
32 * cb/rebase-am-exit-code (2015-07-08) 1 commit
33 (merged to 'next' on 2015-07-09 at ca9b7e1)
34 + rebase: return non-zero error code if format-patch fails
36 "git rebase" did not exit with failure when format-patch it invoked
37 failed for whatever reason.
40 * cb/subtree-tests-update (2015-06-22) 3 commits
41 (merged to 'next' on 2015-06-24 at 31a2938)
42 + contrib/subtree: small tidy-up to test
43 + contrib/subtree: fix broken &&-chains and revealed test error
44 + contrib/subtree: use tabs consitently for indentation in tests
46 Tests update in contrib/subtree.
49 * jc/fix-alloc-sortbuf-in-index-pack (2015-07-04) 1 commit
50 (merged to 'next' on 2015-07-06 at c05da06)
51 + index-pack: fix allocation of sorted_by_pos array
53 A hotfix for what is in 2.5-rc but not in 2.4.
56 * jk/fix-refresh-utime (2015-07-08) 1 commit
57 (merged to 'next' on 2015-07-09 at 323b86d)
58 + check_and_freshen_file: fix reversed success-check
60 Fix a small bug in our use of umask() return value.
63 * jk/maint-for-each-packed-object (2015-06-22) 1 commit
64 (merged to 'next' on 2015-06-24 at 162e134)
65 + for_each_packed_object: automatically open pack index
66 (this branch is used by jk/cat-file-batch-all.)
68 The for_each_packed_object() API function did not iterate over
69 objects in a packfile that hasn't been used yet.
72 * jk/pretty-encoding-doc (2015-06-17) 1 commit
73 (merged to 'next' on 2015-07-09 at f61edd3)
74 + docs: clarify that --encoding can produce invalid sequences
79 * jk/rev-list-no-bitmap-while-pruning (2015-07-01) 1 commit
80 (merged to 'next' on 2015-07-09 at 81d6d1b)
81 + rev-list: disable --use-bitmap-index when pruning commits
83 A minor bugfix when pack bitmap is used with "rev-list --count".
86 * ls/hint-rev-list-count (2015-07-01) 1 commit
87 (merged to 'next' on 2015-07-09 at 84139dc)
88 + rev-list: add --count to usage guide
91 * mm/branch-doc-updates (2015-07-06) 2 commits
92 (merged to 'next' on 2015-07-09 at 4b0fa63)
93 + Documentation/branch: document -M and -D in terms of --force
94 + Documentation/branch: document -d --force and -m --force
97 * nd/dwim-wildcards-as-pathspecs (2015-07-01) 1 commit
98 (merged to 'next' on 2015-07-09 at a376360)
99 + Add tests for wildcard "path vs ref" disambiguation
101 Test updates to a topic already in 2.5-rc.
104 * rh/test-color-avoid-terminfo-in-original-home (2015-06-17) 2 commits
105 (merged to 'next' on 2015-06-24 at 6af5fa7)
106 + test-lib.sh: fix color support when tput needs ~/.terminfo
107 + Revert "test-lib.sh: do tests for color support after changing HOME"
109 An ancient test framework enhancement to allow color was not
110 entirely correct; this makes it work even when tput needs to read
111 from the ~/.terminfo under the user's real HOME directory.
114 * sb/p5310-and-chain (2015-06-26) 1 commit
115 (merged to 'next' on 2015-07-09 at c54ee67)
116 + p5310: Fix broken && chain in performance test
121 * tb/checkout-doc (2015-06-17) 1 commit
122 (merged to 'next' on 2015-07-09 at 74226c9)
123 + git-checkout.txt: document "git checkout <pathspec>" better
127 --------------------------------------------------
130 * dt/log-follow-config (2015-07-09) 1 commit
131 (merged to 'next' on 2015-07-10 at b8fbb43)
132 + log: add "log.follow" configuration variable
134 Add a new configuration variable to enable "--follow" automatically
135 when "git log" is run with one pathspec argument.
137 Will merge to 'master'.
140 * ss/clone-guess-dir-name-simplify (2015-07-09) 1 commit
141 (merged to 'next' on 2015-07-10 at 8a62f4d)
142 + clone: simplify string handling in guess_dir_name()
144 Will merge to 'master'.
147 * kn/tag-doc-fix (2015-07-10) 1 commit
148 - Documentation/tag: remove double occurance of "<pattern>"
150 Will merge to 'next'.
153 * se/doc-checkout-ours-theirs (2015-07-10) 1 commit
154 - checkout: document subtlety around --ours/--theirs
156 A "rebase" replays changes of the local branch on top of something
157 else, as such they are placed in stage #3 and referred to as
158 "theirs", while the changes in the new base, typically a foreign
159 work, are placed in stage #2 and referred to as "ours". Clarify
160 the "checkout --ours/--theirs".
162 --------------------------------------------------
165 * sg/config-name-only (2015-05-28) 3 commits
166 - completion: use new 'git config' options to reliably list variable names
168 - config: add options to list only variable names
170 "git config --list" output was hard to parse when values consist of
171 multiple lines. Introduce a way to show only the keys.
173 Adding a single --name-only option may be a better way to go than
174 adding two new options.
179 * kk/log-merges-config (2015-04-21) 5 commits
180 - bash-completion: add support for git-log --merges= and log.merges
181 - t4202-log: add tests for --merges=
182 - Documentation: add git-log --merges= option and log.merges config. var
183 - log: honor log.merges= option
184 - revision: add --merges={show|only|hide} option
186 "git log" (but not other commands in the "log" family) learned to
187 pay attention to the log.merges configuration variable that can be
188 set to "show" (the normal behaviour), "only" (hide non-merge
189 commits), or "hide" (hide merge commits). --merges=(show|only|hide)
190 can be used to override the setting from the command line.
192 The documentation may need to be updated once more ($gmane/267250).
193 Waiting for a reroll.
196 * mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
197 - t/lib-git-svn: check same httpd module dirs as lib-httpd
198 - t/lib-httpd: load mod_unixd
200 This is the first two commits in a three-patch series $gmane/266962
202 with updated log message ($gmane/268061).
205 * mh/numparse (2015-03-19) 14 commits
206 - diff_opt_parse(): use convert_i() when handling --abbrev=<num>
207 - diff_opt_parse(): use convert_i() when handling "-l<num>"
208 - opt_arg(): simplify pointer handling
209 - opt_arg(): report errors parsing option values
210 - opt_arg(): use convert_i() in implementation
211 - opt_arg(): val is always non-NULL
212 - builtin_diff(): detect errors when parsing --unified argument
213 - handle_revision_opt(): use convert_ui() when handling "--abbrev="
214 - strtoul_ui(), strtol_i(): remove functions
215 - handle_revision_opt(): use convert_i() when handling "-<digit>"
216 - handle_revision_opt(): use skip_prefix() in many places
217 - write_subdirectory(): use convert_ui() for parsing mode
218 - cacheinfo_callback(): use convert_ui() when handling "--cacheinfo"
219 - numparse: new module for parsing integral numbers
221 Many codepaths use unchecked use of strtol() and friends (or even
222 worse, atoi()). Introduce a set of wrappers that try to be more
229 * tf/gitweb-project-listing (2015-03-19) 5 commits
230 - gitweb: make category headings into links when they are directories
231 - gitweb: optionally set project category from its pathname
232 - gitweb: add a link under the search box to clear a project filter
233 - gitweb: if the PATH_INFO is incomplete, use it as a project_filter
234 - gitweb: fix typo in man page
236 Update gitweb to make it more pleasant to deal with a hierarchical
237 forest of repositories.
239 Any comments from those who use or have their own code in Gitweb?
242 * jc/a-lone-dash-stands-for-previous-branch (2015-03-16) 1 commit
243 - "-" and "@{-1}" on various programs
245 Lose special case code to make a lone dash "-" mean the previous
246 branch aka "@{-1}" from a handful subcommands, and instead support
247 the notation throughout the system by reimplementing it at the
250 Needs tests, documentation updates, etc. Also does only a half-way
251 job dealing with range notation, which needs to be fixed before the
252 series goes anywhere.
255 * nd/list-files (2015-02-09) 21 commits
256 - t3080: tests for git-list-files
257 - list-files: -M aka diff-cached
258 - list-files -F: show submodules with the new indicator '&'
259 - list-files: add -F/--classify
260 - list-files: show directories as well as files
261 - list-files: do not show duplicate cached entries
262 - list-files: sort output and remove duplicates
263 - list-files: add -t back
264 - list-files: add -1 short for --no-column
265 - list-files: add -R/--recursive short for --max-depth=-1
266 - list-files: -u does not imply showing stages
267 - list-files: make alias 'ls' default to 'list-files'
268 - list-files: a user friendly version of ls-files and more
269 - ls-files: support --max-depth
270 - ls-files: add --column
271 - ls-files: add --color to highlight file names
272 - ls-files: buffer full item in strbuf before printing
273 - ls_colors.c: highlight submodules like directories
274 - ls_colors.c: add a function to color a file name
275 - ls_colors.c: parse color.ls.* from config file
276 - ls_colors.c: add $LS_COLORS parsing code
278 A new "git list-files" Porcelain command, "ls-files" with bells and
281 Reroll to base on wt-status work ($gmane/265142) has seen some
282 positive discussions.
284 Waiting for a further polished reroll ($gmane/265534).
287 * nd/pathspec-strip-fix (2015-04-18) 1 commit
288 - pathspec: adjust prefixlen after striping trailing slash
290 Does not quite fix ($gmane/267614).
294 * jc/diff-b-m (2015-02-23) 5 commits
297 - diffcore-rename: allow easier debugging
298 - diffcore-rename.c: add locate_rename_src()
299 - diffcore-break: allow debugging
301 "git diff -B -M" produced incorrect patch when the postimage of a
302 completely rewritten file is similar to the preimage of a removed
303 file; such a resulting file must not be expressed as a rename from
306 The fix in this patch is broken, unfortunately.
309 * pw/remote-set-url-fetch (2014-11-26) 1 commit
310 - remote: add --fetch and --both options to set-url
315 * tr/remerge-diff (2014-11-10) 9 commits
316 - t4213: avoid "|" in sed regexp
317 - log --remerge-diff: show what the conflict resolution changed
318 - name-hash: allow dir hashing even when !ignore_case
319 - merge-recursive: allow storing conflict hunks in index
320 - merge_diff_mode: fold all merge diff variants into an enum
321 - combine-diff: do not pass revs->dense_combined_merges redundantly
322 - merge-recursive: -Xindex-only to leave worktree unchanged
323 - merge-recursive: internal flag to avoid touching the worktree
324 - merge-recursive: remove dead conditional in update_stages()
326 "log -p" output learns a new way to let users inspect a merge
327 commit by showing the differences between the automerged result
328 with conflicts the person who recorded the merge would have seen
329 and the final conflict resolution that was recorded in the merge.
331 Waiting for a reroll.
335 * tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
336 - perf-lib: add test_perf_cleanup target
337 - perf-lib: split starting the test from the execution
339 Add test_perf_cleanup shell function to the perf suite, that allows
340 the script writers to define a test with a clean-up action.
345 * jc/show-branch (2014-03-24) 5 commits
346 - show-branch: use commit slab to represent bitflags of arbitrary width
347 - show-branch.c: remove "all_mask"
348 - show-branch.c: abstract out "flags" operation
349 - show-branch.c: lift all_mask/all_revs to a global static
350 - show-branch.c: update comment style
352 Waiting for the final step to lift the hard-limit.
354 --------------------------------------------------
357 * es/worktree-add (2015-07-07) 23 commits
358 (merged to 'next' on 2015-07-10 at 304e329)
359 + checkout: retire --ignore-other-worktrees in favor of --force
360 + worktree: add: auto-vivify new branch when <branch> is omitted
361 + worktree: add: make -b/-B default to HEAD when <branch> is omitted
362 + worktree: extract basename computation to new function
363 + checkout: require worktree unconditionally
364 + checkout: retire --to option
365 + tests: worktree: retrofit "checkout --to" tests for "worktree add"
366 + worktree: add -b/-B options
367 + worktree: add --detach option
368 + worktree: add --force option
369 + worktree: introduce "add" command
370 + checkout: drop 'checkout_opts' dependency from prepare_linked_checkout
371 + checkout: make --to unconditionally verbose
372 + checkout: prepare_linked_checkout: drop now-unused 'new' argument
373 + checkout: relocate --to's "no branch specified" check
374 + checkout: fix bug with --to and relative HEAD
375 + Documentation/git-worktree: add EXAMPLES section
376 + Documentation/git-worktree: add high-level 'lock' overview
377 + Documentation/git-worktree: split technical info from general description
378 + Documentation/git-worktree: add BUGS section
379 + Documentation: move linked worktree description from checkout to worktree
380 + Documentation/git-worktree: associate options with commands
381 + Documentation/git-checkout: fix incorrect worktree prune command
382 (this branch uses nd/multiple-work-trees.)
384 Update to the "linked checkout" in 2.5.0-rc1.
386 Instead of "checkout --to" that does not do what "checkout"
387 normally does, move the functionality to "git worktree add".
389 Will merge to 'master'.
392 * jc/unexport-git-pager-in-use-in-pager (2015-07-03) 1 commit
393 (merged to 'next' on 2015-07-09 at bff19cd)
394 + pager: do not leak "GIT_PAGER_IN_USE" to the pager
396 When you say "!<ENTER>" while running say "git log", you'd confuse
397 yourself in the resulting shell, that may look as if you took
398 control back to the original shell you spawned "git log" from but
399 that isn't what is happening. To that new shell, we leaked
400 GIT_PAGER_IN_USE environment variable that was meant as a local
401 communication between the original "Git" and subprocesses that was
402 spawned by it after we launched the pager, which caused many
403 "interesting" things to happen, e.g. "git diff | cat" still paints
404 its output in color by default.
406 Stop leaking that environment variable to the pager's half of the
407 fork; we only need it on "Git" side when we spawn the pager.
409 Will merge to 'master'.
412 * mh/strbuf-read-file-returns-ssize-t (2015-07-03) 1 commit
413 (merged to 'next' on 2015-07-09 at 0d8544e)
414 + strbuf: strbuf_read_file() should return ssize_t
416 Avoid possible ssize_t to int truncation.
418 Will merge to 'master'.
421 * pt/am-tests (2015-07-07) 12 commits
422 - t3901: test git-am encoding conversion
423 - t3418: non-interactive rebase --continue with rerere enabled
424 - t4150: tests for am --[no-]scissors
425 - t4150: am with post-applypatch hook
426 - t4150: am with pre-applypatch hook
427 - t4150: am with applypatch-msg hook
428 - t4150: am --resolved fails if index has unmerged entries
429 - t4150: am --resolved fails if index has no changes
430 - t4150: am refuses patches when paused
431 - t4151: am --abort will keep dirty index intact
432 - t4150: am fails if index is dirty
433 - t4150: am.messageid really adds the message id
435 Sprinkle a few test prereqs ($gmane/273709)?
440 * kn/for-each-tag-branch (2015-07-07) 11 commits
441 - for-each-ref: add '--contains' option
442 - ref-filter: implement '--contains' option
443 - parse-options.h: add macros for '--contains' option
444 - parse-option: rename parse_opt_with_commit()
445 - for-each-ref: add '--merged' and '--no-merged' options
446 - ref-filter: implement '--merged' and '--no-merged' options
447 - ref-filter: add parse_opt_merge_filter()
448 - for-each-ref: add '--points-at' option
449 - ref-filter: implement '--points-at' option
450 - tag: libify parse_opt_points_at()
451 - t6302: for-each-ref tests for ref-filter APIs
452 (this branch uses kn/for-each-ref.)
454 Sprinkle a few test prereqs ($gmane/273652)?
459 * pt/am-builtin (2015-07-08) 47 commits
460 - builtin-am: remove redirection to git-am.sh
461 - builtin-am: check for valid committer ident
462 - builtin-am: implement legacy -b/--binary option
463 - builtin-am: implement -i/--interactive
464 - builtin-am: support and auto-detect mercurial patches
465 - builtin-am: support and auto-detect StGit series files
466 - builtin-am: support and auto-detect StGit patches
467 - builtin-am: rerere support
468 - builtin-am: invoke post-applypatch hook
469 - builtin-am: invoke pre-applypatch hook
470 - builtin-am: invoke applypatch-msg hook
471 - builtin-am: support automatic notes copying
472 - builtin-am: invoke post-rewrite hook
473 - builtin-am: implement -S/--gpg-sign, commit.gpgsign
474 - builtin-am: implement --committer-date-is-author-date
475 - builtin-am: implement --ignore-date
476 - builtin-am: pass git-apply's options to git-apply
477 - builtin-am: implement --[no-]scissors
478 - builtin-am: support --keep-cr, am.keepcr
479 - builtin-am: implement --[no-]message-id, am.messageid
480 - builtin-am: implement -k/--keep, --keep-non-patch
481 - builtin-am: implement -u/--utf8
482 - builtin-am: handle stray state directory
483 - fixup! builtin-am: bypass git-mailinfo when --rebasing
484 - builtin-am: bypass git-mailinfo when --rebasing
485 - builtin-am: implement --rebasing mode
486 - builtin-am: implement --3way, am.threeWay
487 - cache-tree: introduce write_index_as_tree()
488 - builtin-am: implement -s/--signoff
489 - builtin-am: exit with user friendly message on failure
490 - builtin-am: implement -q/--quiet
491 - builtin-am: reject patches when there's a session in progress
492 - builtin-am: implement --abort
493 - builtin-am: implement --skip
494 - builtin-am: implement --resolved/--continue
495 - builtin-am: refuse to apply patches if index is dirty
496 - builtin-am: implement committing applied patch
497 - builtin-am: apply patch with git-apply
498 - fixup! builtin-am: extract patch and commit info with git-mailinfo
499 - builtin-am: extract patch and commit info with git-mailinfo
500 - builtin-am: auto-detect mbox patches
501 - builtin-am: split out mbox/maildir patches with git-mailsplit
502 - builtin-am: implement patch queue mechanism
503 - builtin-am: implement skeletal builtin am
504 - wrapper: implement xfopen()
505 - wrapper: implement xopen()
506 - Merge branch 'pt/pull-builtin' into pt/am-builtin
507 (this branch uses pt/pull-builtin.)
511 Looks more-or-less ready. Any reroll needed other than squashing
515 * ad/bisect-cleanup (2015-06-29) 6 commits
516 (merged to 'next' on 2015-07-09 at 75e2a06)
517 + bisect: don't mix option parsing and non-trivial code
518 + bisect: simplify the addition of new bisect terms
519 + bisect: replace hardcoded "bad|good" by variables
520 + Documentation/bisect: revise overall content
521 + Documentation/bisect: move getting help section to the end
522 + bisect: correction of typo
523 (this branch is used by ad/bisect-terms.)
525 Code and documentation clean-up to "git bisect".
527 Will merge to 'master'.
530 * kb/config-unmap-before-renaming (2015-06-30) 1 commit
531 (merged to 'next' on 2015-07-10 at 6b89478)
532 + config.c: fix writing config files on Windows network shares
534 Will merge to 'master'.
537 * mh/fast-import-get-mark (2015-07-01) 1 commit
538 - fast-import: add a get-mark command
540 Will merge to 'next'.
543 * kb/i18n-doc (2015-07-01) 1 commit
544 (merged to 'next' on 2015-07-09 at a12c7b3)
545 + Documentation/i18n.txt: clarify character encoding support
547 Will merge to 'master'.
550 * kb/use-nsec-doc (2015-07-01) 1 commit
551 (merged to 'next' on 2015-07-09 at e7e5a05)
552 + Makefile / racy-git.txt: clarify USE_NSEC prerequisites
554 Will merge to 'master'.
557 * dt/refs-backend-preamble (2015-07-08) 8 commits
558 - git-stash: use update-ref --create-reflog instead of creating files
559 - update-ref and tag: add --create-reflog arg
560 - git-reflog: add exists command
561 - refs: new public ref function: safe_create_reflog
562 - refs: Break out check for reflog autocreation
563 - bisect: treat BISECT_HEAD as a ref
564 - cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs
565 - refs.c: add err arguments to reflog functions
567 In preparation for allowing different "backends" to store the refs
568 in a way different from the traditional "one ref per file in $GIT_DIR
569 or in a $GIT_DIR/packed-refs file" filesystem storage, reduce
570 direct filesystem access to ref-like things like CHERRY_PICK_HEAD
571 from scripts and programs.
573 Still under discussion.
578 * et/http-proxyauth (2015-06-29) 1 commit
579 (merged to 'next' on 2015-07-09 at cf80874)
580 + http: always use any proxy auth method available
582 We used to ask libCURL to use the most secure authentication method
583 available when talking to an HTTP proxy only when we were told to
584 talk to one via configuration variables. We now ask libCURL to
585 always use the most secure authentication method, because the user
586 can tell libCURL to use an HTTP proxy via an environment variable
587 without using configuration variables.
589 An extra set of eyes appreciated, but I think this is ready.
591 Will merge to 'master'.
594 * jc/fsck-retire-require-eoh (2015-06-28) 1 commit
595 (merged to 'next' on 2015-07-09 at dbc292b)
596 + fsck: it is OK for a tag and a commit to lack the body
598 A fix to a minor regression to "git fsck" in v2.2 era that started
599 complaining about a body-less tag object when it lacks a separator
600 empty line after its header to separate it with a non-existent body.
602 Will merge to 'master'.
605 * jk/date-mode-format (2015-06-29) 3 commits
606 (merged to 'next' on 2015-07-09 at a01bfc3)
607 + introduce "format" date-mode
608 + convert "enum date_mode" into a struct
609 + show-branch: use DATE_RELATIVE instead of magic number
611 Teach "git log" and friends a new "--date=format:..." option to
612 format timestamps using system's strftime(3).
614 Will merge to 'master'.
617 * jk/still-interesting (2015-06-29) 1 commit
618 (merged to 'next' on 2015-07-09 at e19fc0e)
619 + revision.c: remove unneeded check for NULL
623 Will merge to 'master'.
626 * nd/export-worktree (2015-06-26) 1 commit
627 (merged to 'next' on 2015-07-09 at 1581a9b)
628 + setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR
630 Running an aliased command from a subdirectory when the .git thing
631 in the working tree is a gitfile pointing elsewhere did not work.
633 Will merge to 'master'.
636 * jc/rerere (2015-07-06) 19 commits
637 . t4200: rerere a merge with two identical conflicts
638 . rerere: un-nest merge() further
639 . rerere: use "struct rerere_id" instead of "char *" for conflict ID
640 - rerere: call conflict-ids IDs
641 - rerere: further clarify do_rerere_one_path()
642 - rerere: further de-dent do_plain_rerere()
643 - rerere: refactor "replay" part of do_plain_rerere()
644 - rerere: explain the remainder
645 - rerere: explain "rerere forget" codepath
646 - rerere: explain the primary codepath
647 - rerere: explain MERGE_RR management helpers
648 - rerere: explain the rerere I/O abstraction
649 - rerere: stop looping unnecessarily
650 - rerere: drop want_sp parameter from is_cmarker()
651 - rerere: report autoupdated paths only after actually updating them
652 - rerere: write out each record of MERGE_RR in one go
653 - rerere: lift PATH_MAX limitation
654 - rerere: plug conflict ID leaks
655 - rerere: fix an off-by-one non-bug
657 Code clean-up and minor fixes (so far).
660 * ad/bisect-terms (2015-06-29) 4 commits
661 - bisect: allow setting any user-specified in 'git bisect start'
662 - bisect: add 'git bisect terms' to view the current terms
663 - bisect: add the terms old/new
664 - bisect: sanity check on terms
665 (this branch uses ad/bisect-cleanup.)
667 The use of 'good/bad' in "git bisect" made it confusing to use when
668 hunting for a state change that is not a regression (e.g. bugfix).
669 The command learned 'old/new' and then allows the end user to
670 say e.g. "bisect start --term-old=fast --term=new=slow" to find a
671 performance regression.
673 Michael's idea to make 'good/bad' more intelligent does have
674 certain attractiveness ($gname/272867), and makes some of the work
675 on this topic a moot point.
680 * mh/tempfile (2015-06-10) 14 commits
681 - credential-cache--daemon: use tempfile module
682 - credential-cache--daemon: delete socket from main()
683 - gc: use tempfile module to handle gc.pid file
684 - lock_repo_for_gc(): compute the path to "gc.pid" only once
685 - diff: use tempfile module
686 - setup_temporary_shallow(): use tempfile module
687 - write_shared_index(): use tempfile module
688 - register_tempfile(): new function to handle an existing temporary file
689 - tempfile: add several functions for creating temporary files
690 - register_tempfile_object(): new function, extracted from create_tempfile()
691 - commit_lock_file(): use get_locked_file_path()
692 - lockfile: remove some redundant functions
693 - tempfile: a new module for handling temporary files
694 - Move lockfile API documentation to lockfile.h
696 Rebuild "lockfile" API on top of a new "tempfile" API.
697 This needs rerolling, to include "tempfile.h" in "lockfile.h", at
704 * js/fsck-opt (2015-06-23) 19 commits
705 (merged to 'next' on 2015-07-10 at eb4da0a)
706 + fsck: support ignoring objects in `git fsck` via fsck.skiplist
707 + fsck: git receive-pack: support excluding objects from fsck'ing
708 + fsck: introduce `git fsck --connectivity-only`
709 + fsck: support demoting errors to warnings
710 + fsck: document the new receive.fsck.<msg-id> options
711 + fsck: allow upgrading fsck warnings to errors
712 + fsck: optionally ignore specific fsck issues completely
713 + fsck: disallow demoting grave fsck errors to warnings
714 + fsck: add a simple test for receive.fsck.<msg-id>
715 + fsck: make fsck_tag() warn-friendly
716 + fsck: handle multiple authors in commits specially
717 + fsck: make fsck_commit() warn-friendly
718 + fsck: make fsck_ident() warn-friendly
719 + fsck: report the ID of the error/warning
720 + fsck (receive-pack): allow demoting errors to warnings
721 + fsck: offer a function to demote fsck errors to warnings
722 + fsck: provide a function to parse fsck message IDs
723 + fsck: introduce identifiers for fsck messages
724 + fsck: introduce fsck options
726 Allow ignoring fsck errors on specific set of known-to-be-bad
727 objects, and also tweaking warning level of various kinds of non
728 critical breakages reported.
730 Will merge to 'master'.
733 * js/rebase-i-clean-up-upon-continue-to-skip (2015-06-29) 2 commits
734 (merged to 'next' on 2015-07-09 at b844d9a)
735 + rebase -i: do not leave a CHERRY_PICK_HEAD file behind
736 + t3404: demonstrate CHERRY_PICK_HEAD bug
738 Abandoning an already applied change in "git rebase -i" with
739 "--continue" left CHERRY_PICK_HEAD and confused later steps.
741 Will merge to 'master'.
744 * ak/format-patch-odir-config (2015-06-19) 1 commit
745 - format-patch: introduce format.outputDirectory configuration
747 Reroll exists but didn't pick it up as it seems to be still
748 collecting review comments.
754 * bc/gpg-verify-raw (2015-06-22) 7 commits
755 (merged to 'next' on 2015-06-24 at 08a1164)
756 + verify-tag: add option to print raw gpg status information
757 + verify-commit: add option to print raw gpg status information
758 + gpg: centralize printing signature buffers
759 + gpg: centralize signature check
760 + verify-commit: add test for exit status on untrusted signature
761 + verify-tag: share code with verify-commit
762 + verify-tag: add tests
764 "git verify-tag" and "git verify-commit" have been taught to share
765 more code, and then learned to optionally show the verification
766 message from the underlying GPG implementation.
768 Will merge to 'master'.
771 * cb/parse-magnitude (2015-06-22) 2 commits
772 (merged to 'next' on 2015-06-24 at 2fd7205)
773 + parse-options: move unsigned long option parsing out of pack-objects.c
774 + test-parse-options: update to handle negative ints
776 Move machinery to parse human-readable scaled numbers like 1k, 4M,
777 and 2G as an option parameter's value from pack-objects to
778 parse-options API, to make it available to other codepaths.
780 Will merge to 'master'.
783 * jk/cat-file-batch-all (2015-06-26) 8 commits
784 (merged to 'next' on 2015-07-10 at 80200cc)
785 + cat-file: sort and de-dup output of --batch-all-objects
786 + cat-file: add --batch-all-objects option
787 + cat-file: split batch_one_object into two stages
788 + cat-file: stop returning value from batch_one_object
789 + cat-file: add --buffer option
790 + cat-file: move batch_options definition to top of file
791 + cat-file: minor style fix in options list
792 + Merge branch 'jk/maint-for-each-packed-object' into jk/cat-file-batch-all
794 "cat-file" learned "--batch-all-objects" option to enumerate all
795 available objects in the repository more quickly than "rev-list
796 --all --objects" (the output includes unreachable objects, though).
798 Will merge to 'master'.
801 * jk/pkt-log-pack (2015-06-16) 3 commits
802 (merged to 'next' on 2015-07-10 at ba33212)
803 + pkt-line: support tracing verbatim pack contents
804 + pkt-line: tighten sideband PACK check when tracing
805 + pkt-line: simplify starts_with checks in packet tracing
807 Enhance packet tracing machinery to allow capturing an incoming
808 pack data to a file for debugging.
810 Will merge to 'master'.
813 * kn/for-each-ref (2015-06-15) 11 commits
814 (merged to 'next' on 2015-06-24 at 1a3a734)
815 + ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname
816 + for-each-ref: introduce filter_refs()
817 + ref-filter: move code from 'for-each-ref'
818 + ref-filter: add 'ref-filter.h'
819 + for-each-ref: rename variables called sort to sorting
820 + for-each-ref: rename some functions and make them public
821 + for-each-ref: introduce 'ref_array_clear()'
822 + for-each-ref: introduce new structures for better organisation
823 + for-each-ref: rename 'refinfo' to 'ref_array_item'
824 + for-each-ref: clean up code
825 + for-each-ref: extract helper functions out of grab_single_ref()
826 (this branch is used by kn/for-each-tag-branch.)
828 GSoC project to rebuild ref listing by branch and tag based on the
829 for-each-ref machinery. This is its first part.
831 Will merge to 'master'.
834 * mh/init-delete-refs-api (2015-06-22) 19 commits
835 (merged to 'next' on 2015-07-10 at 121b26e)
836 + delete_ref(): use the usual convention for old_sha1
837 + cmd_update_ref(): make logic more straightforward
838 + update_ref(): don't read old reference value before delete
839 + check_branch_commit(): make first parameter const
840 + refs.h: add some parameter names to function declarations
841 + refs: move the remaining ref module declarations to refs.h
842 + initial_ref_transaction_commit(): check for ref D/F conflicts
843 + initial_ref_transaction_commit(): check for duplicate refs
844 + refs: remove some functions from the module's public interface
845 + initial_ref_transaction_commit(): function for initial ref creation
846 + repack_without_refs(): make function private
847 + prune_refs(): use delete_refs()
848 + prune_remote(): use delete_refs()
849 + delete_refs(): bail early if the packed-refs file cannot be rewritten
850 + delete_refs(): make error message more generic
851 + delete_refs(): new function for the refs API
852 + delete_ref(): handle special case more explicitly
853 + remove_branches(): remove temporary
854 + delete_ref(): move declaration to refs.h
856 Clean up refs API and make "git clone" less intimate with the
857 implementation detail.
859 Will merge to 'master'.
862 * mh/replace-refs (2015-06-12) 1 commit
863 (merged to 'next' on 2015-06-24 at cb13adf)
864 + Allow to control where the replace refs are looked for
866 Add an environment variable to tell Git to look into refs hierarchy
867 other than refs/replace/ for the object replacement data.
870 * nd/multiple-work-trees (2015-06-29) 2 commits
871 (merged to 'next' on 2015-06-29 at fd4eb60)
872 + worktree: new place for "git prune --worktrees"
873 (merged to 'next' on 2015-06-24 at 7c3f918)
874 + checkout: don't check worktrees when not necessary
875 (this branch is used by es/worktree-add.)
877 "git checkout [<tree-ish>] <paths>" spent unnecessary cycles
878 checking if the current branch was checked out elsewhere, when we
879 know we are not switching the branches ourselves.
882 * gp/status-rebase-i-info (2015-07-06) 4 commits
883 (merged to 'next' on 2015-07-10 at b121298)
884 + status: add new tests for status during rebase -i
885 + status: give more information during rebase -i
886 + status: differentiate interactive from non-interactive rebases
887 + status: factor two rebase-related messages together
889 Teach "git status" to show a more detailed information regarding
890 the "rebase -i" session in progress.
892 Will merge to 'master'.
895 * mk/utf8-no-iconv-warn (2015-06-08) 1 commit
896 - utf8.c: print warning about disabled iconv
898 Warn when a reencoding is requested in a build without iconv
899 support, as the end user is likely to get an unexpected result. I
900 think the same level of safety should be added to a build with
901 iconv support when the specified encoding is not available, but the
902 patch does not go there.
907 * mr/rebase-i-customize-insn-sheet (2015-06-15) 1 commit
908 (merged to 'next' on 2015-07-10 at ec383cd)
909 + git-rebase--interactive.sh: add config option for custom instruction format
911 "git rebase -i"'s list of todo is made configurable.
913 Will merge to 'master'.
916 * pt/am-foreign (2015-06-15) 5 commits
917 (merged to 'next' on 2015-06-24 at 838c702)
918 + am: teach mercurial patch parser how to read from stdin
919 + am: use gmtime() to parse mercurial patch date
920 + t4150: test applying StGit series
921 + am: teach StGit patch parser how to read from stdin
922 + t4150: test applying StGit patch
924 Various enhancements around "git am" reading patches generated by
928 * pt/pull-builtin (2015-06-18) 19 commits
929 (merged to 'next' on 2015-07-10 at 07b1794)
930 + pull: remove redirection to git-pull.sh
931 + pull --rebase: error on no merge candidate cases
932 + pull --rebase: exit early when the working directory is dirty
933 + pull: configure --rebase via branch.<name>.rebase or pull.rebase
934 + pull: teach git pull about --rebase
935 + pull: set reflog message
936 + pull: implement pulling into an unborn branch
937 + pull: fast-forward working tree if head is updated
938 + pull: check if in unresolved merge state
939 + pull: support pull.ff config
940 + pull: error on no merge candidates
941 + pull: pass git-fetch's options to git-fetch
942 + pull: pass git-merge's options to git-merge
943 + pull: pass verbosity, --progress flags to fetch and merge
944 + pull: implement fetch + merge
945 + pull: implement skeletal builtin pull
946 + argv-array: implement argv_array_pushv()
947 + parse-options-cb: implement parse_opt_passthru_argv()
948 + parse-options-cb: implement parse_opt_passthru()
949 (this branch is used by pt/am-builtin.)
951 Reimplement 'git pull' in C.
953 Will merge to 'master'.
956 * rl/send-email-aliases (2015-07-07) 10 commits
957 (merged to 'next' on 2015-07-09 at c60553d)
958 + send-email: suppress meaningless whitespaces in from field
959 + send-email: allow multiple emails using --cc, --to and --bcc
960 + send-email: consider quote as delimiter instead of character
961 + send-email: reduce dependencies impact on parse_address_line
962 + send-email: minor code refactoring
963 + send-email: allow use of aliases in the From field of --compose mode
964 + send-email: refactor address list process
965 + t9001-send-email: refactor header variable fields replacement
966 + send-email: allow aliases in patch header and command script outputs
967 + t9001-send-email: move script creation in a setup test
969 "git send-email" now performs alias-expansion on names that are
970 given via --cccmd, etc.
972 This round comes with a lot more enhanced e-mail address parser,
973 which makes it a bit scary, but as long as it works as designed, it
974 makes it wonderful ;-).
976 Will merge to 'master'.
979 * wp/sha1-name-negative-match (2015-06-08) 2 commits
980 - sha1_name.c: introduce '^{/!-<negative pattern>}' notation
981 - test for '!' handling in rev-parse's named commits
983 Introduce "branch^{/!-<pattern>}" notation to name a commit
984 reachable from branch that does not match the given pattern.
989 * bc/object-id (2015-06-17) 10 commits
990 . remote.c: use struct object_id in many functions
991 . object-id: use struct object_id in struct object
992 . remote.c: use struct object_id in ref_newer()
993 . transport-helper.c: use struct object_id in push_refs_with_export()
994 . connect.c: use struct object_id in get_remote_heads()
995 . remote-curl: use struct object_id in parse_fetch()
996 . fetch-pack: use struct object_id in add_sought_entry_mem()
997 . object_id: convert struct ref to use object_id.
998 . sha1_file: introduce has_object_file() helper
999 . refs: convert some internal functions to use object_id
1001 More transition from "unsigned char[40]" to "struct object_id".
1003 While GSoC and other topics are actively moving existing code
1004 around, this cannot go in; ejected from 'pu'.
1007 * jk/log-missing-default-HEAD (2015-06-03) 1 commit
1008 - log: diagnose empty HEAD more clearly
1010 "git init empty && git -C empty log" said "bad default revision 'HEAD'",
1011 which was found to be a bit confusing to new users.
1013 What's the status of this one?
1016 * gr/rebase-i-drop-warn (2015-06-30) 3 commits
1017 - git rebase -i: add static check for commands and SHA-1
1018 - git rebase -i: warn about removed commits
1019 - git-rebase -i: add command "drop" to remove a commit
1021 Add "drop commit-object-name subject" command as another way to
1022 skip replaying of a commit in "rebase -i", and then punish those
1023 who do not use it (and instead just remove the lines) by throwing
1026 Will merge to 'next'.
1029 * jh/strbuf-read-use-read-in-full (2015-06-01) 1 commit
1030 - strbuf_read(): skip unnecessary strbuf_grow() at eof
1032 Avoid one extra iteration and strbuf_grow() of 8kB in
1035 Looked reasonable; perhaps a log message clarification is needed.
1040 * mg/index-read-error-messages (2015-06-01) 2 commits
1041 - messages: uniform error messages for index write
1042 - show-index: uniform error messages for index read
1048 * hv/submodule-config (2015-06-15) 4 commits
1049 - do not die on error of parsing fetchrecursesubmodules option
1050 - use new config API for worktree configurations of submodules
1051 - extract functions for submodule config set and lookup
1052 - implement submodule config API for lookup of .gitmodules values
1054 The gitmodules API accessed from the C code learned to cache stuff
1057 Needs another reroll? ($gmane/273743).
1060 * jc/push-tags-also (2015-05-29) 1 commit
1061 - push --tags: push tags *in addition to* other stuff
1063 "git fetch --tags" learned to fetch tags in addition to other stuff
1064 a few years ago, but "git push --tags" didn't. Now it does.
1066 A change to push out more than before always invites "what if the
1067 user makes a mistake" worries.
1072 * jc/commit-slab (2015-05-22) 1 commit
1073 - commit-slab: introduce slabname##_peek() function
1075 Memory use reduction when commit-slab facility is used to annotate
1076 sparsely (which is not recommended in the first place).
1078 Will merge to 'next'.
1081 * jc/clone-bundle (2015-04-30) 1 commit
1082 - repack: optionally create a clone.bundle
1084 Waiting for further work.
1088 * ee/clean-remove-dirs (2015-06-26) 6 commits
1089 (merged to 'next' on 2015-06-29 at d595659)
1090 + read_gitfile_gently: fix use-after-free
1091 (merged to 'next' on 2015-06-24 at 7c27821)
1092 + clean: improve performance when removing lots of directories
1093 + p7300: add performance tests for clean
1094 + t7300: add tests to document behavior of clean and nested git
1095 + setup: sanity check file size in read_gitfile_gently
1096 + setup: add gentle version of read_gitfile
1098 Replace "is this subdirectory a separate repository that should not
1099 be touched?" check "git clean" does by checking if it has .git/HEAD
1100 using the submodule-related code with a more optimized check.
1102 Will merge to 'master'.
1105 * jc/merge-drop-old-syntax (2015-04-29) 1 commit
1106 (merged to 'next' on 2015-05-28 at 6bfd8b9)
1107 + merge: drop 'git merge <message> HEAD <commit>' syntax
1109 Stop supporting "git merge <message> HEAD <commit>" syntax that
1110 has been deprecated since October 2007.
1112 Will keep in 'next' during the 2.5 cycle.