{"thread":{"id":"27447","subject":"What's cooking in git.git (May 2011, #11; Tue, 24)","startedAt":"2011-05-24T21:45:46Z","lastAt":"2011-05-26T03:28:33Z","messageCount":7,"participants":["Junio C Hamano","Johannes Sixt","Ævar Arnfjörð Bjarmason","David Aguilar"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"168601","messageId":"7vboyr7oxh.fsf@alter.siamese.dyndns.org","threadId":"27447","inReplyTo":null,"subject":"What's cooking in git.git (May 2011, #11; Tue, 24)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-05-24T21:45:46Z","receivedAt":"2011-05-24T21:45:46Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"What's cooking in git.git (May 2011, #11; Tue, 24)\n--------------------------------------------------\n\nHere are the topics that have been cooking.  Commits prefixed with '-' are\nonly in 'pu' while commits prefixed with '+' are in 'next'.\n\nThe main part of this cycle is expected to run thru May, aiming for a\nfeature freeze in early June.\n\nWe are at the beginning of week #5 of this cycle. Let's plan to tag -rc0\nwith what is in 'master' at the end of the month.\n\n--------------------------------------------------\n[New Topics]\n\n* jc/fix-config-environment-passing (2011-05-24) 1 commit\n - Allow built-ins to also use -c var=val via alias\n\n--------------------------------------------------\n[Stalled]\n\n* jl/read-tree-m-dry-run (2011-05-11) 1 commit\n - Teach read-tree the -n|--dry-run option\n\nWaiting for a reroll.\n\n* mg/diff-stat-count (2011-05-03) 2 commits\n - diff-options.txt: describe --stat-{width,name-width,count}\n - diff: introduce --stat-count to limit the stat lines\n\nThere was a miscounting spotted.  Need another round.\n\n* jk/maint-merge-rename-create (2011-03-25) 3 commits\n - merge: turn on rewrite detection\n - merge: handle renames with replacement content\n - t3030: fix accidental success in symlink rename\n\nPeff wanted to reroll this.\n\n* jc/index-pack (2011-02-27) 5 commits\n - index-pack --verify: read anomalous offsets from v2 idx file\n - write_idx_file: need_large_offset() helper function\n - index-pack: --verify\n - write_idx_file: introduce a struct to hold idx customization options\n - index-pack: group the delta-base array entries also by type\n\nStill a WIP. Need to put histogram output into index-pack --verify to\nreally kill verify-pack.\n\n* jk/tag-contains (2010-07-05) 4 commits\n - Why is \"git tag --contains\" so slow?\n - default core.clockskew variable to one day\n - limit \"contains\" traversals based on commit timestamp\n - tag: speed up --contains calculation\n\nThe idea of the bottom one is probably Ok, except that the use of object\nflags needs to be rethought, or at least the helper needs to be moved to\nbuiltin/tag.c to make it clear that it should not be used outside the\ncurrent usage context.\n\n--------------------------------------------------\n[Cooking]\n\n* da/git-prefix-everywhere (2011-05-23) 3 commits\n - git-mergetool--lib: Make vimdiff retain the current directory\n - git: Remove handling for GIT_PREFIX\n - setup: Provide GIT_PREFIX to built-ins\n\nIs everybody happy with this?\nWill merge to \"next\".\n\n* jh/receive-count-limit (2011-05-23) 10 commits\n - receive-pack: Allow server to refuse pushes with too many objects\n - pack-objects: Estimate pack size; abort early if pack size limit is exceeded\n - send-pack/receive-pack: Allow server to refuse pushing too large packs\n - pack-objects: Allow --max-pack-size to be used together with --stdout\n - send-pack/receive-pack: Allow server to refuse pushes with too many commits\n - pack-objects: Teach new option --max-commit-count, limiting #commits in pack\n - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities\n - Tighten rules for matching server capabilities in server_supports()\n - send-pack: Attempt to retrieve remote status even if pack-objects fails\n - Update technical docs to reflect side-band-64k capability in receive-pack\n\nWould need another round to separate per-pack and per-session limits.\n\n* jc/require-work-tree-exists (2011-05-24) 1 commit\n  (merged to 'next' on 2011-05-24 at 6dbbf00)\n + require-work-tree wants more than what its name says\n\nRerolled _without_ any in-tree users, just to make sure that we can easily\nadapt scripts when necessary in the future.\n\nWill merge to \"master\" by the end of week #5.\n\n* jn/gitweb-js (2011-05-24) 11 commits\n  (merged to 'next' on 2011-05-24 at c385b9d)\n + gitweb: Make JavaScript ability to adjust timezones configurable\n + gitweb.js: Add UI for selecting common timezone to display dates\n + gitweb: JavaScript ability to adjust time based on timezone\n + gitweb: Unify the way long timestamp is displayed\n + gitweb: Refactor generating of long dates into format_timestamp_html\n + gitweb.js: Provide getElementsByClassName method (if it not exists)\n + gitweb.js: Introduce code to handle cookies from JavaScript\n + gitweb.js: Extract and improve datetime handling\n + gitweb.js: Provide default values for padding in padLeftStr and padLeft\n + gitweb.js: Update and improve comments in JavaScript files\n + gitweb: Split JavaScript for maintability, combining on build\n\nRebased on top of a more recent \"master\" that already has the two bottom\ncommits in the previous round of series.\n\nWill merge to \"master\" by the end of week #5.\n\n* jn/ctags-more (2011-04-29) 3 commits\n  (merged to 'next' on 2011-05-24 at 41b50be)\n + gitweb: Optional grouping of projects by category\n + gitweb: Modularized git_get_project_description to be more generic\n + gitweb: Split git_project_list_body in two functions\n\nAs nobody seems to be helping gitweb maintenance, I'll merge the above two\nseries to \"master\" and see if anybody screams. That seems to be the only\nway to make any progress.\n\nWill merge to \"master\" by the end of week #5.\n\n* jc/notes-batch-removal (2011-05-19) 4 commits\n  (merged to 'next' on 2011-05-23 at 5bd78a6)\n + show: --ignore-missing\n + notes remove: --stdin reads from the standard input\n + notes remove: --ignore-missing\n + notes remove: allow removing more than one\n\nWill merge to \"master\" by the end of week #5.\n\n* jk/fetch-mark-complete-optimization (2011-05-19) 1 commit\n  (merged to 'next' on 2011-05-23 at b56fb81)\n + fetch: avoid repeated commits in mark_complete\n\nTrivially correct.\nWill merge to \"master\" by the end of week #5.\n\n* jk/haves-from-alternate-odb (2011-05-19) 3 commits\n  (merged to 'next' on 2011-05-23 at 53b4735)\n + receive-pack: eliminate duplicate .have refs\n + bisect: refactor sha1_array into a generic sha1 list\n + refactor refs_from_alternate_cb to allow passing extra data\n\nWill merge to \"master\" by the end of week #5.\n\n* rg/no-gecos-in-pwent (2011-05-19) 1 commit\n  (merged to 'next' on 2011-05-23 at d2c4c33)\n + ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd\n\nTrivially correct and not intrusive, but the real value unknown.\nWill merge to \"master\" by the end of week #5.\n\n* jc/streaming-filter (2011-05-21) 6 commits\n - streaming: filter cascading\n - streaming filter: ident filter\n - Add LF-to-CRLF streaming conversion\n - stream filter: add \"no more input\" to the filters\n - Add streaming filter API\n - convert.h: move declarations for conversion from cache.h\n (this branch uses jc/bigfile, jc/streaming and jc/streaming.)\n\nTrivial lf-to-crlf and ident conversions can be performed without reading\neverything in-core first. Cascading is probably still broken.  Will not\nmerge before 1.7.6.\n\n* jn/userdiff-perl-updates (2011-05-23) 8 commits\n  (merged to 'next' on 2011-05-23 at 2595ae1)\n + userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters\n + tests: make test_expect_code quieter on success\n + userdiff/perl: catch sub with brace on second line\n + userdiff/perl: match full line of POD headers\n + userdiff/perl: anchor \"sub\" and \"package\" patterns on the left\n + t4018 (funcname patterns): minor cleanups\n + t4018 (funcname patterns): make configuration easier to track\n + t4018 (funcname patterns): make .gitattributes state easier to track\n\nWill merge to \"master\" by the end of week #5.\n\n* jc/git-handle-options-miscount (2011-05-24) 1 commit\n - handle_options(): do not miscount how many arguments were used\n\nUpdated with a trivial test, which turned out to uncover an unrelated bug\n(see jc/fix-config-environment-passing topic).\n\n* jk/combine-diff-binary-etc (2011-05-24) 5 commits\n  (merged to 'next' on 2011-05-24 at 07cf180)\n + combine-diff: respect textconv attributes\n + refactor get_textconv to not require diff_filespec\n + combine-diff: handle binary files as binary\n + combine-diff: calculate mode_differs earlier\n + combine-diff: split header printing into its own function\n\nWill merge to \"master\" by the end of month.\n\n* jc/advice-about-to-lose-commit (2011-05-24) 1 commit\n - checkout: make advice when reattaching the HEAD less loud\n\nRe-rolled and resurrected from \"Stalled\" status.\nWill merge to \"next\".\n\n* js/log-abbrev-commit-config (2011-05-18) 2 commits\n  (merged to 'next' on 2011-05-23 at 4e7e932)\n + Add log.abbrevCommit config variable\n + \"git log -h\": typofix misspelled 'suppress'\n\nShould be fine after several rounds of reviews.\nWill merge to \"master\" by the middle of week #5.\n\n* jc/streaming (2011-05-20) 13 commits\n  (merged to 'next' on 2011-05-23 at 7fd0b52)\n + streaming: read loose objects incrementally\n + sha1_file.c: expose helpers to read loose objects\n + streaming: read non-delta incrementally from a pack\n + streaming_write_entry(): support files with holes\n + convert: CRLF_INPUT is a no-op in the output codepath\n + streaming_write_entry(): use streaming API in write_entry()\n + streaming: a new API to read from the object store\n + write_entry(): separate two helper functions out\n + unpack_object_header(): make it public\n + sha1_object_info_extended(): hint about objects in delta-base cache\n + sha1_object_info_extended(): expose a bit more info\n + packed_object_info_detail(): do not return a string\n + Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming\n (this branch is used by jc/streaming-filter and jc/streaming-filter; uses jc/bigfile.)\n\n* jc/bigfile (2011-05-13) 3 commits\n  (merged to 'next' on 2011-05-15 at 0ee7144)\n + Bigfile: teach \"git add\" to send a large file straight to a pack\n + index_fd(): split into two helper functions\n + index_fd(): turn write_object and format_check arguments into one flag\n (this branch is used by jc/streaming and jc/streaming-filter.)\n\nThis covers the entry point for a big file to the system. Other parts that\nneed to know about them are the exit point (i.e. write_entry()), packing\nand repacking (as long as bigfilethreshold is sane this should work),\ndiffs and status (avoid slurping large binary in core only to do nothing,\nwhich we already should), and transport (receive-pack/fetch-pack call\neither unpack-objects or index-pack, which still want to hold the full\nobject in-core and need to be fixed).\n\nWill merge to \"master\" by the middle of week #5.\n\n* ab/i18n-scripts (2011-05-21) 48 commits\n  (merged to 'next' on 2011-05-23 at 69164a3)\n + i18n: git-bisect bisect_next_check \"You need to\" message\n + i18n: git-bisect [Y/n] messages\n + i18n: git-bisect bisect_replay + $1 messages\n + i18n: git-bisect bisect_reset + $1 messages\n + i18n: git-bisect bisect_run + $@ messages\n + i18n: git-bisect die + eval_gettext messages\n + i18n: git-bisect die + gettext messages\n + i18n: git-bisect echo + eval_gettext message\n + i18n: git-bisect echo + gettext messages\n + i18n: git-bisect gettext + echo message\n + i18n: git-bisect add git-sh-i18n\n + i18n: git-stash drop_stash say/die messages\n + i18n: git-stash \"unknown option\" message\n + i18n: git-stash die + eval_gettext $1 messages\n + i18n: git-stash die + eval_gettext $* messages\n + i18n: git-stash die + eval_gettext messages\n + i18n: git-stash die + gettext messages\n + i18n: git-stash say + gettext messages\n + i18n: git-stash echo + gettext message\n + i18n: git-stash add git-sh-i18n\n + i18n: git-submodule \"blob\" and \"submodule\" messages\n + i18n: git-submodule \"path not initialized\" message\n + i18n: git-submodule \"[...] path is ignored\" message\n + i18n: git-submodule \"Entering [...]\" message\n + i18n: git-submodule $errmsg messages\n + i18n: git-submodule \"Submodule change[...]\" messages\n + i18n: git-submodule \"cached cannot be used\" message\n + i18n: git-submodule $update_module say + die messages\n + i18n: git-submodule die + eval_gettext messages\n + i18n: git-submodule say + eval_gettext messages\n + i18n: git-submodule echo + eval_gettext messages\n + i18n: git-submodule add git-sh-i18n\n + i18n: git-pull eval_gettext + warning message\n + i18n: git-pull eval_gettext + die message\n + i18n: git-pull die messages\n + i18n: git-pull add git-sh-i18n\n + i18n: git-am printf(1) message to eval_gettext\n + i18n: git-am core say messages\n + i18n: git-am \"Falling back\" say message\n + i18n: git-am \"Apply?\" message\n + i18n: git-am clean_abort messages\n + i18n: git-am cannot_fallback messages\n + i18n: git-am die messages\n + i18n: git-am gettext + gettext to stderr message\n + i18n: git-am eval_gettext messages\n + i18n: git-am multi-line getttext $msg; echo\n + i18n: git-am one-line gettext $msg; echo\n + i18n: git-am add git-sh-i18n\n\nRerolled.\n\n* mk/grep-pcre (2011-05-23) 13 commits\n  (merged to 'next' on 2011-05-23 at fbd4877)\n + git-grep: Update tests (mainly for -P)\n  (merged to 'next' on 2011-05-16 at 0c6c25e)\n + Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS\n + git-grep: update tests now regexp type is \"last one wins\"\n  (merged to 'next' on 2011-05-15 at d110135)\n + git-grep: do not die upon -F/-P when grep.extendedRegexp is set.\n + git-grep: Bail out when -P is used with -F or -E\n + grep: Add basic tests\n + configure: Check for libpcre\n + git-grep: Learn PCRE\n + grep: Extract compile_regexp_failed() from compile_regexp()\n + grep: Fix a typo in a comment\n  (merged to 'next' on 2011-05-08 at 5d3bede)\n + grep: Put calls to fixmatch() and regmatch() into patmatch()\n + contrib/completion: --line-number to git grep\n + Documentation: Add --line-number to git-grep synopsis\n\nWill merge to \"master\" by the middle of week #5.\n\n--------------------------------------------------\n[Discarded]\n\n* hg/add-i-qq (2011-05-17) 1 commit\n . add-interactive: add 'Quit' shortcut to add hunk and quit\n\nThe question \"why is y+q any more deserving for a short-cut than d+q\" was\nraised late in the discussion, and I think it a very valid concern.\n\n* jc/add-delete-default (2011-04-27) 1 commit\n . git add: notice removal of tracked paths by default\n\nThis is ill-thought out. When the user does want to say \"take all changes\ninto account, not just addition\", they can easily say \"add -u\" (update).\n\n* jc/dotdot-is-parent-directory (2011-05-04) 1 commit\n . specifying ranges: we did not mean to make \"..\" an empty set\n\nUpdated documentation, but I do not feel a strong enough annoyance to push\nthis forward.\n"},{"id":"168627","messageId":"4DDCA0D2.2070604@viscovery.net","threadId":"27447","inReplyTo":"7vboyr7oxh.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (May 2011, #11; Tue, 24)","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2011-05-25T06:25:22Z","receivedAt":"2011-05-25T06:25:22Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 5/24/2011 23:45, schrieb Junio C Hamano:\n> * ab/i18n-scripts (2011-05-21) 48 commits\n>   (merged to 'next' on 2011-05-23 at 69164a3)\n>  ...\n> \n> Rerolled.\n\nI see you promoted ab/i18n-scripts-basic to master. What are your plans\nwith this topic? In its current form, git-submodule breaks in an obvious\nway on Windows, and other pitfalls may hide elsewhere.\n\nI don't have enough energy to help out with this issue, particularly\nbecause i18n is not exactly my own itch. Personally, I wouldn't mind the\nfate of the topic if there were a NO_GETTEXT switch that simply avoids all\nthe problems on Windows. Is there such a switch?\n\n-- Hannes\n"},{"id":"168631","messageId":"BANLkTi=5koa_f_xqaGvKPrEnKMh7ziOT0g@mail.gmail.com","threadId":"27447","inReplyTo":"4DDCA0D2.2070604@viscovery.net","subject":"Re: What's cooking in git.git (May 2011, #11; Tue, 24)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2011-05-25T09:36:13Z","receivedAt":"2011-05-25T09:36:13Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Wed, May 25, 2011 at 08:25, Johannes Sixt <j.sixt@viscovery.net> wrote:\n> Am 5/24/2011 23:45, schrieb Junio C Hamano:\n>> * ab/i18n-scripts (2011-05-21) 48 commits\n>>   (merged to 'next' on 2011-05-23 at 69164a3)\n>>  ...\n>>\n>> Rerolled.\n>\n> I see you promoted ab/i18n-scripts-basic to master. What are your plans\n> with this topic? In its current form, git-submodule breaks in an obvious\n> way on Windows, and other pitfalls may hide elsewhere.\n\nAren't you confusing ab/i18n-scripts-basic with ab/i18n-scripts? The\nformer just adds the infrastructure, the latter adds some eval_gettext\ninvocations that break on Windows while I haven't submitted some fixup\npatches for what's now in *next*, not master.\n\nIf anything's breaking on Windows in master it would be the\nt/t0201-gettext-fallbacks.sh test which uses some eval_gettext()\ncalls, but nothing else uses it currently.\n\n> I don't have enough energy to help out with this issue, particularly\n> because i18n is not exactly my own itch. Personally, I wouldn't mind the\n> fate of the topic if there were a NO_GETTEXT switch that simply avoids all\n> the problems on Windows. Is there such a switch?\n\nThere isn't and can't be without major re-organizations because\nshellscripts don't have something like the C preprocessor.\n\nBut I'll just fix the Windows issue soon and submit a new series for\ninclusion in next.\n"},{"id":"168635","messageId":"4DDCD9F8.9080105@viscovery.net","threadId":"27447","inReplyTo":"BANLkTi=5koa_f_xqaGvKPrEnKMh7ziOT0g@mail.gmail.com","subject":"Re: What's cooking in git.git (May 2011, #11; Tue, 24)","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2011-05-25T10:29:12Z","receivedAt":"2011-05-25T10:29:12Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 5/25/2011 11:36, schrieb Ævar Arnfjörð Bjarmason:\n> Aren't you confusing ab/i18n-scripts-basic with ab/i18n-scripts?\n\nNo, I'm aware of the difference and purposes of the two topics.\n\n>> ... if there were a NO_GETTEXT switch that simply avoids all\n>> the problems on Windows. Is there such a switch?\n> \n> There isn't and can't be without major re-organizations because\n> shellscripts don't have something like the C preprocessor.\n\nWell, we do preprocess the shell scripts. Wouldn't it be a matter of\n\nif test -z '@@NO_GETTEXT@@'\nthen\n\t... regular eval_gettext definition ...\nelse\n\t... dummy eval_gettext definition ...\nfi\n\nwith a corresponding extension of the sed script in the Makefile?\n\n> But I'll just fix the Windows issue soon and submit a new series for\n> inclusion in next.\n\nThanks! I just wanted to be sure that ab/i18n-scripts does not end up in\nmaster in a state that leaves Windows in limbo.\n\n-- Hannes\n"},{"id":"168643","messageId":"BANLkTi=qt6SER_1i=QuRZu0u4PjbxSkS0w@mail.gmail.com","threadId":"27447","inReplyTo":"4DDCD9F8.9080105@viscovery.net","subject":"Re: What's cooking in git.git (May 2011, #11; Tue, 24)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2011-05-25T11:46:20Z","receivedAt":"2011-05-25T11:46:20Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Wed, May 25, 2011 at 12:29, Johannes Sixt <j.sixt@viscovery.net> wrote:\n> Am 5/25/2011 11:36, schrieb Ævar Arnfjörð Bjarmason:\n\n>> But I'll just fix the Windows issue soon and submit a new series for\n>> inclusion in next.\n>\n> Thanks! I just wanted to be sure that ab/i18n-scripts does not end up in\n> master in a state that leaves Windows in limbo.\n\nMe neither. I just read from your mail that master was in limbo now.\n\nI'll fix the Windows issues before the i18n-ification of the scripts\nlands in master.\n"},{"id":"168663","messageId":"7v62oy6cup.fsf@alter.siamese.dyndns.org","threadId":"27447","inReplyTo":"4DDCA0D2.2070604@viscovery.net","subject":"Re: What's cooking in git.git (May 2011, #11; Tue, 24)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-05-25T15:04:14Z","receivedAt":"2011-05-25T15:04:14Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Sixt <j.sixt@viscovery.net> writes:\n\n> Am 5/24/2011 23:45, schrieb Junio C Hamano:\n>> * ab/i18n-scripts (2011-05-21) 48 commits\n>>   (merged to 'next' on 2011-05-23 at 69164a3)\n>>  ...\n>> \n>> Rerolled.\n>\n> I see you promoted ab/i18n-scripts-basic to master. What are your plans\n> with this topic? In its current form, git-submodule breaks in an obvious\n> way on Windows, and other pitfalls may hide elsewhere.\n\nThe plan is exactly the same as any other topic. Keep in \"next\" to cook so\nthat parties that do care can try it out, list the topic in the regular\n\"What's cooking\" message, so that parties that do care have enough chance\nto find possible issues before it causes problems to people by hitting\n\"master\". And get annoyed to hear issues only after the topic graduates to\n\"master\". Because somethings things happen, try not to be too upset when\nthat happens. Instead, help people to fix issues before the release.\n\nAt least that has been the plan for me personally.\n"},{"id":"168742","messageId":"20110526032831.GA28327@gmail.com","threadId":"27447","inReplyTo":"7vboyr7oxh.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (May 2011, #11; Tue, 24)","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2011-05-26T03:28:33Z","receivedAt":"2011-05-26T03:28:33Z","isPatch":false,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Tue, May 24, 2011 at 02:45:46PM -0700, Junio C Hamano wrote:\n> [Cooking]\n> \n> * da/git-prefix-everywhere (2011-05-23) 3 commits\n>  - git-mergetool--lib: Make vimdiff retain the current directory\n>  - git: Remove handling for GIT_PREFIX\n>  - setup: Provide GIT_PREFIX to built-ins\n> \n> Is everybody happy with this?\n> Will merge to \"next\".\n\nI have v2 of these patches that I'm about to send out.\nThe three changes were from the original series:\n\nWhen setup_git_directory_gently() return NULL\nset GIT_PREFIX to an empty string.\n\nAvoid #!/bin/sh calling printf with \\n in the test.\n\nResolve GIT_PREFIX unconditionally in mergetool--lib.\n\n\nI'll be sending the updated patches in a few minutes.\n-- \n\t\t\t\t\tDavid\n"}]}