1 To: git@vger.kernel.org
3 Subject: What's cooking in git.git (Aug 2015, #04; Tue, 25)
4 X-master-at: 33f2c4ff7b9ac02cd9010d504e847b912b35baf6
5 X-next-at: f2c83a76d16e5fd4c4f2e37c6ad65b3ba13dc31e
7 What's cooking in git.git (Aug 2015, #04; Tue, 25)
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 You can find the changes described here in the integration branches
15 of the repositories listed at
17 http://git-blame.blogspot.com/p/git-public-repositories.html
19 --------------------------------------------------
20 [Graduated to "master"]
22 * cb/open-noatime-clear-errno (2015-08-12) 1 commit
23 (merged to 'next' on 2015-08-17 at 6aa43a1)
24 + git_open_noatime: return with errno=0 on success
26 When trying to see that an object does not exist, a state errno
27 leaked from our "first try to open a packfile with O_NOATIME and
28 then if it fails retry without it" logic on a system that refuses
29 O_NOATIME. This confused us and caused us to die, saying that the
30 packfile is unreadable, when we should have just reported that the
31 object does not exist in that packfile to the caller.
34 * dt/notes-multiple (2015-08-11) 2 commits
35 (merged to 'next' on 2015-08-12 at 0052055)
36 + notes: handle multiple worktrees
37 + worktrees: add find_shared_symref
39 When linked worktree is used, simultaneous "notes merge" instances
40 for the same ref in refs/notes/* are prevented from stomping on
44 * dt/refs-pseudo (2015-08-11) 6 commits
45 (merged to 'next' on 2015-08-12 at 7078eb6)
46 + pseudoref: check return values from read_ref()
47 (merged to 'next' on 2015-08-03 at 3eafd33)
48 + sequencer: replace write_cherry_pick_head with update_ref
49 + bisect: use update_ref
50 + pseudorefs: create and use pseudoref update and delete functions
51 + refs: add ref_type function
52 + refs: introduce pseudoref and per-worktree ref concepts
54 To prepare for allowing a different "ref" backend to be plugged in
55 to the system, update_ref()/delete_ref() have been taught about
56 ref-like things like MERGE_HEAD that are per-worktree (they will
57 always be written to the filesystem inside $GIT_DIR).
60 * ee/clean-remove-dirs (2015-08-11) 1 commit
61 (merged to 'next' on 2015-08-12 at fc41b09)
62 + t7300-clean: require POSIXPERM for chmod 0 test
64 Test updates for Windows.
67 * jc/finalize-temp-file (2015-08-10) 1 commit
68 (merged to 'next' on 2015-08-12 at 6fe62fe)
69 + sha1_file.c: rename move_temp_to_file() to finalize_object_file()
71 Long overdue micro clean-up.
74 * jh/strbuf-read-use-read-in-full (2015-08-10) 1 commit
75 (merged to 'next' on 2015-08-12 at db16247)
76 + strbuf_read(): skip unnecessary strbuf_grow() at eof
78 strbuf_read() used to have one extra iteration (and an unnecessary
79 strbuf_grow() of 8kB), which was eliminated.
82 * jk/git-path (2015-08-10) 16 commits
83 (merged to 'next' on 2015-08-12 at 7ebe864)
84 + memoize common git-path "constant" files
85 + get_repo_path: refactor path-allocation
86 + find_hook: keep our own static buffer
87 + refs.c: remove_empty_directories can take a strbuf
88 + refs.c: avoid git_path assignment in lock_ref_sha1_basic
89 + refs.c: avoid repeated git_path calls in rename_tmp_log
90 + refs.c: simplify strbufs in reflog setup and writing
91 + path.c: drop git_path_submodule
92 + refs.c: remove extra git_path calls from read_loose_refs
93 + remote.c: drop extraneous local variable from migrate_file
94 + prefer mkpathdup to mkpath in assignments
95 + prefer git_pathdup to git_path in some possibly-dangerous cases
96 + add_to_alternates_file: don't add duplicate entries
97 + t5700: modernize style
98 + cache.h: complete set of git_path_submodule helpers
99 + cache.h: clarify documentation for git_path, et al
100 (this branch is used by sb/submodule-helper.)
102 git_path() and mkpath() are handy helper functions but it is easy
103 to misuse, as the callers need to be careful to keep the number of
104 active results below 4. Their uses have been reduced.
107 * jk/guess-repo-name-regression-fix (2015-08-10) 2 commits
108 (merged to 'next' on 2015-08-12 at 4cba33c)
109 + clone: use computed length in guess_dir_name
110 + clone: add tests for output directory
111 (this branch is used by ps/guess-repo-name-at-root.)
113 "git clone $URL" in recent releases of Git contains a regression in
114 the code that invents a new repository name incorrectly based on
115 the $URL. This has been corrected.
118 * jk/long-error-messages (2015-08-11) 2 commits
119 (merged to 'next' on 2015-08-12 at 36303cd)
120 + vreportf: avoid intermediate buffer
121 + vreportf: report to arbitrary filehandles
123 The codepath to produce error messages had a hard-coded limit to
124 the size of the message, primarily to avoid memory allocation while
128 * jk/negative-hiderefs (2015-08-07) 2 commits
129 (merged to 'next' on 2015-08-12 at bdc478d)
130 + refs: support negative transfer.hideRefs
131 + docs/config.txt: reorder hideRefs config
133 A negative !ref entry in multi-value transfer.hideRefs
134 configuration can be used to say "don't hide this one".
137 * jk/test-with-x (2015-08-07) 2 commits
138 (merged to 'next' on 2015-08-12 at 06576a1)
139 + test-lib: disable trace when test is not verbose
140 + test-lib: turn off "-x" tracing during chain-lint check
142 Running tests with the "-x" option to make them verbose had some
143 unpleasant interactions with other features of the test suite.
146 * mh/tempfile (2015-08-12) 16 commits
147 (merged to 'next' on 2015-08-12 at 80efcb7)
148 + credential-cache--daemon: use tempfile module
149 + credential-cache--daemon: delete socket from main()
150 + gc: use tempfile module to handle gc.pid file
151 + lock_repo_for_gc(): compute the path to "gc.pid" only once
152 + diff: use tempfile module
153 + setup_temporary_shallow(): use tempfile module
154 + write_shared_index(): use tempfile module
155 + register_tempfile(): new function to handle an existing temporary file
156 + tempfile: add several functions for creating temporary files
157 + prepare_tempfile_object(): new function, extracted from create_tempfile()
158 + tempfile: a new module for handling temporary files
159 + commit_lock_file(): use get_locked_file_path()
160 + lockfile: add accessor get_lock_file_path()
161 + lockfile: add accessors get_lock_file_fd() and get_lock_file_fp()
162 + create_bundle(): duplicate file descriptor to avoid closing it twice
163 + lockfile: move documentation to lockfile.h and lockfile.c
165 The "lockfile" API has been rebuilt on top of a new "tempfile" API.
168 * mm/pull-upload-pack (2015-07-30) 1 commit
169 (merged to 'next' on 2015-08-12 at 14d2a52)
170 + pull.sh: quote $upload_pack when passing it to git-fetch
172 "git pull" in recent releases of Git has a regression in the code
173 that allows custom path to the --upload-pack=<program>. This has
176 Note that this is irrelevant for 'master' with "git pull" rewritten
180 * nd/dwim-wildcards-as-pathspecs (2015-08-11) 1 commit
181 (merged to 'next' on 2015-08-12 at bb73f4d)
182 + t2019: skip test requiring '*' in a file name non Windows
184 Test updates for Windows.
187 * ps/guess-repo-name-at-root (2015-08-10) 3 commits
188 (merged to 'next' on 2015-08-12 at 088860f)
189 + clone: abort if no dir name could be guessed
190 + clone: do not use port number as dir name
191 + clone: do not include authentication data in guessed dir
192 (this branch uses jk/guess-repo-name-regression-fix.)
194 "git clone $URL", when cloning from a site whose sole purpose is to
195 host a single repository (hence, no path after <scheme>://<site>/),
196 tried to use the site name as the new repository name, but did not
197 remove username or password when <site> part was of the form
198 <user>@<pass>:<host>. The code is taught to redact these.
201 * ps/t1509-chroot-test-fixup (2015-08-05) 2 commits
202 (merged to 'next' on 2015-08-12 at 6d10ea5)
203 + tests: fix cleanup after tests in t1509-root-worktree
204 + tests: fix broken && chains in t1509-root-worktree
206 t1509 test that requires a dedicated VM environment had some
207 bitrot, which has been corrected.
210 * pt/am-builtin-options (2015-08-12) 3 commits
211 (merged to 'next' on 2015-08-12 at e57f754)
212 + am: let --signoff override --no-signoff
213 + am: let command-line options override saved options
214 + test_terminal: redirect child process' stdin to a pty
215 (this branch is used by jc/am-state-fix.)
217 After "git am --opt1" stops, running "git am --opt2" pays attention
218 to "--opt2" only for the patch that caused the original invocation
222 * sb/check-return-from-read-ref (2015-08-03) 1 commit
223 (merged to 'next' on 2015-08-12 at 4a1c801)
224 + transport-helper: die on errors reading refs.
227 * tb/complete-rebase-i-edit-todo (2015-08-05) 1 commit
228 (merged to 'next' on 2015-08-12 at 9606c21)
229 + completion: offer '--edit-todo' during interactive rebase
231 The command-line completion script (in contrib/) has been updated.
233 --------------------------------------------------
236 * dt/untracked-sparse (2015-08-19) 1 commit
237 (merged to 'next' on 2015-08-25 at 2501a7e)
238 + t7063: use --force-untracked-cache to speed up a bit
239 (this branch is used by dt/untracked-subdir.)
243 Will merge to 'master'.
246 * as/docfix-reflog-expire-unreachable (2015-08-21) 1 commit
247 (merged to 'next' on 2015-08-25 at eb75d55)
248 + Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachable
250 Will merge to 'master'.
253 * cc/trailers-corner-case-fix (2015-08-21) 1 commit
254 (merged to 'next' on 2015-08-25 at ac25d80)
255 + trailer: ignore first line of message
257 "interpret-trailers" helper mistook a single-liner log message that
258 has a colon as the end of existing trailer.
260 Will merge to 'master'.
263 * jc/am-state-fix (2015-08-25) 5 commits
264 (merged to 'next' on 2015-08-25 at 4efcd88)
265 + write_file(): drop caller-supplied LF from calls to create a one-liner file
266 + write_file_v(): do not leave incomplete line at the end
267 + write_file(): drop "fatal" parameter
268 + builtin/am: make sure state files are text
269 + builtin/am: introduce write_state_*() helper functions
271 Recent reimplementation of "git am" changed the format of state
272 files kept in $GIT_DIR/rebase-apply/ without meaning to do so,
273 primarily because write_file() API was cumbersome to use and it was
274 easy to mistakenly make text files with incomplete lines. Update
275 write_file() interface to make it harder to misuse.
277 Will merge to 'master'.
280 * jc/calloc-pathspec (2015-08-20) 1 commit
281 (merged to 'next' on 2015-08-25 at 877490c)
282 + ps_matched: xcalloc() takes nmemb and then element size
284 Will merge to 'master'.
287 * jc/log-p-cc (2015-08-25) 4 commits
288 (merged to 'next' on 2015-08-25 at 2d6a6d4)
289 + builtin/log.c: minor reformat
290 + log: show merge commit when --cc is given
291 + log: when --cc is given, default to -p unless told otherwise
292 + log: rename "tweak" helpers
294 "git log --cc" did not show any patch, even though most of the time
295 the user meant "git log --cc -p -m" to see patch output for commits
296 with a single parent, and combined diff for merge commits. The
297 command is taught to DWIM "--cc" (without "--raw" and other forms
298 of output specification) to "--cc -p -m".
300 Will merge to 'master'.
303 * jk/fix-alias-pager-config-key-warnings (2015-08-24) 1 commit
304 (merged to 'next' on 2015-08-25 at 89eac5a)
305 + config: silence warnings for command names with invalid keys
307 Because the configuration system does not allow "alias.0foo" and
308 "pager.0foo" as the configuration key, the user cannot use '0foo'
309 as a custom command name anyway, but "git 0foo" tried to look these
310 keys up and emitted useless warnings before saying '0foo is not a
311 git command'. These warning messages have been squelched.
313 Will merge to 'master'.
316 * jk/rev-list-has-no-notes (2015-08-24) 1 commit
317 (merged to 'next' on 2015-08-25 at 73cb2ad)
318 + rev-list: make it obvious that we do not support notes
320 "git rev-list" does not take "--notes" option, but did not complain
323 Will merge to 'master'.
326 * kn/for-each-tag (2015-08-25) 15 commits
327 - SQUASH??? a tag longer than 15 bytes break alignment but keeps SP before the message
328 - tag.c: implement '--merged' and '--no-merged' options
329 - tag.c: implement '--format' option
330 - tag.c: use 'ref-filter' APIs
331 - tag.c: use 'ref-filter' data structures
332 - ref-filter: add option to match literal pattern
333 - ref-filter: add support to sort by version
334 - ref-filter: support printing N lines from tag annotation
335 - ref-filter: add option to filter out tags, branches and remotes
336 - ref-filter: implement an `align` atom
337 - utf8: add function to align a string into given strbuf
338 - ref-filter: introduce ref_formatting_state and ref_formatting_stack
339 - ref-filter: move `struct atom_value` to ref-filter.c
340 - Merge 'jk/git-path' into kn/for-each-tag
341 - Merge 'kn/for-each-tag-branch' into kn/for-each-tag
342 (this branch uses kn/for-each-tag-branch.)
344 The "ref-filter" code was taught about many parts of what "tag -l"
345 does and then "tag -l" is reimplemented in terms of "ref-filter".
350 * nd/fixup-linked-gitdir (2015-08-25) 1 commit
351 - setup: update the right file in multiple checkouts
353 The code in "multiple-worktree" support that attempted to recover
354 from an inconsistent state updated an incorrect file.
356 Will merge to 'next'.
359 * nd/ita-cleanup (2015-08-25) 6 commits
360 - grep: make it clear i-t-a entries are ignored
361 - checkout(-index): do not checkout i-t-a entries
362 - apply: make sure check_preimage() does not leave empty file on error
363 - apply: fix adding new files on i-t-a entries
364 - Add and use convenient macro ce_intent_to_add()
365 - blame: remove obsolete comment
367 Paths that have been told the index about with "add -N" are not yet
368 in the index, but various commands behaved as if they already are.
370 Some commits need better explanation.
372 Waiting for a reroll.
375 * sg/describe-contains (2015-08-25) 1 commit
376 - describe --contains: default to HEAD when no commit-ish is given
378 "git describe" without argument defaulted to describe the HEAD
379 commit, but "git describe --contains" didn't. Arguably, in a
380 repository used for active development, such defaulting would not
381 be very useful as the tip of branch is typically not tagged, but it
382 is better to be consistent.
384 Will merge to 'next'.
387 * sg/help-group (2015-08-25) 1 commit
388 (merged to 'next' on 2015-08-25 at 907e5a8)
389 + generate-cmdlist: re-implement as shell script
391 We rewrote one of the build scripts in Perl but this reimplements
394 Will merge to 'master'.
397 * sg/t3020-typofix (2015-08-20) 1 commit
398 (merged to 'next' on 2015-08-25 at 051d6c0)
399 + t3020: fix typo in test description
401 Will merge to 'master'.
404 * sg/wt-status-header-inclusion (2015-08-21) 1 commit
405 (merged to 'next' on 2015-08-25 at fa5b2b2)
406 + wt-status: move #include "pathspec.h" to the header
408 Will merge to 'master'.
410 --------------------------------------------------
413 * sb/remove-get-pathspec (2015-08-03) 1 commit
414 - builtin/mv: remove get_pathspec()
420 * mk/submodule-gitdir-path (2015-08-05) 2 commits
421 - path: implement common_dir handling in git_path_submodule()
422 - submodule refactor: use git_path_submodule() in add_submodule_odb()
424 The submodule code has been taught to work better with separate
425 work trees created via "git worktree add".
427 Waiting for a review.
431 * nd/list-files (2015-02-09) 21 commits
432 - t3080: tests for git-list-files
433 - list-files: -M aka diff-cached
434 - list-files -F: show submodules with the new indicator '&'
435 - list-files: add -F/--classify
436 - list-files: show directories as well as files
437 - list-files: do not show duplicate cached entries
438 - list-files: sort output and remove duplicates
439 - list-files: add -t back
440 - list-files: add -1 short for --no-column
441 - list-files: add -R/--recursive short for --max-depth=-1
442 - list-files: -u does not imply showing stages
443 - list-files: make alias 'ls' default to 'list-files'
444 - list-files: a user friendly version of ls-files and more
445 - ls-files: support --max-depth
446 - ls-files: add --column
447 - ls-files: add --color to highlight file names
448 - ls-files: buffer full item in strbuf before printing
449 - ls_colors.c: highlight submodules like directories
450 - ls_colors.c: add a function to color a file name
451 - ls_colors.c: parse color.ls.* from config file
452 - ls_colors.c: add $LS_COLORS parsing code
454 A new "git list-files" Porcelain command, "ls-files" with bells and
457 Reroll to base on wt-status work ($gmane/265142) has seen some
458 positive discussions.
460 Waiting for a further polished reroll ($gmane/265534).
463 * mh/numparse (2015-03-19) 14 commits
464 . diff_opt_parse(): use convert_i() when handling --abbrev=<num>
465 . diff_opt_parse(): use convert_i() when handling "-l<num>"
466 . opt_arg(): simplify pointer handling
467 . opt_arg(): report errors parsing option values
468 . opt_arg(): use convert_i() in implementation
469 . opt_arg(): val is always non-NULL
470 . builtin_diff(): detect errors when parsing --unified argument
471 . handle_revision_opt(): use convert_ui() when handling "--abbrev="
472 . strtoul_ui(), strtol_i(): remove functions
473 . handle_revision_opt(): use convert_i() when handling "-<digit>"
474 . handle_revision_opt(): use skip_prefix() in many places
475 . write_subdirectory(): use convert_ui() for parsing mode
476 . cacheinfo_callback(): use convert_ui() when handling "--cacheinfo"
477 . numparse: new module for parsing integral numbers
479 Many codepaths use unchecked use of strtol() and friends (or even
480 worse, atoi()). Introduce a set of wrappers that try to be more
487 * kk/log-merges-config (2015-04-21) 5 commits
488 - bash-completion: add support for git-log --merges= and log.merges
489 - t4202-log: add tests for --merges=
490 - Documentation: add git-log --merges= option and log.merges config. var
491 - log: honor log.merges= option
492 - revision: add --merges={show|only|hide} option
494 "git log" (but not other commands in the "log" family) learned to
495 pay attention to the log.merges configuration variable that can be
496 set to "show" (the normal behaviour), "only" (hide non-merge
497 commits), or "hide" (hide merge commits). --merges=(show|only|hide)
498 can be used to override the setting from the command line.
500 The documentation may need to be updated once more ($gmane/267250).
501 Waiting for a reroll.
504 * mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
505 - t/lib-git-svn: check same httpd module dirs as lib-httpd
506 - t/lib-httpd: load mod_unixd
508 This is the first two commits in a three-patch series $gmane/266962
511 with updated log message ($gmane/268061).
514 * bw/portability-solaris (2015-07-20) 3 commits
515 - tests: fix sed usage in tests to work around broken xpg4/sed on Solaris
516 - tests: fix sed usage in tests to work around broken xpg4/sed on Solaris
517 - tests: modify tr expressions so that xpg4/tr handles it on Solaris
519 Needs another reroll?
523 * jc/clone-bundle (2015-04-30) 1 commit
524 - repack: optionally create a clone.bundle
526 Waiting for further work.
530 * mg/index-read-error-messages (2015-06-01) 2 commits
531 - messages: uniform error messages for index write
532 - show-index: uniform error messages for index read
538 * jk/log-missing-default-HEAD (2015-06-03) 1 commit
539 - log: diagnose empty HEAD more clearly
541 "git init empty && git -C empty log" said "bad default revision 'HEAD'",
542 which was found to be a bit confusing to new users.
544 What's the status of this one?
547 * wp/sha1-name-negative-match (2015-06-08) 2 commits
548 - sha1_name.c: introduce '^{/!-<negative pattern>}' notation
549 - test for '!' handling in rev-parse's named commits
551 Introduce "branch^{/!-<pattern>}" notation to name a commit
552 reachable from branch that does not match the given pattern.
557 * mk/utf8-no-iconv-warn (2015-06-08) 1 commit
558 - utf8.c: print warning about disabled iconv
560 Warn when a reencoding is requested in a build without iconv
561 support, as the end user is likely to get an unexpected result. I
562 think the same level of safety should be added to a build with
563 iconv support when the specified encoding is not available, but the
564 patch does not go there.
569 * ak/format-patch-odir-config (2015-06-19) 1 commit
570 - format-patch: introduce format.outputDirectory configuration
572 Reroll exists but didn't pick it up as it seemed to be still
573 collecting review comments.
579 * ad/bisect-terms (2015-08-03) 4 commits
580 - bisect: allow setting any user-specified in 'git bisect start'
581 - bisect: add 'git bisect terms' to view the current terms
582 - bisect: add the terms old/new
583 - bisect: sanity check on terms
585 The use of 'good/bad' in "git bisect" made it confusing to use when
586 hunting for a state change that is not a regression (e.g. bugfix).
587 The command learned 'old/new' and then allows the end user to
588 say e.g. "bisect start --term-old=fast --term=new=slow" to find a
589 performance regression.
591 Michael's idea to make 'good/bad' more intelligent does have
592 certain attractiveness ($gname/272867), and makes some of the work
593 on this topic a moot point.
598 * mh/notes-allow-reading-treeish (2015-07-13) 1 commit
599 - notes: allow treeish expressions as notes ref
601 Some "git notes" operations, e.g. "git log --notes=<note>", should
602 be able to read notes from any tree-ish that is shaped like a notes
603 tree, but the notes infrastructure required that the argument must
604 be a ref under refs/notes/. Loosen it to require a valid ref only
605 when the operation would update the notes (in which case we must
606 have a place to store the updated notes tree, iow, a ref).
608 Needs update to docs.
612 * jc/diff-b-m (2015-02-23) 5 commits
615 - diffcore-rename: allow easier debugging
616 - diffcore-rename.c: add locate_rename_src()
617 - diffcore-break: allow debugging
619 "git diff -B -M" produced incorrect patch when the postimage of a
620 completely rewritten file is similar to the preimage of a removed
621 file; such a resulting file must not be expressed as a rename from
624 The fix in this patch is broken, unfortunately.
627 * pw/remote-set-url-fetch (2014-11-26) 1 commit
628 . remote: add --fetch and --both options to set-url
633 * tr/remerge-diff (2014-11-10) 9 commits
634 . t4213: avoid "|" in sed regexp
635 . log --remerge-diff: show what the conflict resolution changed
636 . name-hash: allow dir hashing even when !ignore_case
637 . merge-recursive: allow storing conflict hunks in index
638 . merge_diff_mode: fold all merge diff variants into an enum
639 . combine-diff: do not pass revs->dense_combined_merges redundantly
640 . merge-recursive: -Xindex-only to leave worktree unchanged
641 . merge-recursive: internal flag to avoid touching the worktree
642 . merge-recursive: remove dead conditional in update_stages()
644 "log -p" output learns a new way to let users inspect a merge
645 commit by showing the differences between the automerged result
646 with conflicts the person who recorded the merge would have seen
647 and the final conflict resolution that was recorded in the merge.
649 Waiting for a reroll.
653 * tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
654 - perf-lib: add test_perf_cleanup target
655 - perf-lib: split starting the test from the execution
657 Add test_perf_cleanup shell function to the perf suite, that allows
658 the script writers to define a test with a clean-up action.
663 * jc/show-branch (2014-03-24) 5 commits
664 - show-branch: use commit slab to represent bitflags of arbitrary width
665 - show-branch.c: remove "all_mask"
666 - show-branch.c: abstract out "flags" operation
667 - show-branch.c: lift all_mask/all_revs to a global static
668 - show-branch.c: update comment style
670 Waiting for the final step to lift the hard-limit.
672 --------------------------------------------------
675 * db/push-sign-if-asked (2015-08-19) 9 commits
676 - push: add a config option push.gpgSign for default signed pushes
677 - push: support signing pushes iff the server supports it
678 - builtin/send-pack.c: use parse_options API
679 - config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_bool
680 - transport: remove git_transport_options.push_cert
681 - gitremote-helpers.txt: document pushcert option
682 - Documentation/git-send-pack.txt: document --signed
683 - Documentation/git-send-pack.txt: wrap long synopsis line
684 - Documentation/git-push.txt: document when --signed may fail
686 The client side codepaths in "git push" have been cleaned up
687 and the user can request to perform an optional "signed push",
688 i.e. sign only when the other end accepts signed push.
690 I think this is ready for 'next', but did I miss comments that need
691 to be addressed before it happens?
694 * dk/gc-idx-wo-pack (2015-08-17) 3 commits
695 - DONTMERGE: log message, grace-period and tests $gmane/276058
696 - gc: remove stale .idx files without corresponding .pack file
697 - prepare_packed_git(): refactor garbage reporting in pack directory
699 Having a leftover .idx file without correspoinding .pack file in
700 the repository hurts performance; "git gc" learned to prune them.
705 * ep/http-configure-ssl-version (2015-08-17) 1 commit
706 (merged to 'next' on 2015-08-19 at aab726b)
707 + http: add support for specifying the SSL version
709 A new configuration variable http.sslVersion can be used to specify
710 what specific version of SSL/TLS to use to make a connection.
712 Will merge to 'master'.
715 * jv/send-email-selective-smtp-auth (2015-08-17) 1 commit
716 (merged to 'next' on 2015-08-19 at 3f0c693)
717 + send-email: provide whitelist of SMTP AUTH mechanisms
719 "git send-email" learned a new option --smtp-auth to limit the SMTP
720 AUTH mechanisms to be used to a subset of what the system library
723 Will merge to 'master'.
726 * po/po-readme (2015-08-17) 1 commit
727 (merged to 'next' on 2015-08-19 at 1899e59)
728 + po/README: Update directions for l10n contributors
730 Will merge to 'master'.
733 * pt/am-builtin-abort-fix (2015-08-19) 1 commit
734 (merged to 'next' on 2015-08-19 at 729e682)
735 + am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
737 "git am" that was recently reimplemented in C had a performance
738 regression in "git am --abort" that goes back to the version before
739 an attempted (and failed) patch application.
741 Will merge to 'master'.
744 * ss/fix-config-fd-leak (2015-08-14) 1 commit
745 (merged to 'next' on 2015-08-19 at 80d4880)
746 + config: close config file handle in case of error
748 Will merge to 'master'.
751 * bb/remote-get-url (2015-08-05) 1 commit
752 - remote: add get-url subcommand
754 "git remote" learned "get-url" subcommand to show the URL for a
755 given remote name used for fetching and pushing.
757 Waiting for a reroll.
761 * jk/notes-merge-config (2015-08-17) 6 commits
762 - notes: teach git-notes about notes.<name>.mergeStrategy option
763 - notes: add notes.mergeStrategy option to select default strategy
764 - notes: add tests for --commit/--abort/--strategy exclusivity
765 - notes: extract parse_notes_merge_strategy to notes-utils
766 - notes: extract enum notes_merge_strategy to notes-utils.h
767 - notes: document cat_sort_uniq rewriteMode
769 "git notes merge" can be told with "--strategy=<how>" option how to
770 automatically handle conflicts; this can now be configured by
771 setting notes.merge configuration variable.
773 I think this is ready for 'next', but did I miss comments that need
774 to be addressed before it happens?
777 * hv/submodule-config (2015-08-19) 4 commits
778 (merged to 'next' on 2015-08-25 at 82adb30)
779 + submodule: allow erroneous values for the fetchRecurseSubmodules option
780 + submodule: use new config API for worktree configurations
781 + submodule: extract functions for config set and lookup
782 + submodule: implement a config API for lookup of .gitmodules values
783 (this branch is used by sb/submodule-helper.)
785 The gitmodules API accessed from the C code learned to cache stuff
788 Will merge to 'master'.
791 * sb/submodule-helper (2015-08-25) 7 commits
792 - submodule: helper to run foreach in parallel
793 - thread-utils: add a threaded task queue
794 - FIXUP submodule: implement `module_clone` as a builtin helper
795 - submodule: implement `module_clone` as a builtin helper
796 - submodule: implement `module_name` as a builtin helper
797 - submodule: implement `module_list` as a builtin helper
798 - Merge 'hv/submodule-config' to 'sb/submodule-helper'
799 (this branch uses hv/submodule-config.)
801 The infrastructure to rewrite "git submodule" in C is being built
802 incrementally. These early part looks promising.
805 * dt/untracked-subdir (2015-08-19) 2 commits
806 (merged to 'next' on 2015-08-25 at ab4fd04)
807 + untracked cache: fix entry invalidation
808 + untracked-cache: fix subdirectory handling
809 (this branch uses dt/untracked-sparse.)
811 The experimental untracked-cache feature were buggy when paths with
812 a few levels of subdirectories are involved.
814 Will merge to 'master'.
817 * ad/cygwin-wants-rename (2015-08-07) 1 commit
818 - config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
824 * sg/config-name-only (2015-08-20) 6 commits
825 (merged to 'next' on 2015-08-25 at 6cb3b7d)
826 + get_urlmatch: avoid useless strbuf write
827 + format_config: simplify buffer handling
828 + format_config: don't init strbuf
829 + config: restructure format_config() for better control flow
830 (merged to 'next' on 2015-08-12 at c658fe4)
831 + completion: list variable names reliably with 'git config --name-only'
832 + config: add '--name-only' option to list only variable names
834 "git config --list" output was hard to parse when values consist of
835 multiple lines. "--name-only" option is added to help this.
837 Will merge to 'master'.
840 * kn/for-each-tag-branch (2015-08-03) 11 commits
841 (merged to 'next' on 2015-08-03 at d9e94b9)
842 + for-each-ref: add '--contains' option
843 + ref-filter: implement '--contains' option
844 + parse-options.h: add macros for '--contains' option
845 + parse-option: rename parse_opt_with_commit()
846 + for-each-ref: add '--merged' and '--no-merged' options
847 + ref-filter: implement '--merged' and '--no-merged' options
848 + ref-filter: add parse_opt_merge_filter()
849 + for-each-ref: add '--points-at' option
850 + ref-filter: implement '--points-at' option
851 + tag: libify parse_opt_points_at()
852 + t6302: for-each-ref tests for ref-filter APIs
853 (this branch is used by kn/for-each-tag.)
855 Originally merged to 'next' on 2015-07-15
857 Some features from "git tag -l" and "git branch -l" have been made
858 available to "git for-each-ref" so that eventually the unified
859 implementation can be shared across all three, in a follow-up
863 * jc/rerere (2015-07-24) 21 commits
864 - rerere: un-nest merge() further
865 - rerere: use "struct rerere_id" instead of "char *" for conflict ID
866 - rerere: call conflict-ids IDs
867 - rerere: further clarify do_rerere_one_path()
868 - rerere: further de-dent do_plain_rerere()
869 - rerere: refactor "replay" part of do_plain_rerere()
870 - rerere: explain the remainder
871 - rerere: explain "rerere forget" codepath
872 - rerere: explain the primary codepath
873 - rerere: explain MERGE_RR management helpers
874 - rerere: fix benign off-by-one non-bug and clarify code
875 - rerere: explain the rerere I/O abstraction
876 - rerere: do not leak mmfile[] for a path with multiple stage #1 entries
877 - rerere: stop looping unnecessarily
878 - rerere: drop want_sp parameter from is_cmarker()
879 - rerere: report autoupdated paths only after actually updating them
880 - rerere: write out each record of MERGE_RR in one go
881 - rerere: lift PATH_MAX limitation
882 - rerere: plug conflict ID leaks
883 - rerere: handle conflicts with multiple stage #1 entries
884 - rerere: fix an off-by-one non-bug
885 (this branch is used by jc/rerere-multi.)
887 Code clean-up and minor fixes (so far).
889 Will merge to 'next'.
892 * jc/rerere-multi (2015-07-30) 7 commits
893 . t4200: rerere a merge with two identical conflicts
895 . rerere: allow multiple variants to exist
896 - rerere: delay the recording of preimage
897 - rerere: handle leftover rr-cache/$ID directory and postimage files
898 - rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
899 - rerere: split conflict ID further
900 (this branch uses jc/rerere.)
902 "git rerere" can encounter two or more files with the same conflict
903 signature that have to be resolved in different ways, but there was
904 no way to record these separate resolutions.
907 * jc/merge-drop-old-syntax (2015-04-29) 1 commit
908 (merged to 'next' on 2015-08-03 at a52c2b2)
909 + merge: drop 'git merge <message> HEAD <commit>' syntax
911 Originally merged to 'next' on 2015-05-28
913 Stop supporting "git merge <message> HEAD <commit>" syntax that
914 has been deprecated since October 2007.
916 Will keep in 'next' during the 2.6 cycle.