{"thread":{"id":"44956","subject":"What's cooking in git.git (Jan 2017, #04; Mon, 23)","startedAt":"2017-01-24T00:19:01Z","lastAt":"2017-01-26T18:07:04Z","messageCount":15,"participants":["Junio C Hamano","Lars Schneider","Jeff King","Johannes Schindelin","Stefan Beller"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"310052","messageId":"xmqqo9yxpaxk.fsf@gitster.mtv.corp.google.com","threadId":"44956","inReplyTo":null,"subject":"What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-01-24T00:18:47Z","receivedAt":"2017-01-24T00:19:01Z","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'. The ones marked with '.' do not appear in any of\nthe integration branches, but I am still holding onto them.\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* ad/bisect-terms (2017-01-13) 1 commit\n (merged to 'next' on 2017-01-18 at 9f500d6cf5)\n + Documentation/bisect: improve on (bad|new) and (good|bad)\n\n Documentation fix.\n\n\n* bw/read-blob-data-does-not-modify-index-state (2017-01-11) 1 commit\n (merged to 'next' on 2017-01-18 at f33363fb07)\n + index: improve constness for reading blob data\n\n Code clean-up.\n\n\n* jk/grep-e-could-be-extended-beyond-posix (2017-01-11) 1 commit\n (merged to 'next' on 2017-01-18 at dd1b9d1fa8)\n + t7810: avoid assumption about invalid regex syntax\n\n Tighten a test to avoid mistaking an extended ERE regexp engine as\n a PRE regexp engine.\n\n\n* rh/diff-orderfile-doc (2017-01-15) 2 commits\n (merged to 'next' on 2017-01-18 at cc2af9c628)\n + diff: document the format of the -O (diff.orderFile) file\n + diff: document behavior of relative diff.orderFile\n\n Documentation fix.\n\n\n* sb/cd-then-git-can-be-written-as-git-c (2017-01-13) 1 commit\n (merged to 'next' on 2017-01-18 at 8923d2d001)\n + lib-submodule-update.sh: reduce use of subshell by using \"git -C\"\n\n Test clean-up.\n\n\n* sb/submodule-config-tests (2017-01-12) 2 commits\n (merged to 'next' on 2017-01-18 at bd850f6ad3)\n + t7411: test lookup of uninitialized submodules\n + t7411: quote URLs\n\n Test updates.\n\n\n* sb/submodule-embed-gitdir (2017-01-12) 1 commit\n (merged to 'next' on 2017-01-18 at 0a5e24a3f0)\n + submodule absorbgitdirs: mention in docstring help\n\n Help-text fix.\n\n\n* sb/submodule-init (2017-01-12) 1 commit\n (merged to 'next' on 2017-01-18 at 2e8a38b1cc)\n + submodule update --init: display correct path from submodule\n\n Error message fix.\n\n\n* sg/fix-versioncmp-with-common-suffix (2017-01-12) 8 commits\n (merged to 'next' on 2017-01-18 at f79c24a291)\n + versioncmp: generalize version sort suffix reordering\n + versioncmp: factor out helper for suffix matching\n + versioncmp: use earliest-longest contained suffix to determine sorting order\n + versioncmp: cope with common part overlapping with prerelease suffix\n + versioncmp: pass full tagnames to swap_prereleases()\n + t7004-tag: add version sort tests to show prerelease reordering issues\n + t7004-tag: use test_config helper\n + t7004-tag: delete unnecessary tags with test_when_finished\n\n The prereleaseSuffix feature of version comparison that is used in\n \"git tag -l\" did not correctly when two or more prereleases for the\n same release were present (e.g. when 2.0, 2.0-beta1, and 2.0-beta2\n are there and the code needs to compare 2.0-beta1 and 2.0-beta2).\n\n\n* vn/diff-ihc-config (2017-01-12) 1 commit\n (merged to 'next' on 2017-01-18 at ac4915dbe6)\n + diff: add interhunk context config option\n\n \"git diff\" learned diff.interHunkContext configuration variable\n that gives the default value for its --inter-hunk-context option.\n\n\n* ws/request-pull-code-cleanup (2017-01-15) 1 commit\n (merged to 'next' on 2017-01-18 at dfcb1405de)\n + request-pull: drop old USAGE stuff\n\n Code clean-up.\n\n--------------------------------------------------\n[New Topics]\n\n* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits\n - grep: use '/' delimiter for paths\n - grep: only add delimiter if there isn't one already\n\n \"git grep\", when fed a tree-ish as an input, shows each hit\n prefixed with \":::\". As is\n almost always either a commit or a tag that points at a commit, the\n early part of the output \":\" can be used as the\n name of the blob and given to \"git show\". When is a\n tree given in the extended SHA-1 syntax (e.g. \":\", or\n \":\"), however, this results in a string that does not\n name a blob (e.g. \"::\" or \"::\").\n \"git grep\" has been taught to be a bit more intelligent about these\n cases and omit a colon (in the former case) or use slash (in the\n latter case) to produce \":\" and\n \":/\" that can be used as the name of a blob.\n\n Waiting for the review discussion to settle, followed by a reroll.\n\n\n* vp/show-ref-verify-head (2017-01-23) 5 commits\n - show-ref: remove dead `if (verify)' check\n - show-ref: detect dangling refs under --verify as well\n - show-ref: move --quiet handling into show_one()\n - show-ref: allow -d to work with --verify\n - show-ref: accept HEAD with --verify\n\n \"git show-ref HEAD\" used with \"--verify\" because the user is not\n interested in seeing refs/remotes/origin/HEAD, and used with\n \"--head\" because the user does not want HEAD to be filtered out,\n i.e. \"git show-ref --head --verify HEAD\", did not work as expected.\n\n Will merge to 'next'.\n\n\n* bc/use-asciidoctor-opt (2017-01-23) 7 commits\n - Makefile: add a knob to enable the use of Asciidoctor\n - Documentation: move dblatex arguments into variable\n - Documentation: add XSLT to fix DocBook for Texinfo\n - Documentation: sort sources for gitman.texi\n - Documentation: remove unneeded argument in cat-texi.perl\n - Documentation: modernize cat-texi.perl\n - Documentation: fix warning in cat-texi.perl\n\n Asciidoctor, an alternative reimplementation of AsciiDoc, still\n needs some changes to work with documents meant to be formatted\n with AsciiDoc. \"make USE_ASCIIDOCTOR=YesPlease\" to use it out of\n the box to document our pages is getting closer to reality.\n\n\n* ls/travis-p4-on-macos (2017-01-23) 1 commit\n (merged to 'next' on 2017-01-23 at 2d51987faa)\n + travis-ci: fix Perforce install on macOS\n\n Update the definition of the MacOSX test environment used by\n TravisCI.\n\n Will merge to 'master'.\n\n\n* rs/qsort-s (2017-01-23) 5 commits\n - ref-filter: use QSORT_S in ref_array_sort()\n - string-list: use QSORT_S in string_list_sort()\n - perf: add basic sort performance test\n - add QSORT_S\n - compat: add qsort_s()\n\n A few codepaths had to rely on a global variable when sorting\n elements of an array because sort(3) API does not allow extra data\n to be passed to the comparison function. Use qsort_s() when\n natively available, and a fallback implementation of it when not,\n to eliminate the need, which is a prerequisite for making the\n codepath reentrant.\n\n Will merge to 'next'.\n\n--------------------------------------------------\n[Stalled]\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 Will discard.\n\n--------------------------------------------------\n[Cooking]\n\n* jk/coding-guidelines-update (2017-01-17) 1 commit\n (merged to 'next' on 2017-01-23 at 8c57afa288)\n + CodingGuidelines: clarify multi-line brace style\n\n Developer doc update.\n\n Will merge to 'master'.\n\n\n* jk/fsck-connectivity-check-fix (2017-01-17) 6 commits\n (merged to 'next' on 2017-01-23 at e8e9b76b84)\n + fsck: check HAS_OBJ more consistently\n + fsck: do not fallback \"git fsck \" to \"git fsck\"\n + fsck: tighten error-checks of \"git fsck \"\n + fsck: prepare dummy objects for --connectivity-check\n + fsck: report trees as dangling\n + t1450: clean up sub-objects in duplicate-entry test\n\n \"git fsck --connectivity-check\" was not working at all.\n\n Will merge to 'master'.\n\n\n* js/exec-path-coverity-workaround (2017-01-09) 2 commits\n (merged to 'next' on 2017-01-23 at bf5dfbf860)\n + git_exec_path: do not return the result of getenv()\n + git_exec_path: avoid Coverity warning about unfree()d result\n\n Code cleanup.\n\n Will merge to 'master'.\n Split out of another topic.\n\n\n* js/mingw-isatty (2017-01-18) 1 commit\n (merged to 'next' on 2017-01-23 at ae0f80e058)\n + mingw: follow-up to \"replace isatty() hack\"\n\n An update to a topic that is already in 'master'.\n\n Will merge to 'master'.\n\n\n* js/sequencer-i-countdown-3 (2017-01-17) 38 commits\n - sequencer (rebase -i): write out the final message\n - sequencer (rebase -i): write the progress into files\n - sequencer (rebase -i): show the progress\n - sequencer (rebase -i): suggest --edit-todo upon unknown command\n - sequencer (rebase -i): show only failed cherry-picks' output\n - sequencer (rebase -i): show only failed `git commit`'s output\n - sequencer: use run_command() directly\n - sequencer: update reading author-script\n - sequencer (rebase -i): differentiate between comments and 'noop'\n - sequencer (rebase -i): implement the 'drop' command\n - sequencer (rebase -i): allow rescheduling commands\n - sequencer (rebase -i): respect strategy/strategy_opts settings\n - sequencer (rebase -i): respect the rebase.autostash setting\n - sequencer (rebase -i): run the post-rewrite hook, if needed\n - sequencer (rebase -i): record interrupted commits in rewritten, too\n - sequencer (rebase -i): copy commit notes at end\n - sequencer (rebase -i): set the reflog message consistently\n - sequencer (rebase -i): refactor setting the reflog message\n - sequencer (rebase -i): allow fast-forwarding for edit/reword\n - sequencer (rebase -i): implement the 'reword' command\n - sequencer (rebase -i): leave a patch upon error\n - sequencer (rebase -i): update refs after a successful rebase\n - sequencer (rebase -i): the todo can be empty when continuing\n - sequencer (rebase -i): skip some revert/cherry-pick specific code path\n - sequencer (rebase -i): remove CHERRY_PICK_HEAD when no longer needed\n - sequencer (rebase -i): allow continuing with staged changes\n - sequencer (rebase -i): write an author-script file\n - sequencer (rebase -i): implement the short commands\n - sequencer (rebase -i): add support for the 'fixup' and 'squash' commands\n - sequencer (rebase -i): write the 'done' file\n - sequencer (rebase -i): learn about the 'verbose' mode\n - sequencer (rebase -i): implement the 'exec' command\n - sequencer (rebase -i): implement the 'edit' command\n - sequencer (rebase -i): implement the 'noop' command\n - sequencer: support a new action: 'interactive rebase'\n - sequencer: use a helper to find the commit message\n - sequencer: move \"else\" keyword onto the same line as preceding brace\n - sequencer: avoid unnecessary curly braces\n\n The sequencer machinery has been further enhanced so that a later\n set of patches can start using it to reimplement \"rebase -i\".\n\n Will merge to 'next'.\n I think I've said everything that needs to be said on this topic.\n\n\n* jk/clear-delta-base-cache-fix (2017-01-19) 1 commit\n (merged to 'next' on 2017-01-23 at 5f4af2b0a5)\n + clear_delta_base_cache(): don't modify hashmap while iterating\n\n A crashing bug introduced in v2.11 timeframe has been found (it is\n triggerable only in fast-import) and fixed.\n\n Will merge to 'master'.\n\n\n* jk/describe-omit-some-refs (2017-01-19) 6 commits\n - SQUASH???\n - describe: teach describe negative pattern matches\n - describe: teach --match to accept multiple patterns\n - name-rev: add support to exclude refs by pattern match\n - name-rev: extend --refs to accept multiple patterns\n - doc: add documentation for OPT_STRING_LIST\n\n \"git describe\" and \"git name-rev\" have been taught to take more\n than one refname patterns to restrict the set of refs to base their\n naming output on, and also learned to take negative patterns to\n name refs not to be used for naming via their \"--exclude\" option.\n\n Will merge to 'next' after making sure SQUASH??? is correctly\n squashed in.\n\n\n* js/remote-rename-with-half-configured-remote (2017-01-19) 2 commits\n (merged to 'next' on 2017-01-23 at a1b655dbac)\n + remote rename: more carefully determine whether a remote is configured\n + remote rename: demonstrate a bogus \"remote exists\" bug\n\n With anticipatory tweaking for remotes defined in ~/.gitconfig\n (e.g. \"remote.origin.prune\" set to true, even though there may or\n may not actually be \"origin\" remote defined in a particular Git\n repository), \"git remote rename\" and other commands misinterpreted\n and behaved as if such a non-existing remote actually existed.\n\n Will merge to 'master'.\n\n\n* sb/in-core-index-doc (2017-01-19) 4 commits\n (merged to 'next' on 2017-01-23 at 30224463e8)\n + documentation: retire unfinished documentation\n + cache.h: document add_[file_]to_index\n + cache.h: document remove_index_entry_at\n + cache.h: document index_name_pos\n\n Documentation and in-code comments updates.\n\n Will merge to 'master'.\n\n\n* sb/retire-convert-objects-from-contrib (2017-01-19) 1 commit\n (merged to 'next' on 2017-01-23 at decc1e237d)\n + contrib: remove git-convert-objects\n\n Remove an ancient tool left in contrib/.\n\n Will merge to 'master'.\n\n\n* ep/commit-static-buf-cleanup (2017-01-13) 2 commits\n - builtin/commit.c: switch to xstrfmt(), instead of snprintf()\n - builtin/commit.c: remove the PATH_MAX limitation via dynamic allocation\n\n Code clean-up.\n\n Expecting a reroll.\n The tip one would instead be done with strbuf.\n cf. \n\n\n* jk/vreport-sanitize (2017-01-11) 2 commits\n (merged to 'next' on 2017-01-18 at 4bbf370981)\n + vreport: sanitize ASCII control chars\n + Revert \"vreportf: avoid intermediate buffer\"\n\n An error message with an ASCII control character like '\\r' in it\n can alter the message to hide its early part, which is problematic\n when a remote side gives such an error message that the local side\n will relay with a \"remote: \" prefix.\n\n Will merge to 'master'.\n\n\n* sb/unpack-trees-super-prefix (2017-01-12) 5 commits\n - SQUASH\n - unpack-trees: support super-prefix option\n - t1001: modernize style\n - t1000: modernize style\n - read-tree: use OPT_BOOL instead of OPT_SET_INT\n\n \"git read-tree\" and its underlying unpack_trees() machinery learned\n to report problematic paths prefixed with the --super-prefix option.\n\n Expecting a reroll.\n The first three are in good shape. The last one needs a better\n explanation and possibly an update to its test.\n cf. \n\n\n* sb/submodule-doc (2017-01-12) 3 commits\n - submodules: add a background story\n - submodule update documentation: don't repeat ourselves\n - submodule documentation: add options to the subcommand\n\n Needs review.\n\n\n* bw/attr (2017-01-23) 27 commits\n - attr: reformat git_attr_set_direction() function\n - attr: push the bare repo check into read_attr()\n - attr: store attribute stack in attr_check structure\n - attr: tighten const correctness with git_attr and match_attr\n - attr: remove maybe-real, maybe-macro from git_attr\n - attr: eliminate global check_all_attr array\n - attr: use hashmap for attribute dictionary\n - attr: change validity check for attribute names to use positive logic\n - attr: pass struct attr_check to collect_some_attrs\n - attr: retire git_check_attrs() API\n - attr: convert git_check_attrs() callers to use the new API\n - attr: convert git_all_attrs() to use \"struct attr_check\"\n - attr: (re)introduce git_check_attr() and struct attr_check\n - attr: rename function and struct related to checking attributes\n - attr.c: outline the future plans by heavily commenting\n - Documentation/gitattributes.txt: fix a typo\n - attr.c: add push_stack() helper\n - attr: support quoting pathname patterns in C style\n - attr.c: plug small leak in parse_attr_line()\n - attr.c: tighten constness around \"git_attr\" structure\n - attr.c: simplify macroexpand_one()\n - attr.c: mark where #if DEBUG ends more clearly\n - attr.c: complete a sentence in a comment\n - attr.c: explain the lack of attr-name syntax check in parse_attr()\n - attr.c: update a stale comment on \"struct match_attr\"\n - attr.c: use strchrnul() to scan for one line\n - commit.c: use strchrnul() to scan for one line\n\n The gitattributes machinery is being taught to work better in a\n multi-threaded environment.\n\n Expecting a reroll.\n\n\n* jk/loose-object-fsck (2017-01-15) 6 commits\n (merged to 'next' on 2017-01-23 at 4302ad090d)\n + fsck: detect trailing garbage in all object types\n + fsck: parse loose object paths directly\n + sha1_file: add read_loose_object() function\n + t1450: test fsck of packed objects\n + sha1_file: fix error message for alternate objects\n + t1450: refactor loose-object removal\n\n \"git fsck\" inspects loose objects more carefully now.\n\n Will merge to 'master'.\n\n\n* vn/xdiff-func-context (2017-01-15) 1 commit\n - xdiff -W: relax end-of-file function detection\n\n \"git diff -W\" has been taught to handle the case where a new\n function is added at the end of the file better.\n\n Will hold.\n An follow-up change to go back from the line that matches the\n funcline to show comments before the function definition is still\n being discussed.\n\n\n* mh/ref-remove-empty-directory (2017-01-07) 23 commits\n - files_transaction_commit(): clean up empty directories\n - try_remove_empty_parents(): teach to remove parents of reflogs, too\n - try_remove_empty_parents(): don't trash argument contents\n - try_remove_empty_parents(): rename parameter \"name\" -> \"refname\"\n - delete_ref_loose(): inline function\n - delete_ref_loose(): derive loose reference path from lock\n - log_ref_write_1(): inline function\n - log_ref_setup(): manage the name of the reflog file internally\n - log_ref_write_1(): don't depend on logfile argument\n - log_ref_setup(): pass the open file descriptor back to the caller\n - log_ref_setup(): improve robustness against races\n - log_ref_setup(): separate code for create vs non-create\n - log_ref_write(): inline function\n - rename_tmp_log(): improve error reporting\n - rename_tmp_log(): use raceproof_create_file()\n - lock_ref_sha1_basic(): use raceproof_create_file()\n - lock_ref_sha1_basic(): inline constant\n - raceproof_create_file(): new function\n - safe_create_leading_directories(): set errno on SCLD_EXISTS\n - safe_create_leading_directories_const(): preserve errno\n - t5505: use \"for-each-ref\" to test for the non-existence of references\n - refname_is_safe(): correct docstring\n - files_rename_ref(): tidy up whitespace\n\n Deletion of a branch \"foo/bar\" could remove .git/refs/heads/foo\n once there no longer is any other branch whose name begins with\n \"foo/\", but we didn't do so so far. Now we do.\n\n Expecting a reroll.\n cf. <5051c78e-51f9-becd-e1a6-9c0b781d6912@alum.mit.edu>\n\n\n* ls/filter-process-delayed (2017-01-08) 1 commit\n . convert: add \"status=delayed\" to filter process protocol\n\n Ejected, as does not build when merged to 'pu'.\n\n\n* nd/worktree-move (2017-01-09) 6 commits\n - worktree remove: new command\n - worktree move: refuse to move worktrees with submodules\n - worktree move: accept destination as directory\n - worktree move: new command\n - worktree.c: add update_worktree_location()\n - worktree.c: add validate_worktree()\n\n \"git worktree\" learned move and remove subcommands.\n\n Needs review.\n\n\n* nd/log-graph-configurable-colors (2017-01-19) 4 commits\n - SQUASH???\n - log --graph: customize the graph lines with config log.graphColors\n - color.c: trim leading spaces in color_parse_mem()\n - color.c: fix color_parse_mem() with value_len == 0\n\n Some people feel the default set of colors used by \"git log --graph\"\n rather limiting. A mechanism to customize the set of colors has\n been introduced.\n\n Will merge to 'next' after making sure SQUASH??? is correctly\n squashed in.\n\n\n* cc/split-index-config (2016-12-26) 21 commits\n - Documentation/git-update-index: explain splitIndex.*\n - Documentation/config: add splitIndex.sharedIndexExpire\n - read-cache: use freshen_shared_index() in read_index_from()\n - read-cache: refactor read_index_from()\n - t1700: test shared index file expiration\n - read-cache: unlink old sharedindex files\n - config: add git_config_get_expiry() from gc.c\n - read-cache: touch shared index files when used\n - sha1_file: make check_and_freshen_file() non static\n - Documentation/config: add splitIndex.maxPercentChange\n - t1700: add tests for splitIndex.maxPercentChange\n - read-cache: regenerate shared index if necessary\n - config: add git_config_get_max_percent_split_change()\n - Documentation/git-update-index: talk about core.splitIndex config var\n - Documentation/config: add information for core.splitIndex\n - t1700: add tests for core.splitIndex\n - update-index: warn in case of split-index incoherency\n - read-cache: add and then use tweak_split_index()\n - split-index: add {add,remove}_split_index() functions\n - config: add git_config_get_split_index()\n - config: mark an error message up for translation\n\n The experimental \"split index\" feature has gained a few\n configuration variables to make it easier to use.\n\n Waiting for review comments to be addressed.\n cf. <20161226102222.17150-1-chriscool@tuxfamily.org>\n cf. \n\n\n* bw/push-submodule-only (2016-12-20) 3 commits\n (merged to 'next' on 2017-01-23 at d6cd1c60ae)\n + push: add option to push only submodules\n + submodules: add RECURSE_SUBMODULES_ONLY value\n + transport: reformat flag #defines to be more readable\n\n \"git submodule push\" learned \"--recurse-submodules=only option to\n push submodules out without pushing the top-level superproject.\n\n Will merge to 'master'.\n\n\n* ls/p4-path-encoding (2016-12-18) 1 commit\n - git-p4: fix git-p4.pathEncoding for removed files\n\n When \"git p4\" imports changelist that removes paths, it failed to\n convert pathnames when the p4 used encoding different from the one\n used on the Git side. This has been corrected.\n\n Will be rerolled.\n cf. <7E1C7387-4F37-423F-803D-3B5690B49D40@gmail.com>\n\n\n* js/difftool-builtin (2017-01-19) 3 commits\n (merged to 'next' on 2017-01-23 at 6f4810dbd9)\n + difftool: retire the scripted version\n + difftool: implement the functionality in the builtin\n + difftool: add a skeleton for the upcoming builtin\n\n Rewrite a scripted porcelain \"git difftool\" in C.\n\n Will merge to 'master'.\n\n\n* sb/push-make-submodule-check-the-default (2016-11-29) 2 commits\n (merged to 'next' on 2016-12-12 at 1863e05af5)\n + push: change submodule default to check when submodules exist\n + submodule add: extend force flag to add existing repos\n\n Turn the default of \"push.recurseSubmodules\" to \"check\" when\n submodules seem to be in use.\n\n Will cook in 'next'.\n\n\n* kn/ref-filter-branch-list (2017-01-10) 21 commits\n - SQUASH???\n - branch: implement '--format' option\n - branch: use ref-filter printing APIs\n - branch, tag: use porcelain output\n - ref-filter: allow porcelain to translate messages in the output\n - ref-filter: add an 'rstrip=' option to atoms which deal with refnames\n - ref-filter: modify the 'lstrip=' option to work with negative ''\n - ref-filter: Do not abruptly die when using the 'lstrip=' option\n - ref-filter: rename the 'strip' option to 'lstrip'\n - ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()\n - ref-filter: introduce refname_atom_parser()\n - ref-filter: introduce refname_atom_parser_internal()\n - ref-filter: make \"%(symref)\" atom work with the ':short' modifier\n - ref-filter: add support for %(upstream:track,nobracket)\n - ref-filter: make %(upstream:track) prints \"[gone]\" for invalid upstreams\n - ref-filter: introduce format_ref_array_item()\n - ref-filter: move get_head_description() from branch.c\n - ref-filter: modify \"%(objectname:short)\" to take length\n - ref-filter: implement %(if:equals=) and %(if:notequals=)\n - ref-filter: include reference to 'used_atom' within 'atom_value'\n - ref-filter: implement %(if), %(then), and %(else) atoms\n\n The code to list branches in \"git branch\" has been consolidated\n with the more generic ref-filter API.\n\n I think this is almost ready. Will wait for a few days, squash\n fixes in if needed and merge to 'next'.\n\n\n* jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit\n (merged to 'next' on 2016-12-05 at 0c77e39cd5)\n + setup_git_env: avoid blind fall-back to \".git\"\n\n Originally merged to 'next' on 2016-10-26\n\n This is the endgame of the topic to avoid blindly falling back to\n \".git\" when the setup sequence said we are _not_ in Git repository.\n A corner case that happens to work right now may be broken by a\n call to die(\"BUG\").\n\n Will cook in 'next'.\n\n\n* pb/bisect (2016-10-18) 27 commits\n - bisect--helper: remove the dequote in bisect_start()\n - bisect--helper: retire `--bisect-auto-next` subcommand\n - bisect--helper: retire `--bisect-autostart` subcommand\n - bisect--helper: retire `--bisect-write` subcommand\n - bisect--helper: `bisect_replay` shell function in C\n - bisect--helper: `bisect_log` shell function in C\n - bisect--helper: retire `--write-terms` subcommand\n - bisect--helper: retire `--check-expected-revs` subcommand\n - bisect--helper: `bisect_state` & `bisect_head` shell function in C\n - bisect--helper: `bisect_autostart` shell function in C\n - bisect--helper: retire `--next-all` subcommand\n - bisect--helper: retire `--bisect-clean-state` subcommand\n - bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C\n - t6030: no cleanup with bad merge base\n - bisect--helper: `bisect_start` shell function partially in C\n - bisect--helper: `get_terms` & `bisect_terms` shell function in C\n - bisect--helper: `bisect_next_check` & bisect_voc shell function in C\n - bisect--helper: `check_and_set_terms` shell function in C\n - bisect--helper: `bisect_write` shell function in C\n - bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C\n - bisect--helper: `bisect_reset` shell function in C\n - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()\n - t6030: explicitly test for bisection cleanup\n - bisect--helper: `bisect_clean_state` shell function in C\n - bisect--helper: `write_terms` shell function in C\n - bisect: rewrite `check_term_format` shell function in C\n - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL\n\n Move more parts of \"git bisect\" to C.\n\n Expecting a reroll.\n cf. \n cf. \n\n\n* st/verify-tag (2017-01-18) 6 commits\n (merged to 'next' on 2017-01-23 at 2810959427)\n + t/t7004-tag: Add --format specifier tests\n + t/t7030-verify-tag: Add --format specifier tests\n + builtin/tag: add --format argument for tag -v\n + builtin/verify-tag: add --format to verify-tag\n + ref-filter: add function to print single ref_array_item\n + gpg-interface, tag: add GPG_VERIFY_OMIT_STATUS flag\n\n \"git tag\" and \"git verify-tag\" learned to put GPG verification\n status in their \"--format=\" output format.\n\n Will merge to 'master'.\n\n\n* jc/merge-drop-old-syntax (2015-04-29) 1 commit\n (merged to 'next' on 2016-12-05 at 041946dae0)\n + merge: drop 'git merge HEAD ' syntax\n\n Originally merged to 'next' on 2016-10-11\n\n Stop supporting \"git merge HEAD \" syntax that has\n been deprecated since October 2007, and issues a deprecation\n warning message since v2.5.0.\n\n Will cook in 'next'.\n\n--------------------------------------------------\n[Discarded]\n\n* jc/bundle (2016-03-03) 6 commits\n . index-pack: --clone-bundle option\n . Merge branch 'jc/index-pack' into jc/bundle\n . bundle v3: the beginning\n . bundle: keep a copy of bundle file name in the in-core bundle header\n . bundle: plug resource leak\n . bundle doc: 'verify' is not about verifying the bundle\n\n The beginning of \"split bundle\", which could be one of the\n ingredients to allow \"git clone\" traffic off of the core server\n network to CDN.\n\n While I think it would make it easier for people to experiment and\n build on if the topic is merged to 'next', I am at the same time a\n bit reluctant to merge an unproven new topic that introduces a new\n file format, which we may end up having to support til the end of\n time. It is likely that to support a \"prime clone from CDN\", it\n would need a lot more than just \"these are the heads and the pack\n data is over there\", so this may not be sufficient.\n\n\n* jk/nofollow-attr-ignore (2016-11-02) 5 commits\n . exclude: do not respect symlinks for in-tree .gitignore\n . attr: do not respect symlinks for in-tree .gitattributes\n . exclude: convert \"check_index\" into a flags field\n . attr: convert \"macro_ok\" into a flags field\n . add open_nofollow() helper\n\n As we do not follow symbolic links when reading control files like\n .gitignore and .gitattributes from the index, match the behaviour\n and not follow symbolic links when reading them from the working\n tree. This also tightens security a bit by not leaking contents of\n an unrelated file in the error messages when it is pointed at by\n one of these files that is a symbolic link.\n\n Perhaps we want to cover .gitmodules too with the same mechanism?\n"},{"id":"310081","messageId":"0D956B23-E655-4C28-A205-14CCC0A7DEA2@gmail.com","threadId":"44956","inReplyTo":"xmqqo9yxpaxk.fsf@gitster.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Lars Schneider","fromEmail":"larsxschneider@gmail.com","sentAt":"2017-01-24T10:04:21Z","receivedAt":"2017-01-24T10:04:29Z","isPatch":false,"sender":{"key":"larsxschneider@gmail.com","avatar":"https://avatars.githubusercontent.com/u/477434?v=4"},"body":"\n> On 24 Jan 2017, at 01:18, Junio C Hamano wrote:\n> \n> * jk/fsck-connectivity-check-fix (2017-01-17) 6 commits\n> (merged to 'next' on 2017-01-23 at e8e9b76b84)\n> + fsck: check HAS_OBJ more consistently\n> + fsck: do not fallback \"git fsck \" to \"git fsck\"\n> + fsck: tighten error-checks of \"git fsck \"\n> + fsck: prepare dummy objects for --connectivity-check\n> + fsck: report trees as dangling\n> + t1450: clean up sub-objects in duplicate-entry test\n> \n> \"git fsck --connectivity-check\" was not working at all.\n> \n> Will merge to 'master'.\n\n\"fsck: prepare dummy objects for --connectivity-check\" seems to\nmake t1450-fsck.sh fail on macOS with TravisCI:\n\nInitialized empty Git repository in /Users/travis/build/git/git/t/trash directory.t1450-fsck/connectivity-only/.git/\n[master (root-commit) 86520b7] empty\n Author: A U Thor \n 2 files changed, 1 insertion(+)\n create mode 100644 empty\n create mode 100644 empty.t\noverride r--r--r-- travis/staff for .git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391? (y/n [n]) not overwritten\ndangling blob c21c9352f7526e9576892a6631e0e8cf1fccd34d\ntest_must_fail: command succeeded: git fsck --strict\nnot ok 58 - fsck --connectivity-only\n\nMore test output: https://travis-ci.org/git/git/jobs/194663620\n\nFor some reason I am not able to replicate that behavior on my local\nmacOS machine. I found the commit using bisect on TravisCI:\nhttps://api.travis-ci.org/jobs/194746454/log.txt?deansi=true\n\nAny idea what might be wrong?\n\n- Lars"},{"id":"310087","messageId":"20170124132749.l3ezupyitvxe4t2l@sigill.intra.peff.net","threadId":"44956","inReplyTo":"0D956B23-E655-4C28-A205-14CCC0A7DEA2@gmail.com","subject":"Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2017-01-24T13:27:49Z","receivedAt":"2017-01-24T13:28:11Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Jan 24, 2017 at 11:04:21AM +0100, Lars Schneider wrote:\n\n> \"fsck: prepare dummy objects for --connectivity-check\" seems to\n> make t1450-fsck.sh fail on macOS with TravisCI:\n> \n> Initialized empty Git repository in /Users/travis/build/git/git/t/trash directory.t1450-fsck/connectivity-only/.git/\n> [master (root-commit) 86520b7] empty\n> Author: A U Thor \n> 2 files changed, 1 insertion(+)\n> create mode 100644 empty\n> create mode 100644 empty.t\n> override r--r--r-- travis/staff for .git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391? (y/n [n]) not overwritten\n> dangling blob c21c9352f7526e9576892a6631e0e8cf1fccd34d\n\nLooks like \"mv\" prompts and then fails to move the file (so we get the\ndangling blob for the source blob, and fsck doesn't report failure because\nwe didn't actually corrupt the destination blob).\n\nIf I'm understanding the behavior correctly, this violates POSIX, which\nsays:\n\n 1. If the destination path exists, the −f option is not specified, and\n either of the following conditions is true:\n\n a. The permissions of the destination path do not permit writing\n and the standard input is a terminal.\n\n b. The −i option is specified.\n\n the mv utility shall write a prompt to standard error and read a\n line from standard input. If the response is not affirmative,\n mv shall do nothing more with the current source_file and go on\n to any remaining source_files.\n\nOur stdin isn't a terminal, and we do not specify \"-i\", so I think it\nshouldn't prompt. It also exits with code 0 after failing to move,\nwhich is another surprise.\n\nHere's a patch (tested by me that it works on Linux, but I don't know\nfor sure that it fixes the Travis problem).\n\n-- >8 --\nSubject: [PATCH] t1450: use \"mv -f\" within loose object directory\n\nThe loose objects are created with mode 0444. That doesn't\nprevent them being overwritten by rename(), but some\nversions of \"mv\" will be extra careful and prompt the user,\neven without \"-i\".\n\nReportedly macOS does this, at least in the Travis builds.\nThe prompt reads from /dev/null, defaulting to \"no\", and the\nobject isn't moved. Then to make matters even more\ninteresting, it still returns \"0\" and the rest of the test\nproceeds, but with a broken setup.\n\nWe can work around it by using \"mv -f\" to override the\nprompt. This should work as it's already used in t5504 for\nthe same purpose.\n\nSigned-off-by: Jeff King \n---\n t/t1450-fsck.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh\nindex efaf41b68..33a51c9a6 100755\n--- a/t/t1450-fsck.sh\n+++ b/t/t1450-fsck.sh\n@@ -536,7 +536,7 @@ test_expect_success 'fsck --connectivity-only' '\n \t\t# free to examine the type if it chooses.\n \t\tempty=.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 &&\n \t\tblob=$(echo unrelated | git hash-object -w --stdin) &&\n-\t\tmv $(sha1_file $blob) $empty &&\n+\t\tmv -f $(sha1_file $blob) $empty &&\n \n \t\ttest_must_fail git fsck --strict &&\n \t\tgit fsck --strict --connectivity-only &&\n-- \n2.11.0.840.gd37c5973a\n\n"},{"id":"310091","messageId":"E88FA516-5EA6-491F-932E-2CE83F7C635C@gmail.com","threadId":"44956","inReplyTo":"20170124132749.l3ezupyitvxe4t2l@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Lars Schneider","fromEmail":"larsxschneider@gmail.com","sentAt":"2017-01-24T14:43:55Z","receivedAt":"2017-01-24T14:44:19Z","isPatch":false,"sender":{"key":"larsxschneider@gmail.com","avatar":"https://avatars.githubusercontent.com/u/477434?v=4"},"body":"\n> On 24 Jan 2017, at 14:27, Jeff King wrote:\n> \n> On Tue, Jan 24, 2017 at 11:04:21AM +0100, Lars Schneider wrote:\n> \n>> \"fsck: prepare dummy objects for --connectivity-check\" seems to\n>> make t1450-fsck.sh fail on macOS with TravisCI:\n>> \n>> Initialized empty Git repository in /Users/travis/build/git/git/t/trash directory.t1450-fsck/connectivity-only/.git/\n>> [master (root-commit) 86520b7] empty\n>> Author: A U Thor \n>> 2 files changed, 1 insertion(+)\n>> create mode 100644 empty\n>> create mode 100644 empty.t\n>> override r--r--r-- travis/staff for .git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391? (y/n [n]) not overwritten\n>> dangling blob c21c9352f7526e9576892a6631e0e8cf1fccd34d\n> \n> Looks like \"mv\" prompts and then fails to move the file (so we get the\n> dangling blob for the source blob, and fsck doesn't report failure because\n> we didn't actually corrupt the destination blob).\n> \n> If I'm understanding the behavior correctly, this violates POSIX, which\n> says:\n> \n> 1. If the destination path exists, the −f option is not specified, and\n> either of the following conditions is true:\n> \n> a. The permissions of the destination path do not permit writing\n> and the standard input is a terminal.\n> \n> b. The −i option is specified.\n> \n> the mv utility shall write a prompt to standard error and read a\n> line from standard input. If the response is not affirmative,\n> mv shall do nothing more with the current source_file and go on\n> to any remaining source_files.\n> \n> Our stdin isn't a terminal, and we do not specify \"-i\", so I think it\n> shouldn't prompt. It also exits with code 0 after failing to move,\n> which is another surprise.\n> \n> Here's a patch (tested by me that it works on Linux, but I don't know\n> for sure that it fixes the Travis problem).\n> \n> -- >8 --\n> Subject: [PATCH] t1450: use \"mv -f\" within loose object directory\n> \n> The loose objects are created with mode 0444. That doesn't\n> prevent them being overwritten by rename(), but some\n> versions of \"mv\" will be extra careful and prompt the user,\n> even without \"-i\".\n> \n> Reportedly macOS does this, at least in the Travis builds.\n> The prompt reads from /dev/null, defaulting to \"no\", and the\n> object isn't moved. Then to make matters even more\n> interesting, it still returns \"0\" and the rest of the test\n> proceeds, but with a broken setup.\n> \n> We can work around it by using \"mv -f\" to override the\n> prompt. This should work as it's already used in t5504 for\n> the same purpose.\n> \n> Signed-off-by: Jeff King \n> ---\n> t/t1450-fsck.sh | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh\n> index efaf41b68..33a51c9a6 100755\n> --- a/t/t1450-fsck.sh\n> +++ b/t/t1450-fsck.sh\n> @@ -536,7 +536,7 @@ test_expect_success 'fsck --connectivity-only' '\n> \t\t# free to examine the type if it chooses.\n> \t\tempty=.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 &&\n> \t\tblob=$(echo unrelated | git hash-object -w --stdin) &&\n> -\t\tmv $(sha1_file $blob) $empty &&\n> +\t\tmv -f $(sha1_file $blob) $empty &&\n> \n> \t\ttest_must_fail git fsck --strict &&\n> \t\tgit fsck --strict --connectivity-only &&\n> -- \n> 2.11.0.840.gd37c5973a\n\nAck. This patch fixes the issue:\nhttps://travis-ci.org/larsxschneider/git/builds/194819605\n\nThanks,\nLars"},{"id":"310165","messageId":"alpine.DEB.2.20.1701251800120.3469@virtualbox","threadId":"44956","inReplyTo":"20170124132749.l3ezupyitvxe4t2l@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2017-01-25T17:01:11Z","receivedAt":"2017-01-25T17:02:06Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Peff,\n\nOn Tue, 24 Jan 2017, Jeff King wrote:\n\n> On Tue, Jan 24, 2017 at 11:04:21AM +0100, Lars Schneider wrote:\n> \n> > \"fsck: prepare dummy objects for --connectivity-check\" seems to\n> > make t1450-fsck.sh fail on macOS with TravisCI:\n> >\n> > Initialized empty Git repository in /Users/travis/build/git/git/t/trash directory.t1450-fsck/connectivity-only/.git/\n> > [master (root-commit) 86520b7] empty\n> > Author: A U Thor \n> > 2 files changed, 1 insertion(+)\n> > create mode 100644 empty\n> > create mode 100644 empty.t\n> > override r--r--r-- travis/staff for .git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391? (y/n [n]) not overwritten\n> > dangling blob c21c9352f7526e9576892a6631e0e8cf1fccd34d\n> \n> Looks like \"mv\" prompts and then fails to move the file (so we get the\n> dangling blob for the source blob, and fsck doesn't report failure\n> because we didn't actually corrupt the destination blob).\n\nIIRC I had similar problems years ago, on a machine where the\nadministrator defined mandatory aliases, including mv=\"mv -i\".\n\nCiao,\nJohannes\n"},{"id":"310167","messageId":"20170125173958.pg546a6w33dirp5k@sigill.intra.peff.net","threadId":"44956","inReplyTo":"alpine.DEB.2.20.1701251800120.3469@virtualbox","subject":"Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2017-01-25T17:39:58Z","receivedAt":"2017-01-25T17:40:06Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Jan 25, 2017 at 06:01:11PM +0100, Johannes Schindelin wrote:\n\n> > Looks like \"mv\" prompts and then fails to move the file (so we get the\n> > dangling blob for the source blob, and fsck doesn't report failure\n> > because we didn't actually corrupt the destination blob).\n> \n> IIRC I had similar problems years ago, on a machine where the\n> administrator defined mandatory aliases, including mv=\"mv -i\".\n\nYeah, that was my first thought, too. But this should be a\nnon-interactive shell, which would generally avoid loading rc files. I\nthink there are some exceptions, though (e.g., setting ENV or BASH_ENV).\nLoading aliases like \"mv -i\" for non-interactive shells seems somewhat\ninsane to me. But whatever the cause, I think the workaround I posted is\neasy enough to do.\n\n-Peff\n"},{"id":"310172","messageId":"xmqq4m0nc8dz.fsf@gitster.mtv.corp.google.com","threadId":"44956","inReplyTo":"20170125173958.pg546a6w33dirp5k@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-01-25T18:16:40Z","receivedAt":"2017-01-25T18:16:47Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Wed, Jan 25, 2017 at 06:01:11PM +0100, Johannes Schindelin wrote:\n>\n>> > Looks like \"mv\" prompts and then fails to move the file (so we get the\n>> > dangling blob for the source blob, and fsck doesn't report failure\n>> > because we didn't actually corrupt the destination blob).\n>> \n>> IIRC I had similar problems years ago, on a machine where the\n>> administrator defined mandatory aliases, including mv=\"mv -i\".\n>\n> Yeah, that was my first thought, too. But this should be a\n> non-interactive shell, which would generally avoid loading rc files. I\n> think there are some exceptions, though (e.g., setting ENV or BASH_ENV).\n> Loading aliases like \"mv -i\" for non-interactive shells seems somewhat\n> insane to me. \n\nIt does to me, too.\n\n> But whatever the cause, I think the workaround I posted is\n> easy enough to do.\n\nOr spelling it explicitly as \"/bin/mv\" (forgetting systems that does\nnot have it in /bin but as /usr/bin/mv) would also defeat alias if\nthat were the cause.\n\nOne downside of working it around like your patch does, or spelling\nit out as \"/bin/mv\", is that we'd need to worry about all the uses\nof \"mv\" in our scripts. If this were _only_ happening in the Travis\nenvironment, I'd prefer to see why it happens only there and fix that\ninstead.\n\n"},{"id":"310176","messageId":"CAGZ79kZKDyfP1SPsxAf8oMSU3763QiogLpUzFZHy+OTQQdJP6A@mail.gmail.com","threadId":"44956","inReplyTo":"xmqqo9yxpaxk.fsf@gitster.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2017-01-25T18:38:32Z","receivedAt":"2017-01-25T18:38:45Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Mon, Jan 23, 2017 at 4:18 PM, Junio C Hamano wrote:\n>\n> * sb/unpack-trees-super-prefix (2017-01-12) 5 commits\n> - SQUASH\n> - unpack-trees: support super-prefix option\n> - t1001: modernize style\n> - t1000: modernize style\n> - read-tree: use OPT_BOOL instead of OPT_SET_INT\n>\n> \"git read-tree\" and its underlying unpack_trees() machinery learned\n> to report problematic paths prefixed with the --super-prefix option.\n>\n> Expecting a reroll.\n> The first three are in good shape. The last one needs a better\n> explanation and possibly an update to its test.\n> cf. \n>\n\nPlease see\nhttps://public-inbox.org/git/20170118010520.8804-1-sbeller@google.com/\n\n\n>\n> * sb/submodule-doc (2017-01-12) 3 commits\n> - submodules: add a background story\n> - submodule update documentation: don't repeat ourselves\n> - submodule documentation: add options to the subcommand\n>\n> Needs review.\n\nThe first 2 commit are asking for the standard review, whereas the last patch\n(submodules: add a background story), needs more of a design review/opinion\nif such a patch is a good idea actually.\n\nThanks,\nStefan\n"},{"id":"310177","messageId":"20170125183924.6yclcjl4ggcu42yp@sigill.intra.peff.net","threadId":"44956","inReplyTo":"xmqq4m0nc8dz.fsf@gitster.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2017-01-25T18:39:24Z","receivedAt":"2017-01-25T18:39:35Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Jan 25, 2017 at 10:16:40AM -0800, Junio C Hamano wrote:\n\n> > But whatever the cause, I think the workaround I posted is\n> > easy enough to do.\n> \n> Or spelling it explicitly as \"/bin/mv\" (forgetting systems that does\n> not have it in /bin but as /usr/bin/mv) would also defeat alias if\n> that were the cause.\n\nYes, but I think it's less tricky and unportable to write \"mv -f\" than\n\"/bin/mv\". So even if it _is_ a funny alias thing, I think my patch is\nthe right fix.\n\n> One downside of working it around like your patch does, or spelling\n> it out as \"/bin/mv\", is that we'd need to worry about all the uses\n> of \"mv\" in our scripts. If this were _only_ happening in the Travis\n> environment, I'd prefer to see why it happens only there and fix that\n> instead.\n\nI would be curious to know whether it is a funny thing in the Travis\nenvironment, or if some version of macOS \"mv\" really is that braindead\n(and it is just the case that Travis has that version and Lars's\ncomputer doesn't). I just didn't want to waste anybody's time digging\ninto it if it won't affect our patch.\n\nI guess the way to dig would be to add a test that looks at the output\nof \"type mv\" or something, push it to a Travis-hooked branch, and then\nwait for the output\n\n-Peff\n"},{"id":"310197","messageId":"xmqqwpdianej.fsf@gitster.mtv.corp.google.com","threadId":"44956","inReplyTo":"CAGZ79kZKDyfP1SPsxAf8oMSU3763QiogLpUzFZHy+OTQQdJP6A@mail.gmail.com","subject":"Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-01-25T20:35:16Z","receivedAt":"2017-01-25T20:35:27Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefan Beller writes:\n\n> On Mon, Jan 23, 2017 at 4:18 PM, Junio C Hamano wrote:\n>>\n>> * sb/unpack-trees-super-prefix (2017-01-12) 5 commits\n>> - SQUASH\n>> - unpack-trees: support super-prefix option\n>> - t1001: modernize style\n>> - t1000: modernize style\n>> - read-tree: use OPT_BOOL instead of OPT_SET_INT\n>>\n>> \"git read-tree\" and its underlying unpack_trees() machinery learned\n>> to report problematic paths prefixed with the --super-prefix option.\n>>\n>> Expecting a reroll.\n>> The first three are in good shape. The last one needs a better\n>> explanation and possibly an update to its test.\n>> cf. \n>>\n>\n> Please see\n> https://public-inbox.org/git/20170118010520.8804-1-sbeller@google.com/\n\nThanks, applied. Let's move this forward.\n\n\n\n"},{"id":"310248","messageId":"xmqq7f5i92jk.fsf@gitster.mtv.corp.google.com","threadId":"44956","inReplyTo":"20170125183924.6yclcjl4ggcu42yp@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-01-25T22:51:11Z","receivedAt":"2017-01-25T22:51:19Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> I guess the way to dig would be to add a test that looks at the output\n> of \"type mv\" or something, push it to a Travis-hooked branch, and then\n> wait for the output\n\nSounds tempting ;-)\n"},{"id":"310298","messageId":"D9F0976B-9F78-44BE-B9DD-CAB6506FA3A9@gmail.com","threadId":"44956","inReplyTo":"xmqq7f5i92jk.fsf@gitster.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Lars Schneider","fromEmail":"larsxschneider@gmail.com","sentAt":"2017-01-26T09:14:01Z","receivedAt":"2017-01-26T09:14:11Z","isPatch":false,"sender":{"key":"larsxschneider@gmail.com","avatar":"https://avatars.githubusercontent.com/u/477434?v=4"},"body":"\n> On 25 Jan 2017, at 23:51, Junio C Hamano wrote:\n> \n> Jeff King writes:\n> \n>> I guess the way to dig would be to add a test that looks at the output\n>> of \"type mv\" or something, push it to a Travis-hooked branch, and then\n>> wait for the output\n> \n> Sounds tempting ;-)\n\nWell, I tried that:\n\nmv is /bin/mv\n\n... and \"/bin/mv\" is exactly the version that I have on my machine.\n\nThe difference between Travis and my machine is that I changed the \ndefault shell to ZSH with a few plugins [1]. If I run the test with \nplain BASH on my Mac then I can reproduce the test failure. Therefore,\nwe might want to adjust the commit message if anyone else can reproduce\nthe problem on a Mac. \n\nI can even reproduce the failure if I run the test with plain ZSH. \nHowever, I can't find a plugin that defines an alias for \"mv\". Puzzled...\n\n- Lars\n\n[1] https://github.com/robbyrussell/oh-my-zsh\n"},{"id":"310301","messageId":"8141FBB4-ACD0-42F5-9B5A-DA8DF1693972@gmail.com","threadId":"44956","inReplyTo":"D9F0976B-9F78-44BE-B9DD-CAB6506FA3A9@gmail.com","subject":"Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Lars Schneider","fromEmail":"larsxschneider@gmail.com","sentAt":"2017-01-26T09:48:30Z","receivedAt":"2017-01-26T10:49:13Z","isPatch":false,"sender":{"key":"larsxschneider@gmail.com","avatar":"https://avatars.githubusercontent.com/u/477434?v=4"},"body":"\n> On 26 Jan 2017, at 10:14, Lars Schneider wrote:\n> \n> \n>> On 25 Jan 2017, at 23:51, Junio C Hamano wrote:\n>> \n>> Jeff King writes:\n>> \n>>> I guess the way to dig would be to add a test that looks at the output\n>>> of \"type mv\" or something, push it to a Travis-hooked branch, and then\n>>> wait for the output\n>> \n>> Sounds tempting ;-)\n> \n> Well, I tried that:\n> \n> mv is /bin/mv\n> \n> ... and \"/bin/mv\" is exactly the version that I have on my machine.\n> \n> The difference between Travis and my machine is that I changed the \n> default shell to ZSH with a few plugins [1]. If I run the test with \n> plain BASH on my Mac then I can reproduce the test failure. Therefore,\n> we might want to adjust the commit message if anyone else can reproduce\n> the problem on a Mac. \n> \n> I can even reproduce the failure if I run the test with plain ZSH. \n> However, I can't find a plugin that defines an alias for \"mv\". Puzzled...\n> \n> - Lars\n> \n> [1] https://github.com/robbyrussell/oh-my-zsh\n\nOh. I must have made a mistake on my very first test run. I can reproduce\nthe failure with ZSH and my plugins... looks like it's a Mac OS problem\nand no TravisCI only problem after all. \n\nSorry for the noise/confusion,\nLars\n"},{"id":"310318","messageId":"20170126142648.7jjewr42okngawdd@sigill.intra.peff.net","threadId":"44956","inReplyTo":"8141FBB4-ACD0-42F5-9B5A-DA8DF1693972@gmail.com","subject":"Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2017-01-26T14:26:49Z","receivedAt":"2017-01-26T14:26:56Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Jan 26, 2017 at 10:48:30AM +0100, Lars Schneider wrote:\n\n> Oh. I must have made a mistake on my very first test run. I can reproduce\n> the failure with ZSH and my plugins... looks like it's a Mac OS problem\n> and no TravisCI only problem after all.\n\nThanks for digging into it. If it's really /bin/mv that causes the\nproblem, then I doubly think the \"mv -f\" patch is the right fix.\n\n-Peff\n"},{"id":"310336","messageId":"xmqqtw8l66ir.fsf@gitster.mtv.corp.google.com","threadId":"44956","inReplyTo":"D9F0976B-9F78-44BE-B9DD-CAB6506FA3A9@gmail.com","subject":"Re: What's cooking in git.git (Jan 2017, #04; Mon, 23)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-01-26T18:05:48Z","receivedAt":"2017-01-26T18:07:04Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lars Schneider writes:\n\n> The difference between Travis and my machine is that I changed the \n> default shell to ZSH with a few plugins [1]. If I run the test with \n> plain BASH on my Mac then I can reproduce the test failure. Therefore,\n> we might want to adjust the commit message if anyone else can reproduce\n> the problem on a Mac. \n\nWith \"Reportedly macOS does this, at least in the Travis builds.\",\neven with the result from you in your follow-up message to the\nmessage I am responding to, I think what Peff wrote in the log\nmessage is good enough.\n\nThanks for digging, and thanks Peff for coming up the workaround.\n"}]}