1 To: git@vger.kernel.org
3 Subject: What's cooking in git.git (Jul 2015, #04; Mon, 13)
4 X-master-at: 01977f46cb48e2894e335667eaabce274174ac5e
5 X-next-at: 96fd69be6df34ee40ec1cf02764f3ddd6e3f6a83
7 What's cooking in git.git (Jul 2015, #04; Mon, 13)
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 2.5.0-rc2 today, 2.5.0-rc3 next week today. We'll judge when to end
15 the cycle, reviewing what we have, at that point.
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 * es/worktree-add (2015-07-12) 24 commits
26 (merged to 'next' on 2015-07-12 at 4926868)
27 + Revert "checkout: retire --ignore-other-worktrees in favor of --force"
28 (merged to 'next' on 2015-07-10 at 304e329)
29 + checkout: retire --ignore-other-worktrees in favor of --force
30 + worktree: add: auto-vivify new branch when <branch> is omitted
31 + worktree: add: make -b/-B default to HEAD when <branch> is omitted
32 + worktree: extract basename computation to new function
33 + checkout: require worktree unconditionally
34 + checkout: retire --to option
35 + tests: worktree: retrofit "checkout --to" tests for "worktree add"
36 + worktree: add -b/-B options
37 + worktree: add --detach option
38 + worktree: add --force option
39 + worktree: introduce "add" command
40 + checkout: drop 'checkout_opts' dependency from prepare_linked_checkout
41 + checkout: make --to unconditionally verbose
42 + checkout: prepare_linked_checkout: drop now-unused 'new' argument
43 + checkout: relocate --to's "no branch specified" check
44 + checkout: fix bug with --to and relative HEAD
45 + Documentation/git-worktree: add EXAMPLES section
46 + Documentation/git-worktree: add high-level 'lock' overview
47 + Documentation/git-worktree: split technical info from general description
48 + Documentation/git-worktree: add BUGS section
49 + Documentation: move linked worktree description from checkout to worktree
50 + Documentation/git-worktree: associate options with commands
51 + Documentation/git-checkout: fix incorrect worktree prune command
52 (this branch is used by es/worktree-add-cleanup; uses nd/multiple-work-trees.)
54 Update to the "linked checkout" in 2.5.0-rc1.
56 Instead of "checkout --to" that does not do what "checkout"
57 normally does, move the functionality to "git worktree add".
59 As this makes the end-user experience of the "worktree add" more or
60 less complete, I am tempted to say we should cook the other topic
61 that removes the internal "new-worktree-mode" hack from "checkout"
62 a bit longer in 'next', and release 2.5 final without that one.
65 * et/http-proxyauth (2015-06-29) 1 commit
66 (merged to 'next' on 2015-07-09 at cf80874)
67 + http: always use any proxy auth method available
69 We used to ask libCURL to use the most secure authentication method
70 available when talking to an HTTP proxy only when we were told to
71 talk to one via configuration variables. We now ask libCURL to
72 always use the most secure authentication method, because the user
73 can tell libCURL to use an HTTP proxy via an environment variable
74 without using configuration variables.
77 * jc/fsck-retire-require-eoh (2015-06-28) 1 commit
78 (merged to 'next' on 2015-07-09 at dbc292b)
79 + fsck: it is OK for a tag and a commit to lack the body
81 A fix to a minor regression to "git fsck" in v2.2 era that started
82 complaining about a body-less tag object when it lacks a separator
83 empty line after its header to separate it with a non-existent body.
86 * jc/unexport-git-pager-in-use-in-pager (2015-07-03) 1 commit
87 (merged to 'next' on 2015-07-09 at bff19cd)
88 + pager: do not leak "GIT_PAGER_IN_USE" to the pager
90 When you say "!<ENTER>" while running say "git log", you'd confuse
91 yourself in the resulting shell, that may look as if you took
92 control back to the original shell you spawned "git log" from but
93 that isn't what is happening. To that new shell, we leaked
94 GIT_PAGER_IN_USE environment variable that was meant as a local
95 communication between the original "Git" and subprocesses that was
96 spawned by it after we launched the pager, which caused many
97 "interesting" things to happen, e.g. "git diff | cat" still paints
98 its output in color by default.
100 Stop leaking that environment variable to the pager's half of the
101 fork; we only need it on "Git" side when we spawn the pager.
104 * js/rebase-i-clean-up-upon-continue-to-skip (2015-06-29) 2 commits
105 (merged to 'next' on 2015-07-09 at b844d9a)
106 + rebase -i: do not leave a CHERRY_PICK_HEAD file behind
107 + t3404: demonstrate CHERRY_PICK_HEAD bug
109 Abandoning an already applied change in "git rebase -i" with
110 "--continue" left CHERRY_PICK_HEAD and confused later steps.
113 * kb/config-unmap-before-renaming (2015-06-30) 1 commit
114 (merged to 'next' on 2015-07-10 at 6b89478)
115 + config.c: fix writing config files on Windows network shares
117 "git config" failed to update the configuration file when the
118 underlying filesystem is incapable of renaming a file that is still
122 * kb/use-nsec-doc (2015-07-01) 1 commit
123 (merged to 'next' on 2015-07-09 at e7e5a05)
124 + Makefile / racy-git.txt: clarify USE_NSEC prerequisites
126 Clarify in the Makefile a guideline to decide use of USE_NSEC.
129 * mh/strbuf-read-file-returns-ssize-t (2015-07-03) 1 commit
130 (merged to 'next' on 2015-07-09 at 0d8544e)
131 + strbuf: strbuf_read_file() should return ssize_t
133 Avoid possible ssize_t to int truncation.
136 * nd/multiple-work-trees (2015-06-29) 2 commits
137 (merged to 'next' on 2015-06-29 at fd4eb60)
138 + worktree: new place for "git prune --worktrees"
139 (merged to 'next' on 2015-06-24 at 7c3f918)
140 + checkout: don't check worktrees when not necessary
141 (this branch is used by es/worktree-add and es/worktree-add-cleanup.)
143 "git checkout [<tree-ish>] <paths>" spent unnecessary cycles
144 checking if the current branch was checked out elsewhere, when we
145 know we are not switching the branches ourselves.
148 * ss/clone-guess-dir-name-simplify (2015-07-09) 1 commit
149 (merged to 'next' on 2015-07-10 at 8a62f4d)
150 + clone: simplify string handling in guess_dir_name()
154 --------------------------------------------------
157 * jc/diff-ws-error-highlight (2015-07-12) 1 commit
158 (merged to 'next' on 2015-07-12 at 15b60ce)
159 + diff: parse ws-error-highlight option more strictly
161 A hotfix to a new feature in 2.5.0-rc.
164 * es/worktree-add-cleanup (2015-07-13) 17 commits
165 - checkout: drop intimate knowledge of new worktree initial population
166 - worktree: populate via "git reset --hard" rather than "git checkout"
167 - worktree: avoid resolving HEAD unnecessarily
168 - worktree: make setup of new HEAD distinct from worktree population
169 - fixup! worktree: detect branch symref/detach and error conditions locally
170 - worktree: detect branch symref/detach and error conditions locally
171 - worktree: add_worktree: construct worktree-population command locally
172 - worktree: make branch creation distinct from worktree population
173 - worktree: make --detach mutually exclusive with -b/-B
174 - worktree: introduce options container
175 - worktree: simplify new branch (-b/-B) option checking
176 - branch: publish die_if_checked_out()
177 - checkout: generalize die_if_checked_out() branch name argument
178 - checkout: die_if_checked_out: simplify strbuf management
179 - checkout: improve die_if_checked_out() robustness
180 - checkout: name check_linked_checkouts() more meaningfully
181 - checkout: avoid resolving HEAD unnecessarily
183 Remove the "new-worktree-mode" hack in "checkout" that was added in
184 nd/multiple-work-trees topic by updating the implementation of new
187 Need to look at the fixup! more and then amend it. After that
188 will think if this should be part of 2.5 final. My current
189 thinking is we should ship 2.5 with es/worktree-add but not this
190 one, as the end-user experience would not change.
193 * ib/scripted-parse-opt-better-hint-string (2015-07-13) 1 commit
194 - rev-parse --parseopt: allow [*=?!] in argument hints
196 The "rev-parse --parseopt" mode parsed the option specification
197 and the argument hint in a strange way to allow '=' and other
198 special characters in the option name while forbidding them from
199 the argument hint. This made it impossible to define an option
200 like "--pair <key>=<value>" with "pair=key=value" specification,
201 which instead would have defined a "--pair=key <value>" option.
203 Will merge to 'next'.
206 * mh/fast-import-optimize-current-from (2015-07-13) 1 commit
207 - fast-import: do less work when given "from" matches current branch head
209 Often a fast-import stream builds a new commit on top of the
210 previous commit it built, and it often unconditionally emits a
211 "from" command to specify the first parent, which can be omitted in
212 such a case. This caused fast-import to forget the tree of the
213 previous commit and then re-read it from scratch, which was
214 inefficient. Optimize for this common case.
216 Will merge to 'next'.
219 * mh/notes-allow-reading-treeish (2015-07-13) 1 commit
220 - notes: allow treeish expressions as notes ref
222 Some "git notes" operations, e.g. "git log --notes=<note>", should
223 be able to read notes from any tree-ish that is shaped like a notes
224 tree, but the notes infrastructure required that the argument must
225 be a ref under refs/notes/. Loosen it to require a valid ref only
226 when the operation would update the notes (in which case we must
227 have a place to store the updated notes tree, iow, a ref).
229 Needs update to docs.
231 --------------------------------------------------
234 * sg/config-name-only (2015-05-28) 3 commits
235 - completion: use new 'git config' options to reliably list variable names
237 - config: add options to list only variable names
239 "git config --list" output was hard to parse when values consist of
240 multiple lines. Introduce a way to show only the keys.
242 Adding a single --name-only option may be a better way to go than
243 adding two new options.
248 * kk/log-merges-config (2015-04-21) 5 commits
249 - bash-completion: add support for git-log --merges= and log.merges
250 - t4202-log: add tests for --merges=
251 - Documentation: add git-log --merges= option and log.merges config. var
252 - log: honor log.merges= option
253 - revision: add --merges={show|only|hide} option
255 "git log" (but not other commands in the "log" family) learned to
256 pay attention to the log.merges configuration variable that can be
257 set to "show" (the normal behaviour), "only" (hide non-merge
258 commits), or "hide" (hide merge commits). --merges=(show|only|hide)
259 can be used to override the setting from the command line.
261 The documentation may need to be updated once more ($gmane/267250).
262 Waiting for a reroll.
265 * mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
266 - t/lib-git-svn: check same httpd module dirs as lib-httpd
267 - t/lib-httpd: load mod_unixd
269 This is the first two commits in a three-patch series $gmane/266962
271 with updated log message ($gmane/268061).
274 * mh/numparse (2015-03-19) 14 commits
275 - diff_opt_parse(): use convert_i() when handling --abbrev=<num>
276 - diff_opt_parse(): use convert_i() when handling "-l<num>"
277 - opt_arg(): simplify pointer handling
278 - opt_arg(): report errors parsing option values
279 - opt_arg(): use convert_i() in implementation
280 - opt_arg(): val is always non-NULL
281 - builtin_diff(): detect errors when parsing --unified argument
282 - handle_revision_opt(): use convert_ui() when handling "--abbrev="
283 - strtoul_ui(), strtol_i(): remove functions
284 - handle_revision_opt(): use convert_i() when handling "-<digit>"
285 - handle_revision_opt(): use skip_prefix() in many places
286 - write_subdirectory(): use convert_ui() for parsing mode
287 - cacheinfo_callback(): use convert_ui() when handling "--cacheinfo"
288 - numparse: new module for parsing integral numbers
290 Many codepaths use unchecked use of strtol() and friends (or even
291 worse, atoi()). Introduce a set of wrappers that try to be more
298 * tf/gitweb-project-listing (2015-03-19) 5 commits
299 - gitweb: make category headings into links when they are directories
300 - gitweb: optionally set project category from its pathname
301 - gitweb: add a link under the search box to clear a project filter
302 - gitweb: if the PATH_INFO is incomplete, use it as a project_filter
303 - gitweb: fix typo in man page
305 Update gitweb to make it more pleasant to deal with a hierarchical
306 forest of repositories.
308 Any comments from those who use or have their own code in Gitweb?
311 * jc/a-lone-dash-stands-for-previous-branch (2015-03-16) 1 commit
312 - "-" and "@{-1}" on various programs
314 Lose special case code to make a lone dash "-" mean the previous
315 branch aka "@{-1}" from a handful subcommands, and instead support
316 the notation throughout the system by reimplementing it at the
319 Needs tests, documentation updates, etc. Also does only a half-way
320 job dealing with range notation, which needs to be fixed before the
321 series goes anywhere.
324 * nd/list-files (2015-02-09) 21 commits
325 - t3080: tests for git-list-files
326 - list-files: -M aka diff-cached
327 - list-files -F: show submodules with the new indicator '&'
328 - list-files: add -F/--classify
329 - list-files: show directories as well as files
330 - list-files: do not show duplicate cached entries
331 - list-files: sort output and remove duplicates
332 - list-files: add -t back
333 - list-files: add -1 short for --no-column
334 - list-files: add -R/--recursive short for --max-depth=-1
335 - list-files: -u does not imply showing stages
336 - list-files: make alias 'ls' default to 'list-files'
337 - list-files: a user friendly version of ls-files and more
338 - ls-files: support --max-depth
339 - ls-files: add --column
340 - ls-files: add --color to highlight file names
341 - ls-files: buffer full item in strbuf before printing
342 - ls_colors.c: highlight submodules like directories
343 - ls_colors.c: add a function to color a file name
344 - ls_colors.c: parse color.ls.* from config file
345 - ls_colors.c: add $LS_COLORS parsing code
347 A new "git list-files" Porcelain command, "ls-files" with bells and
350 Reroll to base on wt-status work ($gmane/265142) has seen some
351 positive discussions.
353 Waiting for a further polished reroll ($gmane/265534).
356 * nd/pathspec-strip-fix (2015-04-18) 1 commit
357 - pathspec: adjust prefixlen after striping trailing slash
359 Does not quite fix ($gmane/267614).
363 * jc/diff-b-m (2015-02-23) 5 commits
366 - diffcore-rename: allow easier debugging
367 - diffcore-rename.c: add locate_rename_src()
368 - diffcore-break: allow debugging
370 "git diff -B -M" produced incorrect patch when the postimage of a
371 completely rewritten file is similar to the preimage of a removed
372 file; such a resulting file must not be expressed as a rename from
375 The fix in this patch is broken, unfortunately.
378 * pw/remote-set-url-fetch (2014-11-26) 1 commit
379 - remote: add --fetch and --both options to set-url
384 * tr/remerge-diff (2014-11-10) 9 commits
385 - t4213: avoid "|" in sed regexp
386 - log --remerge-diff: show what the conflict resolution changed
387 - name-hash: allow dir hashing even when !ignore_case
388 - merge-recursive: allow storing conflict hunks in index
389 - merge_diff_mode: fold all merge diff variants into an enum
390 - combine-diff: do not pass revs->dense_combined_merges redundantly
391 - merge-recursive: -Xindex-only to leave worktree unchanged
392 - merge-recursive: internal flag to avoid touching the worktree
393 - merge-recursive: remove dead conditional in update_stages()
395 "log -p" output learns a new way to let users inspect a merge
396 commit by showing the differences between the automerged result
397 with conflicts the person who recorded the merge would have seen
398 and the final conflict resolution that was recorded in the merge.
400 Waiting for a reroll.
404 * tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
405 - perf-lib: add test_perf_cleanup target
406 - perf-lib: split starting the test from the execution
408 Add test_perf_cleanup shell function to the perf suite, that allows
409 the script writers to define a test with a clean-up action.
414 * jc/show-branch (2014-03-24) 5 commits
415 - show-branch: use commit slab to represent bitflags of arbitrary width
416 - show-branch.c: remove "all_mask"
417 - show-branch.c: abstract out "flags" operation
418 - show-branch.c: lift all_mask/all_revs to a global static
419 - show-branch.c: update comment style
421 Waiting for the final step to lift the hard-limit.
423 --------------------------------------------------
426 * dt/log-follow-config (2015-07-09) 1 commit
427 (merged to 'next' on 2015-07-10 at b8fbb43)
428 + log: add "log.follow" configuration variable
430 Add a new configuration variable to enable "--follow" automatically
431 when "git log" is run with one pathspec argument.
433 Will merge to 'master'.
436 * kn/tag-doc-fix (2015-07-10) 1 commit
437 - Documentation/tag: remove double occurance of "<pattern>"
439 Will merge to 'next'.
442 * se/doc-checkout-ours-theirs (2015-07-12) 1 commit
443 - checkout: document subtlety around --ours/--theirs
445 A "rebase" replays changes of the local branch on top of something
446 else, as such they are placed in stage #3 and referred to as
447 "theirs", while the changes in the new base, typically a foreign
448 work, are placed in stage #2 and referred to as "ours". Clarify
449 the "checkout --ours/--theirs".
452 * pt/am-tests (2015-07-07) 12 commits
453 - t3901: test git-am encoding conversion
454 - t3418: non-interactive rebase --continue with rerere enabled
455 - t4150: tests for am --[no-]scissors
456 - t4150: am with post-applypatch hook
457 - t4150: am with pre-applypatch hook
458 - t4150: am with applypatch-msg hook
459 - t4150: am --resolved fails if index has unmerged entries
460 - t4150: am --resolved fails if index has no changes
461 - t4150: am refuses patches when paused
462 - t4151: am --abort will keep dirty index intact
463 - t4150: am fails if index is dirty
464 - t4150: am.messageid really adds the message id
466 Sprinkle a few test prereqs ($gmane/273709)?
471 * kn/for-each-tag-branch (2015-07-13) 11 commits
472 - for-each-ref: add '--contains' option
473 - ref-filter: implement '--contains' option
474 - parse-options.h: add macros for '--contains' option
475 - parse-option: rename parse_opt_with_commit()
476 - for-each-ref: add '--merged' and '--no-merged' options
477 - ref-filter: implement '--merged' and '--no-merged' options
478 - ref-filter: add parse_opt_merge_filter()
479 - for-each-ref: add '--points-at' option
480 - ref-filter: implement '--points-at' option
481 - tag: libify parse_opt_points_at()
482 - t6302: for-each-ref tests for ref-filter APIs
483 (this branch uses kn/for-each-ref.)
485 Was the GPG prereq the only thing that needed fixing?
488 * pt/am-builtin (2015-07-08) 47 commits
489 - builtin-am: remove redirection to git-am.sh
490 - builtin-am: check for valid committer ident
491 - builtin-am: implement legacy -b/--binary option
492 - builtin-am: implement -i/--interactive
493 - builtin-am: support and auto-detect mercurial patches
494 - builtin-am: support and auto-detect StGit series files
495 - builtin-am: support and auto-detect StGit patches
496 - builtin-am: rerere support
497 - builtin-am: invoke post-applypatch hook
498 - builtin-am: invoke pre-applypatch hook
499 - builtin-am: invoke applypatch-msg hook
500 - builtin-am: support automatic notes copying
501 - builtin-am: invoke post-rewrite hook
502 - builtin-am: implement -S/--gpg-sign, commit.gpgsign
503 - builtin-am: implement --committer-date-is-author-date
504 - builtin-am: implement --ignore-date
505 - builtin-am: pass git-apply's options to git-apply
506 - builtin-am: implement --[no-]scissors
507 - builtin-am: support --keep-cr, am.keepcr
508 - builtin-am: implement --[no-]message-id, am.messageid
509 - builtin-am: implement -k/--keep, --keep-non-patch
510 - builtin-am: implement -u/--utf8
511 - builtin-am: handle stray state directory
512 - fixup! builtin-am: bypass git-mailinfo when --rebasing
513 - builtin-am: bypass git-mailinfo when --rebasing
514 - builtin-am: implement --rebasing mode
515 - builtin-am: implement --3way, am.threeWay
516 - cache-tree: introduce write_index_as_tree()
517 - builtin-am: implement -s/--signoff
518 - builtin-am: exit with user friendly message on failure
519 - builtin-am: implement -q/--quiet
520 - builtin-am: reject patches when there's a session in progress
521 - builtin-am: implement --abort
522 - builtin-am: implement --skip
523 - builtin-am: implement --resolved/--continue
524 - builtin-am: refuse to apply patches if index is dirty
525 - builtin-am: implement committing applied patch
526 - builtin-am: apply patch with git-apply
527 - fixup! builtin-am: extract patch and commit info with git-mailinfo
528 - builtin-am: extract patch and commit info with git-mailinfo
529 - builtin-am: auto-detect mbox patches
530 - builtin-am: split out mbox/maildir patches with git-mailsplit
531 - builtin-am: implement patch queue mechanism
532 - builtin-am: implement skeletal builtin am
533 - wrapper: implement xfopen()
534 - wrapper: implement xopen()
535 - Merge branch 'pt/pull-builtin' into pt/am-builtin
536 (this branch uses pt/pull-builtin.)
540 Looks more-or-less ready. Any reroll needed other than squashing
544 * ad/bisect-cleanup (2015-06-29) 6 commits
545 (merged to 'next' on 2015-07-09 at 75e2a06)
546 + bisect: don't mix option parsing and non-trivial code
547 + bisect: simplify the addition of new bisect terms
548 + bisect: replace hardcoded "bad|good" by variables
549 + Documentation/bisect: revise overall content
550 + Documentation/bisect: move getting help section to the end
551 + bisect: correction of typo
552 (this branch is used by ad/bisect-terms.)
554 Code and documentation clean-up to "git bisect".
556 Will merge to 'master'.
559 * mh/fast-import-get-mark (2015-07-01) 1 commit
560 - fast-import: add a get-mark command
562 Will merge to 'next'.
565 * kb/i18n-doc (2015-07-01) 1 commit
566 (merged to 'next' on 2015-07-09 at a12c7b3)
567 + Documentation/i18n.txt: clarify character encoding support
569 Will merge to 'master'.
572 * dt/refs-backend-preamble (2015-07-08) 8 commits
573 - git-stash: use update-ref --create-reflog instead of creating files
574 - update-ref and tag: add --create-reflog arg
575 - git-reflog: add exists command
576 - refs: new public ref function: safe_create_reflog
577 - refs: Break out check for reflog autocreation
578 - bisect: treat BISECT_HEAD as a ref
579 - cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs
580 - refs.c: add err arguments to reflog functions
582 In preparation for allowing different "backends" to store the refs
583 in a way different from the traditional "one ref per file in $GIT_DIR
584 or in a $GIT_DIR/packed-refs file" filesystem storage, reduce
585 direct filesystem access to ref-like things like CHERRY_PICK_HEAD
586 from scripts and programs.
588 Still under discussion.
593 * jk/date-mode-format (2015-06-29) 3 commits
594 (merged to 'next' on 2015-07-09 at a01bfc3)
595 + introduce "format" date-mode
596 + convert "enum date_mode" into a struct
597 + show-branch: use DATE_RELATIVE instead of magic number
599 Teach "git log" and friends a new "--date=format:..." option to
600 format timestamps using system's strftime(3).
602 Will merge to 'master'.
605 * jk/still-interesting (2015-06-29) 1 commit
606 (merged to 'next' on 2015-07-09 at e19fc0e)
607 + revision.c: remove unneeded check for NULL
611 Will merge to 'master'.
614 * nd/export-worktree (2015-06-26) 1 commit
615 (merged to 'next' on 2015-07-09 at 1581a9b)
616 + setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR
618 Running an aliased command from a subdirectory when the .git thing
619 in the working tree is a gitfile pointing elsewhere did not work.
621 Will merge to 'master'.
624 * jc/rerere (2015-07-06) 19 commits
625 . t4200: rerere a merge with two identical conflicts
626 . rerere: un-nest merge() further
627 . rerere: use "struct rerere_id" instead of "char *" for conflict ID
628 - rerere: call conflict-ids IDs
629 - rerere: further clarify do_rerere_one_path()
630 - rerere: further de-dent do_plain_rerere()
631 - rerere: refactor "replay" part of do_plain_rerere()
632 - rerere: explain the remainder
633 - rerere: explain "rerere forget" codepath
634 - rerere: explain the primary codepath
635 - rerere: explain MERGE_RR management helpers
636 - rerere: explain the rerere I/O abstraction
637 - rerere: stop looping unnecessarily
638 - rerere: drop want_sp parameter from is_cmarker()
639 - rerere: report autoupdated paths only after actually updating them
640 - rerere: write out each record of MERGE_RR in one go
641 - rerere: lift PATH_MAX limitation
642 - rerere: plug conflict ID leaks
643 - rerere: fix an off-by-one non-bug
645 Code clean-up and minor fixes (so far).
648 * ad/bisect-terms (2015-06-29) 4 commits
649 - bisect: allow setting any user-specified in 'git bisect start'
650 - bisect: add 'git bisect terms' to view the current terms
651 - bisect: add the terms old/new
652 - bisect: sanity check on terms
653 (this branch uses ad/bisect-cleanup.)
655 The use of 'good/bad' in "git bisect" made it confusing to use when
656 hunting for a state change that is not a regression (e.g. bugfix).
657 The command learned 'old/new' and then allows the end user to
658 say e.g. "bisect start --term-old=fast --term=new=slow" to find a
659 performance regression.
661 Michael's idea to make 'good/bad' more intelligent does have
662 certain attractiveness ($gname/272867), and makes some of the work
663 on this topic a moot point.
668 * mh/tempfile (2015-06-10) 14 commits
669 - credential-cache--daemon: use tempfile module
670 - credential-cache--daemon: delete socket from main()
671 - gc: use tempfile module to handle gc.pid file
672 - lock_repo_for_gc(): compute the path to "gc.pid" only once
673 - diff: use tempfile module
674 - setup_temporary_shallow(): use tempfile module
675 - write_shared_index(): use tempfile module
676 - register_tempfile(): new function to handle an existing temporary file
677 - tempfile: add several functions for creating temporary files
678 - register_tempfile_object(): new function, extracted from create_tempfile()
679 - commit_lock_file(): use get_locked_file_path()
680 - lockfile: remove some redundant functions
681 - tempfile: a new module for handling temporary files
682 - Move lockfile API documentation to lockfile.h
684 Rebuild "lockfile" API on top of a new "tempfile" API.
685 This needs rerolling, to include "tempfile.h" in "lockfile.h", at
692 * js/fsck-opt (2015-06-23) 19 commits
693 (merged to 'next' on 2015-07-10 at eb4da0a)
694 + fsck: support ignoring objects in `git fsck` via fsck.skiplist
695 + fsck: git receive-pack: support excluding objects from fsck'ing
696 + fsck: introduce `git fsck --connectivity-only`
697 + fsck: support demoting errors to warnings
698 + fsck: document the new receive.fsck.<msg-id> options
699 + fsck: allow upgrading fsck warnings to errors
700 + fsck: optionally ignore specific fsck issues completely
701 + fsck: disallow demoting grave fsck errors to warnings
702 + fsck: add a simple test for receive.fsck.<msg-id>
703 + fsck: make fsck_tag() warn-friendly
704 + fsck: handle multiple authors in commits specially
705 + fsck: make fsck_commit() warn-friendly
706 + fsck: make fsck_ident() warn-friendly
707 + fsck: report the ID of the error/warning
708 + fsck (receive-pack): allow demoting errors to warnings
709 + fsck: offer a function to demote fsck errors to warnings
710 + fsck: provide a function to parse fsck message IDs
711 + fsck: introduce identifiers for fsck messages
712 + fsck: introduce fsck options
714 Allow ignoring fsck errors on specific set of known-to-be-bad
715 objects, and also tweaking warning level of various kinds of non
716 critical breakages reported.
718 Will merge to 'master'.
721 * ak/format-patch-odir-config (2015-06-19) 1 commit
722 - format-patch: introduce format.outputDirectory configuration
724 Reroll exists but didn't pick it up as it seems to be still
725 collecting review comments.
731 * bc/gpg-verify-raw (2015-06-22) 7 commits
732 (merged to 'next' on 2015-06-24 at 08a1164)
733 + verify-tag: add option to print raw gpg status information
734 + verify-commit: add option to print raw gpg status information
735 + gpg: centralize printing signature buffers
736 + gpg: centralize signature check
737 + verify-commit: add test for exit status on untrusted signature
738 + verify-tag: share code with verify-commit
739 + verify-tag: add tests
741 "git verify-tag" and "git verify-commit" have been taught to share
742 more code, and then learned to optionally show the verification
743 message from the underlying GPG implementation.
745 Will merge to 'master'.
748 * cb/parse-magnitude (2015-06-22) 2 commits
749 (merged to 'next' on 2015-06-24 at 2fd7205)
750 + parse-options: move unsigned long option parsing out of pack-objects.c
751 + test-parse-options: update to handle negative ints
753 Move machinery to parse human-readable scaled numbers like 1k, 4M,
754 and 2G as an option parameter's value from pack-objects to
755 parse-options API, to make it available to other codepaths.
757 Will merge to 'master'.
760 * jk/cat-file-batch-all (2015-06-26) 8 commits
761 (merged to 'next' on 2015-07-10 at 80200cc)
762 + cat-file: sort and de-dup output of --batch-all-objects
763 + cat-file: add --batch-all-objects option
764 + cat-file: split batch_one_object into two stages
765 + cat-file: stop returning value from batch_one_object
766 + cat-file: add --buffer option
767 + cat-file: move batch_options definition to top of file
768 + cat-file: minor style fix in options list
769 + Merge branch 'jk/maint-for-each-packed-object' into jk/cat-file-batch-all
771 "cat-file" learned "--batch-all-objects" option to enumerate all
772 available objects in the repository more quickly than "rev-list
773 --all --objects" (the output includes unreachable objects, though).
775 Will merge to 'master'.
778 * jk/pkt-log-pack (2015-06-16) 3 commits
779 (merged to 'next' on 2015-07-10 at ba33212)
780 + pkt-line: support tracing verbatim pack contents
781 + pkt-line: tighten sideband PACK check when tracing
782 + pkt-line: simplify starts_with checks in packet tracing
784 Enhance packet tracing machinery to allow capturing an incoming
785 pack data to a file for debugging.
787 Will merge to 'master'.
790 * kn/for-each-ref (2015-06-15) 11 commits
791 (merged to 'next' on 2015-06-24 at 1a3a734)
792 + ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname
793 + for-each-ref: introduce filter_refs()
794 + ref-filter: move code from 'for-each-ref'
795 + ref-filter: add 'ref-filter.h'
796 + for-each-ref: rename variables called sort to sorting
797 + for-each-ref: rename some functions and make them public
798 + for-each-ref: introduce 'ref_array_clear()'
799 + for-each-ref: introduce new structures for better organisation
800 + for-each-ref: rename 'refinfo' to 'ref_array_item'
801 + for-each-ref: clean up code
802 + for-each-ref: extract helper functions out of grab_single_ref()
803 (this branch is used by kn/for-each-tag-branch.)
805 GSoC project to rebuild ref listing by branch and tag based on the
806 for-each-ref machinery. This is its first part.
808 Will merge to 'master'.
811 * mh/init-delete-refs-api (2015-06-22) 19 commits
812 (merged to 'next' on 2015-07-10 at 121b26e)
813 + delete_ref(): use the usual convention for old_sha1
814 + cmd_update_ref(): make logic more straightforward
815 + update_ref(): don't read old reference value before delete
816 + check_branch_commit(): make first parameter const
817 + refs.h: add some parameter names to function declarations
818 + refs: move the remaining ref module declarations to refs.h
819 + initial_ref_transaction_commit(): check for ref D/F conflicts
820 + initial_ref_transaction_commit(): check for duplicate refs
821 + refs: remove some functions from the module's public interface
822 + initial_ref_transaction_commit(): function for initial ref creation
823 + repack_without_refs(): make function private
824 + prune_refs(): use delete_refs()
825 + prune_remote(): use delete_refs()
826 + delete_refs(): bail early if the packed-refs file cannot be rewritten
827 + delete_refs(): make error message more generic
828 + delete_refs(): new function for the refs API
829 + delete_ref(): handle special case more explicitly
830 + remove_branches(): remove temporary
831 + delete_ref(): move declaration to refs.h
833 Clean up refs API and make "git clone" less intimate with the
834 implementation detail.
836 Will merge to 'master'.
839 * mh/replace-refs (2015-06-12) 1 commit
840 (merged to 'next' on 2015-06-24 at cb13adf)
841 + Allow to control where the replace refs are looked for
843 Add an environment variable to tell Git to look into refs hierarchy
844 other than refs/replace/ for the object replacement data.
847 * gp/status-rebase-i-info (2015-07-06) 4 commits
848 (merged to 'next' on 2015-07-10 at b121298)
849 + status: add new tests for status during rebase -i
850 + status: give more information during rebase -i
851 + status: differentiate interactive from non-interactive rebases
852 + status: factor two rebase-related messages together
854 Teach "git status" to show a more detailed information regarding
855 the "rebase -i" session in progress.
857 Will merge to 'master'.
860 * mk/utf8-no-iconv-warn (2015-06-08) 1 commit
861 - utf8.c: print warning about disabled iconv
863 Warn when a reencoding is requested in a build without iconv
864 support, as the end user is likely to get an unexpected result. I
865 think the same level of safety should be added to a build with
866 iconv support when the specified encoding is not available, but the
867 patch does not go there.
872 * mr/rebase-i-customize-insn-sheet (2015-06-15) 1 commit
873 (merged to 'next' on 2015-07-10 at ec383cd)
874 + git-rebase--interactive.sh: add config option for custom instruction format
876 "git rebase -i"'s list of todo is made configurable.
878 Will merge to 'master'.
881 * pt/am-foreign (2015-06-15) 5 commits
882 (merged to 'next' on 2015-06-24 at 838c702)
883 + am: teach mercurial patch parser how to read from stdin
884 + am: use gmtime() to parse mercurial patch date
885 + t4150: test applying StGit series
886 + am: teach StGit patch parser how to read from stdin
887 + t4150: test applying StGit patch
889 Various enhancements around "git am" reading patches generated by
893 * pt/pull-builtin (2015-06-18) 19 commits
894 (merged to 'next' on 2015-07-10 at 07b1794)
895 + pull: remove redirection to git-pull.sh
896 + pull --rebase: error on no merge candidate cases
897 + pull --rebase: exit early when the working directory is dirty
898 + pull: configure --rebase via branch.<name>.rebase or pull.rebase
899 + pull: teach git pull about --rebase
900 + pull: set reflog message
901 + pull: implement pulling into an unborn branch
902 + pull: fast-forward working tree if head is updated
903 + pull: check if in unresolved merge state
904 + pull: support pull.ff config
905 + pull: error on no merge candidates
906 + pull: pass git-fetch's options to git-fetch
907 + pull: pass git-merge's options to git-merge
908 + pull: pass verbosity, --progress flags to fetch and merge
909 + pull: implement fetch + merge
910 + pull: implement skeletal builtin pull
911 + argv-array: implement argv_array_pushv()
912 + parse-options-cb: implement parse_opt_passthru_argv()
913 + parse-options-cb: implement parse_opt_passthru()
914 (this branch is used by pt/am-builtin.)
916 Reimplement 'git pull' in C.
918 Will merge to 'master'.
921 * rl/send-email-aliases (2015-07-07) 10 commits
922 (merged to 'next' on 2015-07-09 at c60553d)
923 + send-email: suppress meaningless whitespaces in from field
924 + send-email: allow multiple emails using --cc, --to and --bcc
925 + send-email: consider quote as delimiter instead of character
926 + send-email: reduce dependencies impact on parse_address_line
927 + send-email: minor code refactoring
928 + send-email: allow use of aliases in the From field of --compose mode
929 + send-email: refactor address list process
930 + t9001-send-email: refactor header variable fields replacement
931 + send-email: allow aliases in patch header and command script outputs
932 + t9001-send-email: move script creation in a setup test
934 "git send-email" now performs alias-expansion on names that are
935 given via --cccmd, etc.
937 This round comes with a lot more enhanced e-mail address parser,
938 which makes it a bit scary, but as long as it works as designed, it
939 makes it wonderful ;-).
941 Will merge to 'master'.
944 * wp/sha1-name-negative-match (2015-06-08) 2 commits
945 - sha1_name.c: introduce '^{/!-<negative pattern>}' notation
946 - test for '!' handling in rev-parse's named commits
948 Introduce "branch^{/!-<pattern>}" notation to name a commit
949 reachable from branch that does not match the given pattern.
954 * bc/object-id (2015-06-17) 10 commits
955 . remote.c: use struct object_id in many functions
956 . object-id: use struct object_id in struct object
957 . remote.c: use struct object_id in ref_newer()
958 . transport-helper.c: use struct object_id in push_refs_with_export()
959 . connect.c: use struct object_id in get_remote_heads()
960 . remote-curl: use struct object_id in parse_fetch()
961 . fetch-pack: use struct object_id in add_sought_entry_mem()
962 . object_id: convert struct ref to use object_id.
963 . sha1_file: introduce has_object_file() helper
964 . refs: convert some internal functions to use object_id
966 More transition from "unsigned char[40]" to "struct object_id".
968 While GSoC and other topics are actively moving existing code
969 around, this cannot go in; ejected from 'pu'.
972 * jk/log-missing-default-HEAD (2015-06-03) 1 commit
973 - log: diagnose empty HEAD more clearly
975 "git init empty && git -C empty log" said "bad default revision 'HEAD'",
976 which was found to be a bit confusing to new users.
978 What's the status of this one?
981 * gr/rebase-i-drop-warn (2015-06-30) 3 commits
982 - git rebase -i: add static check for commands and SHA-1
983 - git rebase -i: warn about removed commits
984 - git-rebase -i: add command "drop" to remove a commit
986 Add "drop commit-object-name subject" command as another way to
987 skip replaying of a commit in "rebase -i", and then punish those
988 who do not use it (and instead just remove the lines) by throwing
991 Will merge to 'next'.
994 * jh/strbuf-read-use-read-in-full (2015-06-01) 1 commit
995 - strbuf_read(): skip unnecessary strbuf_grow() at eof
997 Avoid one extra iteration and strbuf_grow() of 8kB in
1000 Looked reasonable; perhaps a log message clarification is needed.
1005 * mg/index-read-error-messages (2015-06-01) 2 commits
1006 - messages: uniform error messages for index write
1007 - show-index: uniform error messages for index read
1013 * hv/submodule-config (2015-06-15) 4 commits
1014 - do not die on error of parsing fetchrecursesubmodules option
1015 - use new config API for worktree configurations of submodules
1016 - extract functions for submodule config set and lookup
1017 - implement submodule config API for lookup of .gitmodules values
1019 The gitmodules API accessed from the C code learned to cache stuff
1022 Needs another reroll? ($gmane/273743).
1025 * jc/push-tags-also (2015-05-29) 1 commit
1026 - push --tags: push tags *in addition to* other stuff
1028 "git fetch --tags" learned to fetch tags in addition to other stuff
1029 a few years ago, but "git push --tags" didn't. Now it does.
1031 A change to push out more than before always invites "what if the
1032 user makes a mistake" worries.
1037 * jc/commit-slab (2015-05-22) 1 commit
1038 - commit-slab: introduce slabname##_peek() function
1040 Memory use reduction when commit-slab facility is used to annotate
1041 sparsely (which is not recommended in the first place).
1043 Will merge to 'next'.
1046 * jc/clone-bundle (2015-04-30) 1 commit
1047 - repack: optionally create a clone.bundle
1049 Waiting for further work.
1053 * ee/clean-remove-dirs (2015-06-26) 6 commits
1054 (merged to 'next' on 2015-06-29 at d595659)
1055 + read_gitfile_gently: fix use-after-free
1056 (merged to 'next' on 2015-06-24 at 7c27821)
1057 + clean: improve performance when removing lots of directories
1058 + p7300: add performance tests for clean
1059 + t7300: add tests to document behavior of clean and nested git
1060 + setup: sanity check file size in read_gitfile_gently
1061 + setup: add gentle version of read_gitfile
1063 Replace "is this subdirectory a separate repository that should not
1064 be touched?" check "git clean" does by checking if it has .git/HEAD
1065 using the submodule-related code with a more optimized check.
1067 Will merge to 'master'.
1070 * jc/merge-drop-old-syntax (2015-04-29) 1 commit
1071 (merged to 'next' on 2015-05-28 at 6bfd8b9)
1072 + merge: drop 'git merge <message> HEAD <commit>' syntax
1074 Stop supporting "git merge <message> HEAD <commit>" syntax that
1075 has been deprecated since October 2007.
1077 Will keep in 'next' during the 2.5 cycle.