{"thread":{"id":"40313","subject":"What's cooking in git.git (Sep 2015, #02; Wed, 9)","startedAt":"2015-09-09T20:56:26Z","lastAt":"2015-09-10T15:54:42Z","messageCount":3,"participants":["Junio C Hamano","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"269668","messageId":"xmqqpp1r5n2d.fsf@gitster.mtv.corp.google.com","threadId":"40313","inReplyTo":null,"subject":"What's cooking in git.git (Sep 2015, #02; Wed, 9)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-09-09T20:56:26Z","receivedAt":"2015-09-09T20:56:26Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here are the topics that have been cooking.  Commits prefixed with\n'-' are only in 'pu' (proposed updates) while commits prefixed with\n'+' are in 'next'.\n\nThe first release candidate 2.6-rc1 has been tagged.  Let's make\nsure we catch any possible regressions from now on, without getting\ndistracted by yet more shiny new features.  On the 'maint' front,\nwe'll have 2.5.2 tomorrow.\n\nYou can find the changes described here in the integration branches\nof the repositories listed at\n\n    http://git-blame.blogspot.com/p/git-public-repositories.html\n\n--------------------------------------------------\n[Graduated to \"master\"]\n\n* jc/builtin-am-signoff-regression-fix (2015-09-06) 1 commit\n  (merged to 'next' on 2015-09-06 at 7e84b6f)\n + am: match --signoff to the original scripted version\n\n Recent \"git am\" had regression when adding a Signed-off-by line\n with its \"-s\" option by an unintended tightening of how an existing\n trailer block is detected.\n\n\n* jk/am-rerere-lock-fix (2015-09-01) 1 commit\n  (merged to 'next' on 2015-09-02 at 686c5c0)\n + rerere: release lockfile in non-writing functions\n\n Recent \"git am\" introduced a double-locking failure when used with\n the \"--3way\" option that invokes rerere machinery.\n\n--------------------------------------------------\n[New Topics]\n\n* jk/connect-clear-env (2015-09-08) 2 commits\n  (merged to 'next' on 2015-09-08 at 86b64f7)\n + git_connect: clarify conn->use_shell flag\n  (merged to 'next' on 2015-09-06 at 9ddbed8)\n + git_connect: clear GIT_* environment for ssh\n\n The ssh transport, just like any other transport over the network,\n did not clear GIT_* environment variables, but it is possible to\n use SendEnv and AcceptEnv to leak them to the remote invocation of\n Git, which is not a good idea at all.  Explicitly clear them just\n like we do for the local transport.\n\n Will merge to 'master'.\n\n\n* jk/pack-protocol-doc (2015-09-03) 1 commit\n  (merged to 'next' on 2015-09-08 at 98d861d)\n + pack-protocol: clarify LF-handling in PKT-LINE()\n\n Streamline documentation of the pkt-line protocol.\n\n Will merge to 'master'.\n\n\n* ti/glibc-stdio-mutex-from-signal-handler (2015-09-04) 1 commit\n  (merged to 'next' on 2015-09-08 at c8047ba)\n + pager: don't use unsafe functions in signal handlers\n\n Allocation related functions and stdio are unsafe things to call\n inside a signal handler, and indeed killing the pager can cause\n glibc to deadlock waiting on allocation mutex as our signal handler\n tries to free() some data structures in wait_for_pager().  Reduce\n these unsafe calls.\n\n I seem to recall Peff had other ideas?  Let's revisit this in the\n next cycle.\n\n\n* as/subtree-with-spaces (2015-09-08) 2 commits\n  (merged to 'next' on 2015-09-09 at f3d763d)\n + contrib/subtree: respect spaces in a repository path\n + t7900-subtree: test the \"space in a subdirectory name\" case\n\n Update \"git subtree\" (in contrib/) so that it can take whitespaces\n in the pathnames, not only in the in-tree pathname but the name of\n the directory that the repository is in.\n\n Will merge to 'master'.\n\n\n* gb/apply-comment-typofix (2015-09-09) 1 commit\n  (merged to 'next' on 2015-09-09 at 29fb0ff)\n + apply: comment grammar fix\n\n Will merge to 'master'.\n\n\n* gb/filter-branch-progress (2015-09-08) 1 commit\n - filter-branch: add passed/remaining seconds on progress\n\n Give progress meter to \"git filter-branch\".\n\n Is a reroll coming?\n\n\n* jk/interpret-trailers-outside-a-repository (2015-09-08) 1 commit\n  (merged to 'next' on 2015-09-09 at a75fce3)\n + interpret-trailers: allow running outside a repository\n\n Allow \"git interpret-trailers\" to run outside of a Git repository.\n\n Will merge to 'master'.\n\n\n* jk/test-lint-forbid-when-finished-in-subshell (2015-09-08) 5 commits\n  (merged to 'next' on 2015-09-09 at 74ede61)\n + test-lib-functions: detect test_when_finished in subshell\n + t7800: don't use test_config in a subshell\n + test-lib-functions: support \"test_config -C <dir> ...\"\n + t5801: don't use test_when_finished in a subshell\n + t7610: don't use test_config in a subshell\n\n Because \"test_when_finished\" in our test framework queues the\n clean-up tasks to be done in a shell variable, it should not be\n used inside a subshell.  Add a mechanism to allow 'bash' to catch\n such uses, and fix the ones that were found.\n\n Will merge to 'master'.\n\n\n* ls/p4-lfs (2015-09-09) 5 commits\n - git-p4: add Git LFS backend for large file system\n - git-p4: add support for large file systems\n - git-p4: return an empty list if a list config has no values\n - git-p4: add gitConfigInt reader\n - git-p4: add optional type specifier to gitConfig reader\n\n Teach \"git p4\" to send large blobs outside the repository by\n talking to Git LFS.\n\n\n* nd/clone-linked-checkout (2015-09-07) 5 commits\n - clone: better error when --reference is a linked checkout\n - clone: allow --local from a linked checkout\n - enter_repo: allow .git files in strict mode\n - enter_repo: avoid duplicating logic, use is_git_directory() instead\n - path.c: delete an extra space\n\n It was not possible to use a repository-lookalike created by \"git\n worktree add\" as a local source of \"git clone\".\n\n Is a reroll coming?\n\n--------------------------------------------------\n[Stalled]\n\n* sb/remove-get-pathspec (2015-08-03) 1 commit\n - builtin/mv: remove get_pathspec()\n\n Will discard.\n ($gmane/276104)\n\n\n* mk/submodule-gitdir-path (2015-08-05) 2 commits\n - path: implement common_dir handling in git_path_submodule()\n - submodule refactor: use git_path_submodule() in add_submodule_odb()\n\n The submodule code has been taught to work better with separate\n work trees created via \"git worktree add\".\n\n Waiting for a review.\n ($gmane/275340).\n\n\n* nd/list-files (2015-02-09) 21 commits\n - t3080: tests for git-list-files\n - list-files: -M aka diff-cached\n - list-files -F: show submodules with the new indicator '&'\n - list-files: add -F/--classify\n - list-files: show directories as well as files\n - list-files: do not show duplicate cached entries\n - list-files: sort output and remove duplicates\n - list-files: add -t back\n - list-files: add -1 short for --no-column\n - list-files: add -R/--recursive short for --max-depth=-1\n - list-files: -u does not imply showing stages\n - list-files: make alias 'ls' default to 'list-files'\n - list-files: a user friendly version of ls-files and more\n - ls-files: support --max-depth\n - ls-files: add --column\n - ls-files: add --color to highlight file names\n - ls-files: buffer full item in strbuf before printing\n - ls_colors.c: highlight submodules like directories\n - ls_colors.c: add a function to color a file name\n - ls_colors.c: parse color.ls.* from config file\n - ls_colors.c: add $LS_COLORS parsing code\n\n A new \"git list-files\" Porcelain command, \"ls-files\" with bells and\n whistles.\n\n Reroll to base on wt-status work ($gmane/265142) has seen some\n positive discussions.\n\n Waiting for a further polished reroll ($gmane/265534).\n\n\n* mh/numparse (2015-03-19) 14 commits\n . diff_opt_parse(): use convert_i() when handling --abbrev=<num>\n . diff_opt_parse(): use convert_i() when handling \"-l<num>\"\n . opt_arg(): simplify pointer handling\n . opt_arg(): report errors parsing option values\n . opt_arg(): use convert_i() in implementation\n . opt_arg(): val is always non-NULL\n . builtin_diff(): detect errors when parsing --unified argument\n . handle_revision_opt(): use convert_ui() when handling \"--abbrev=\"\n . strtoul_ui(), strtol_i(): remove functions\n . handle_revision_opt(): use convert_i() when handling \"-<digit>\"\n . handle_revision_opt(): use skip_prefix() in many places\n . write_subdirectory(): use convert_ui() for parsing mode\n . cacheinfo_callback(): use convert_ui() when handling \"--cacheinfo\"\n . numparse: new module for parsing integral numbers\n\n Many codepaths use unchecked use of strtol() and friends (or even\n worse, atoi()).  Introduce a set of wrappers that try to be more\n careful.\n\n Waiting for a reroll.\n ($gmane/268058).\n\n\n* kk/log-merges-config (2015-04-21) 5 commits\n - bash-completion: add support for git-log --merges= and log.merges\n - t4202-log: add tests for --merges=\n - Documentation: add git-log --merges= option and log.merges config. var\n - log: honor log.merges= option\n - revision: add --merges={show|only|hide} option\n\n \"git log\" (but not other commands in the \"log\" family) learned to\n pay attention to the log.merges configuration variable that can be\n set to \"show\" (the normal behaviour), \"only\" (hide non-merge\n commits), or \"hide\" (hide merge commits).  --merges=(show|only|hide)\n can be used to override the setting from the command line.\n\n The documentation may need to be updated once more ($gmane/267250).\n Waiting for a reroll.\n\n\n* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits\n - t/lib-git-svn: check same httpd module dirs as lib-httpd\n - t/lib-httpd: load mod_unixd\n\n This is the first two commits in a three-patch series $gmane/266962\n\n Waiting for a reroll.\n with updated log message ($gmane/268061).\n\n\n* bw/portability-solaris (2015-07-20) 3 commits\n - tests: fix sed usage in tests to work around broken xpg4/sed on Solaris\n - tests: fix sed usage in tests to work around broken xpg4/sed on Solaris\n - tests: modify tr expressions so that xpg4/tr handles it on Solaris\n\n Needs another reroll?\n ($gmane/274296)\n\n\n* jc/clone-bundle (2015-04-30) 1 commit\n - repack: optionally create a clone.bundle\n\n Waiting for further work.\n Still an early WIP.\n\n\n* mg/index-read-error-messages (2015-06-01) 2 commits\n - messages: uniform error messages for index write\n - show-index: uniform error messages for index read\n\n The tip was RFC.\n Waiting for a reroll.\n\n\n* wp/sha1-name-negative-match (2015-06-08) 2 commits\n - sha1_name.c: introduce '^{/!-<negative pattern>}' notation\n - test for '!' handling in rev-parse's named commits\n\n Introduce \"branch^{/!-<pattern>}\" notation to name a commit\n reachable from branch that does not match the given pattern.\n\n Waiting for a reroll.\n\n\n* mk/utf8-no-iconv-warn (2015-06-08) 1 commit\n - utf8.c: print warning about disabled iconv\n\n Warn when a reencoding is requested in a build without iconv\n support, as the end user is likely to get an unexpected result.  I\n think the same level of safety should be added to a build with\n iconv support when the specified encoding is not available, but the\n patch does not go there.\n\n Waiting for a reroll.\n\n\n* ak/format-patch-odir-config (2015-06-19) 1 commit\n - format-patch: introduce format.outputDirectory configuration\n\n Reroll exists but didn't pick it up as it seemed to be still\n collecting review comments.\n\n Waiting for a reroll.\n ($gmane/272180).\n\n\n* mh/notes-allow-reading-treeish (2015-07-13) 1 commit\n - notes: allow treeish expressions as notes ref\n\n Some \"git notes\" operations, e.g. \"git log --notes=<note>\", should\n be able to read notes from any tree-ish that is shaped like a notes\n tree, but the notes infrastructure required that the argument must\n be a ref under refs/notes/.  Loosen it to require a valid ref only\n when the operation would update the notes (in which case we must\n have a place to store the updated notes tree, iow, a ref).\n\n Needs update to docs.\n ($gmane/273928)\n\n\n* jc/diff-b-m (2015-02-23) 5 commits\n . WIPWIP\n . WIP: diff-b-m\n - diffcore-rename: allow easier debugging\n - diffcore-rename.c: add locate_rename_src()\n - diffcore-break: allow debugging\n\n \"git diff -B -M\" produced incorrect patch when the postimage of a\n completely rewritten file is similar to the preimage of a removed\n file; such a resulting file must not be expressed as a rename from\n other place.\n\n The fix in this patch is broken, unfortunately.\n\n\n* pw/remote-set-url-fetch (2014-11-26) 1 commit\n . remote: add --fetch and --both options to set-url\n\n Ejected.\n\n\n* tr/remerge-diff (2014-11-10) 9 commits\n . t4213: avoid \"|\" in sed regexp\n . log --remerge-diff: show what the conflict resolution changed\n . name-hash: allow dir hashing even when !ignore_case\n . merge-recursive: allow storing conflict hunks in index\n . merge_diff_mode: fold all merge diff variants into an enum\n . combine-diff: do not pass revs->dense_combined_merges redundantly\n . merge-recursive: -Xindex-only to leave worktree unchanged\n . merge-recursive: internal flag to avoid touching the worktree\n . merge-recursive: remove dead conditional in update_stages()\n\n \"log -p\" output learns a new way to let users inspect a merge\n commit by showing the differences between the automerged result\n with conflicts the person who recorded the merge would have seen\n and the final conflict resolution that was recorded in the merge.\n\n Waiting for a reroll.\n ($gmane/256591).\n\n\n* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits\n - perf-lib: add test_perf_cleanup target\n - perf-lib: split starting the test from the execution\n\n Add test_perf_cleanup shell function to the perf suite, that allows\n the script writers to define a test with a clean-up action.\n\n Will hold.\n\n\n* jc/show-branch (2014-03-24) 5 commits\n - show-branch: use commit slab to represent bitflags of arbitrary width\n - show-branch.c: remove \"all_mask\"\n - show-branch.c: abstract out \"flags\" operation\n - show-branch.c: lift all_mask/all_revs to a global static\n - show-branch.c: update comment style\n\n Waiting for the final step to lift the hard-limit.\n\n--------------------------------------------------\n[Cooking]\n\n* jh/quiltimport-explicit-series-file (2015-09-01) 1 commit\n  (merged to 'next' on 2015-09-02 at 1129ca4)\n + git-quiltimport: add commandline option --series <file>\n\n \"quiltimport\" allows to specify the series file by honoring the\n $QUILT_SERIES environment and also --series command line option.\n\n Will merge to 'master'.\n\n\n* jk/async-pkt-line (2015-09-01) 2 commits\n  (merged to 'next' on 2015-09-02 at e185717)\n + pkt-line: show packets in async processes as \"sideband\"\n + run-command: provide in_async query function\n\n The debugging infrastructure for pkt-line based communication has\n been improved to mark the side-band communicatio specifically.\n\n Will merge to 'master'.\n\n\n* mp/t7060-diff-index-test (2015-09-02) 1 commit\n  (merged to 'next' on 2015-09-08 at 80ff284)\n + t7060: actually test \"git diff-index --cached -M\"\n\n Fix an old test that was doing the same thing as another one.\n\n Will merge to 'master'.\n\n\n* ah/show-ref-usage-string (2015-08-31) 1 commit\n  (merged to 'next' on 2015-09-08 at dc512c8)\n + show-ref: place angle brackets around variables in usage string\n\n Both \"git show-ref -h\" and \"git show-ref --help\" illustrated that the\n \"--exclude-existing\" option makes the command read list of refs\n from its standard input.  Change only the \"show-ref -h\" output to\n have a pair of \"<>\" around the placeholder that designate an input\n file, i.e. \"git show-ref --exclude-existing < <ref-list>\".\n\n Will merge to 'master'.\n\n\n* jk/date-local (2015-09-03) 11 commits\n  (merged to 'next' on 2015-09-08 at 66781d9)\n + t6300: add tests for \"-local\" date formats\n + t6300: make UTC and local dates different\n + date: make \"local\" orthogonal to date format\n + date: check for \"local\" before anything else\n + t6300: add test for \"raw\" date format\n + t6300: introduce test_date() helper\n + fast-import: switch crash-report date to iso8601\n + Documentation/rev-list: don't list date formats\n + Documentation/git-for-each-ref: don't list date formats\n + Documentation/config: don't list date formats\n + Documentation/blame-options: don't list date formats\n\n \"git log --date=local\" used to only allow to show the normal\n (default) format in the local timezone. The command learned to take\n 'local' as an instruction to use the local timezone with other\n formats, e.g. \"git show --date=rfc-local\".\n\n Will merge to 'master'.\n\n\n* nk/stash-show-config (2015-08-31) 1 commit\n  (merged to 'next' on 2015-09-08 at 90dd06f)\n + stash: allow \"stash show\" diff output configurable\n\n Users who are too busy to type three extra keystrokes to ask for\n \"git stash show -p\" can now set stash.showPatch configuration\n varible to true to always see the actual patch, not just the list\n of paths affected with feel for the extent of damage via diffstat.\n\n Will merge to 'master'.\n\n\n* ls/p4-path-encoding (2015-09-03) 1 commit\n  (merged to 'next' on 2015-09-08 at 56514f9)\n + git-p4: add config git-p4.pathEncoding\n\n \"git p4\" learned to reencode the pathname it uses to communicate\n with the p4 depot with a new option.\n\n Will merge to 'master'.\n\n\n* ad/bisect-terms (2015-08-03) 4 commits\n  (merged to 'next' on 2015-09-01 at ede6e64)\n + bisect: allow setting any user-specified in 'git bisect start'\n + bisect: add 'git bisect terms' to view the current terms\n + bisect: add the terms old/new\n + bisect: sanity check on terms\n\n The use of 'good/bad' in \"git bisect\" made it confusing to use when\n hunting for a state change that is not a regression (e.g. bugfix).\n The command learned 'old/new' and then allows the end user to\n say e.g. \"bisect start --term-old=fast --term=new=slow\" to find a\n performance regression.\n\n Michael's idea to make 'good/bad' more intelligent does have\n certain attractiveness ($gname/272867), and makes some of the work\n on this topic a moot point.\n\n Will merge to 'master'.\n\n\n* dt/refs-bisection (2015-09-01) 3 commits\n  (merged to 'next' on 2015-09-08 at 2b66bad)\n + refs: make refs/bisect/* per-worktree\n + path: optimize common dir checking\n + refs: clean up common_list\n\n Move the refs used during a \"git bisect\" session to per-worktree\n hierarchy refs/worktree/* so that independent bisect sessions can\n be done in different worktrees.\n\n Will merge to 'master'.\n\n\n* ld/p4-import-labels (2015-08-28) 3 commits\n  (merged to 'next' on 2015-09-01 at cf9f1d6)\n + git-p4: fix P4 label import for unprocessed commits\n + git-p4: do not terminate creating tag for unknown commit\n + git-p4: failing test for ignoring invalid p4 labels\n\n Will merge to 'master'.\n\n\n* kn/for-each-tag (2015-08-25) 15 commits\n - SQUASH??? a tag longer than 15 bytes break alignment but keeps SP before the message\n - tag.c: implement '--merged' and '--no-merged' options\n - tag.c: implement '--format' option\n - tag.c: use 'ref-filter' APIs\n - tag.c: use 'ref-filter' data structures\n - ref-filter: add option to match literal pattern\n - ref-filter: add support to sort by version\n - ref-filter: support printing N lines from tag annotation\n - ref-filter: add option to filter out tags, branches and remotes\n - ref-filter: implement an `align` atom\n - utf8: add function to align a string into given strbuf\n - ref-filter: introduce ref_formatting_state and ref_formatting_stack\n - ref-filter: move `struct atom_value` to ref-filter.c\n - Merge 'jk/git-path' into kn/for-each-tag\n - Merge 'kn/for-each-tag-branch' into kn/for-each-tag\n (this branch uses kn/for-each-tag-branch.)\n\n The \"ref-filter\" code was taught about many parts of what \"tag -l\"\n does and then \"tag -l\" is reimplemented in terms of \"ref-filter\".\n\n Almost there...\n A reroll exists at v16, but it seems there will be another one.\n\n\n* nd/ita-cleanup (2015-09-06) 6 commits\n - grep: make it clear i-t-a entries are ignored\n - checkout(-index): do not checkout i-t-a entries\n - apply: make sure check_preimage() does not leave empty file on error\n - apply: fix adding new files on i-t-a entries\n - add and use a convenience macro ce_intent_to_add()\n - blame: remove obsolete comment\n\n Paths that have been told the index about with \"add -N\" are not yet\n in the index, but various commands behaved as if they already are.\n\n Some commits need better explanation.\n\n Waiting for a reroll.\n\n\n* dk/gc-idx-wo-pack (2015-08-17) 3 commits\n - DONTMERGE: log message, grace-period and tests $gmane/276058\n - gc: remove stale .idx files without corresponding .pack file\n - prepare_packed_git(): refactor garbage reporting in pack directory\n\n Having a leftover .idx file without correspoinding .pack file in\n the repository hurts performance; \"git gc\" learned to prune them.\n\n Waiting for a reroll.\n\n\n* bb/remote-get-url (2015-09-04) 1 commit\n - remote: add get-url subcommand\n\n \"git remote\" learned \"get-url\" subcommand to show the URL for a\n given remote name used for fetching and pushing.\n\n Waiting for a reroll.\n ($gmane/275401)\n\n\n* sb/submodule-helper (2015-09-08) 4 commits\n - submodule: rewrite `module_clone` shell function in C\n - submodule: rewrite `module_name` shell function in C\n - submodule: rewrite `module_list` shell function in C\n - Merge 'hv/submodule-config' to 'sb/submodule-helper'\n\n The infrastructure to rewrite \"git submodule\" in C is being built\n incrementally.  Let's polish these early parts well enough and make\n them graduate to 'next' and 'master', so that the more involved\n follow-up can start cooking on a solid ground.\n\n Looked ready for 'next'.  Comments from others?\n\n\n* ad/cygwin-wants-rename (2015-08-07) 1 commit\n - config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES\n\n Will hold.\n ($gmane/275680).\n\n\n* kn/for-each-tag-branch (2015-08-03) 11 commits\n  (merged to 'next' on 2015-08-03 at d9e94b9)\n + for-each-ref: add '--contains' option\n + ref-filter: implement '--contains' option\n + parse-options.h: add macros for '--contains' option\n + parse-option: rename parse_opt_with_commit()\n + for-each-ref: add '--merged' and '--no-merged' options\n + ref-filter: implement '--merged' and '--no-merged' options\n + ref-filter: add parse_opt_merge_filter()\n + for-each-ref: add '--points-at' option\n + ref-filter: implement '--points-at' option\n + tag: libify parse_opt_points_at()\n + t6302: for-each-ref tests for ref-filter APIs\n (this branch is used by kn/for-each-tag.)\n\n Originally merged to 'next' on 2015-07-15\n\n Some features from \"git tag -l\" and \"git branch -l\" have been made\n available to \"git for-each-ref\" so that eventually the unified\n implementation can be shared across all three, in a follow-up\n series or two.\n\n Will merge to 'master'.\n\n\n* jc/rerere (2015-07-24) 21 commits\n  (merged to 'next' on 2015-08-26 at 8ae15ef)\n + rerere: un-nest merge() further\n + rerere: use \"struct rerere_id\" instead of \"char *\" for conflict ID\n + rerere: call conflict-ids IDs\n + rerere: further clarify do_rerere_one_path()\n + rerere: further de-dent do_plain_rerere()\n + rerere: refactor \"replay\" part of do_plain_rerere()\n + rerere: explain the remainder\n + rerere: explain \"rerere forget\" codepath\n + rerere: explain the primary codepath\n + rerere: explain MERGE_RR management helpers\n + rerere: fix benign off-by-one non-bug and clarify code\n + rerere: explain the rerere I/O abstraction\n + rerere: do not leak mmfile[] for a path with multiple stage #1 entries\n + rerere: stop looping unnecessarily\n + rerere: drop want_sp parameter from is_cmarker()\n + rerere: report autoupdated paths only after actually updating them\n + rerere: write out each record of MERGE_RR in one go\n + rerere: lift PATH_MAX limitation\n + rerere: plug conflict ID leaks\n + rerere: handle conflicts with multiple stage #1 entries\n + rerere: fix an off-by-one non-bug\n (this branch is used by jc/rerere-multi.)\n\n Code clean-up and minor fixes.\n\n Will merge to 'master'.\n\n\n* jc/rerere-multi (2015-07-30) 7 commits\n . t4200: rerere a merge with two identical conflicts\n . WIP\n . rerere: allow multiple variants to exist\n - rerere: delay the recording of preimage\n - rerere: handle leftover rr-cache/$ID directory and postimage files\n - rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id\n - rerere: split conflict ID further\n (this branch uses jc/rerere.)\n\n \"git rerere\" can encounter two or more files with the same conflict\n signature that have to be resolved in different ways, but there was\n no way to record these separate resolutions.\n\n\n* jc/merge-drop-old-syntax (2015-04-29) 1 commit\n  (merged to 'next' on 2015-08-03 at a52c2b2)\n + merge: drop 'git merge <message> HEAD <commit>' syntax\n\n Originally merged to 'next' on 2015-05-28\n\n Stop supporting \"git merge <message> HEAD <commit>\" syntax that\n has been deprecated since October 2007.\n\n Will keep in 'next' during the 2.6 cycle.\n"},{"id":"269679","messageId":"20150910092922.GB6633@sigill.intra.peff.net","threadId":"40313","inReplyTo":"xmqqpp1r5n2d.fsf@gitster.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Sep 2015, #02; Wed, 9)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-09-10T09:29:23Z","receivedAt":"2015-09-10T09:29:23Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Sep 09, 2015 at 01:56:26PM -0700, Junio C Hamano wrote:\n\n> * ti/glibc-stdio-mutex-from-signal-handler (2015-09-04) 1 commit\n>   (merged to 'next' on 2015-09-08 at c8047ba)\n>  + pager: don't use unsafe functions in signal handlers\n> \n>  Allocation related functions and stdio are unsafe things to call\n>  inside a signal handler, and indeed killing the pager can cause\n>  glibc to deadlock waiting on allocation mutex as our signal handler\n>  tries to free() some data structures in wait_for_pager().  Reduce\n>  these unsafe calls.\n> \n>  I seem to recall Peff had other ideas?  Let's revisit this in the\n>  next cycle.\n\nYeah, I'm hoping to do a pass soon over all of the signal handling code,\nbecause the problem exists elsewhere, too.  I don't mind if this makes\nit into v2.6.0 and I build on top, though. It seems like an obvious\nstrict improvement to me.\n\nI did wonder if we needed to deal with any fallout from f4c3edc\n(vreportf: avoid intermediate buffer, 2015-08-11). That _is_ new in this\nrelease, so regressions are fair game during the -rc period.\n\nI don't think it should matter, though. Though it does add an fflush(), it\nis replacing an existing fprintf(), and both should be taking the same\nlock on stderr (so it probably _is_ still a potential problem, but not a\nnew one).\n\nThe predecessor commit, 3b331e9, does convert a write() into an\nfprintf(), but this code path is used only in a newly-forked child\nprocess before it execs. I think that is OK, though; we are operating on\na newly created filehandle that is not used anywhere else.\n\n-Peff\n"},{"id":"269697","messageId":"xmqqbnda5kxp.fsf@gitster.mtv.corp.google.com","threadId":"40313","inReplyTo":"20150910092922.GB6633@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Sep 2015, #02; Wed, 9)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-09-10T15:54:42Z","receivedAt":"2015-09-10T15:54:42Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> I did wonder if we needed to deal with any fallout from f4c3edc\n> (vreportf: avoid intermediate buffer, 2015-08-11). That _is_ new in this\n> release, so regressions are fair game during the -rc period.\n\nYeah, and the most obvious way to deal with it is just to revert,\nbut as you point out, it is not really introducing a new issue, so\nthere is not much point doing that, I would think.\n\n> I don't think it should matter, though. Though it does add an fflush(), it\n> is replacing an existing fprintf(), and both should be taking the same\n> lock on stderr (so it probably _is_ still a potential problem, but not a\n> new one).\n\nYeah, I reached the same conclusion.\n\nThanks.\n"}]}