{"thread":{"id":"32149","subject":"What's cooking in git.git (Nov 2012, #06; Mon, 19)","startedAt":"2012-11-19T23:55:05Z","lastAt":"2012-12-01T00:36:58Z","messageCount":15,"participants":["Junio C Hamano","Felipe Contreras","Paul Fox","Marc Branchaud","Jeff King","Adam Spiers"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"203525","messageId":"7vpq39up0m.fsf@alter.siamese.dyndns.org","threadId":"32149","inReplyTo":null,"subject":"What's cooking in git.git (Nov 2012, #06; Mon, 19)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-11-19T23:55:05Z","receivedAt":"2012-11-19T23:55:05Z","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\nBunch of topics have been merged to 'next'.\n\nWe are at the beginning of the 5th week of this release cycle\n(cf. http://tinyurl.com/gitcal), and I've moved many topics to the\nStalled category, which will be discarded without prejudice soonish\nunless there are some updates.  I am still a bit behind on some\ntopics and already posted rerolls may have to be pulled in.\n\nYou can find the changes described here in the integration branches of the\nrepositories listed at\n\n    http://git-blame.blogspot.com/p/git-public-repositories.html\n\n--------------------------------------------------\n[New Topics]\n\n* nd/pathspec-wildcard (2012-11-19) 4 commits\n - tree_entry_interesting: do basedir compare on wildcard patterns when possible\n - pathspec: apply \"*.c\" optimization from exclude\n - pathspec: do exact comparison on the leading non-wildcard part\n - pathspec: save the non-wildcard length part\n\n--------------------------------------------------\n[Stalled]\n\n* pf/editor-ignore-sigint (2012-11-11) 5 commits\n - launch_editor: propagate SIGINT from editor to git\n - run-command: do not warn about child death by SIGINT\n - run-command: drop silent_exec_failure arg from wait_or_whine\n - launch_editor: ignore SIGINT while the editor has control\n - launch_editor: refactor to use start/finish_command\n\n Avoid confusing cases where the user hits Ctrl-C while in the editor\n session, not realizing git will receive the signal. Since most editors\n will take over the terminal and will block SIGINT, this is not likely\n to confuse anyone.\n\n Some people raised issues with emacsclient, which are addressed by this\n re-roll. It should probably also handle SIGQUIT, and there were a\n handful of other review comments.\n\n Expecting a re-roll.\n\n\n* pp/gitweb-config-underscore (2012-11-08) 1 commit\n - gitweb: make remote_heads config setting work\n\n The key \"gitweb.remote_heads\" is not legal git config; this maps it to\n \"gitweb.remoteheads\".\n\n Junio raised a good point about the implementation for three-level\n variables.\n\n Expecting a re-roll.\n\n\n* mo/cvs-server-updates (2012-10-16) 10 commits\n - cvsserver Documentation: new cvs ... -r support\n - cvsserver: add t9402 to test branch and tag refs\n - cvsserver: support -r and sticky tags for most operations\n - cvsserver: Add version awareness to argsfromdir\n - cvsserver: generalize getmeta() to recognize commit refs\n - cvsserver: implement req_Sticky and related utilities\n - cvsserver: add misc commit lookup, file meta data, and file listing functions\n - cvsserver: define a tag name character escape mechanism\n - cvsserver: cleanup extra slashes in filename arguments\n - cvsserver: factor out git-log parsing logic\n\n Needs review by folks interested in cvsserver.\n\n\n* jc/apply-trailing-blank-removal (2012-10-12) 1 commit\n - apply.c:update_pre_post_images(): the preimage can be truncated\n\n Fix to update_pre_post_images() that did not take into account the\n possibility that whitespace fix could shrink the preimage and\n change the number of lines in it.\n\n Extra set of eyeballs appreciated.\n\n\n* jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits\n - config: exit on error accessing any config file\n - doc: advertise GIT_CONFIG_NOSYSTEM\n - config: treat user and xdg config permission problems as errors\n - config, gitignore: failure to access with ENOTDIR is ok\n\n An RFC to deal with a situation where .config/git is a file and we\n notice .config/git/config is not readable due to ENOTDIR, not\n ENOENT; I think a bit more refactored approach to consistently\n address permission errors across config, exclude and attrs is\n desirable.  Don't we also need a check for an opposite situation\n where we open .config/git/config or .gitattributes for reading but\n they turn out to be directories?\n\n\n* as/check-ignore (2012-11-08) 14 commits\n - t0007: fix tests on Windows\n - Documentation/check-ignore: we show the deciding match, not the first\n - Add git-check-ignore sub-command\n - dir.c: provide free_directory() for reclaiming dir_struct memory\n - pathspec.c: move reusable code from builtin/add.c\n - dir.c: refactor treat_gitlinks()\n - dir.c: keep track of where patterns came from\n - dir.c: refactor is_path_excluded()\n - dir.c: refactor is_excluded()\n - dir.c: refactor is_excluded_from_list()\n - dir.c: rename excluded() to is_excluded()\n - dir.c: rename excluded_from_list() to is_excluded_from_list()\n - dir.c: rename path_excluded() to is_path_excluded()\n - dir.c: rename cryptic 'which' variable to more consistent name\n\n Duy helped to reroll this.\n\n Expecting a re-roll.\n\n\n* aw/rebase-am-failure-detection (2012-10-11) 1 commit\n - rebase: Handle cases where format-patch fails\n\n I am unhappy a bit about the possible performance implications of\n having to store the output in a temporary file only for a rare case\n of format-patch aborting.\n\n\n* jk/lua-hackery (2012-10-07) 6 commits\n - pretty: fix up one-off format_commit_message calls\n - Minimum compilation fixup\n - Makefile: make \"lua\" a bit more configurable\n - add a \"lua\" pretty format\n - add basic lua infrastructure\n - pretty: make some commit-parsing helpers more public\n\n Interesting exercise. When we do this for real, we probably would want\n to wrap a commit to make it more like an \"object\" with methods like\n \"parents\", etc.\n\n\n* fc/remote-testgit-feature-done (2012-10-29) 1 commit\n - remote-testgit: properly check for errors\n\n Is this still in \"Needs review\" state?  Are poeple involved in the\n remote interface happy with this change?\n\n\n* jk/send-email-sender-prompt (2012-11-15) 8 commits\n - send-email: do not prompt for explicit repo ident\n - Git.pm: teach \"ident\" to query explicitness\n - var: provide explicit/implicit ident information\n - var: accept multiple variables on the command line\n - ident: keep separate \"explicit\" flags for author and committer\n - ident: make user_ident_explicitly_given static\n - t7502: factor out autoident prerequisite\n - test-lib: allow negation of prerequisites\n\n Avoid annoying sender prompt in git-send-email, but only when it is\n safe to do so.\n\n Perhaps keep only the first three patches, and replace the rest\n with the one from Felipe that takes a much simpler approach (the\n rationale of that patch needs to be cleaned up first, along the\n lines Jeff outlined, though).  Frozen until that happens.\n\n\n* nd/unify-appending-of-s-o-b (2012-11-15) 1 commit\n - Unify appending signoff in format-patch, commit and sequencer\n\n I am not sure if the logic to refrain from adding a sign-off based\n on the existing run of sign-offs is done correctly in this change.\n\n\n* nd/pretty-placeholder-with-color-option (2012-09-30) 9 commits\n . pretty: support %>> that steal trailing spaces\n . pretty: support truncating in %>, %< and %><\n . pretty: support padding placeholders, %< %> and %><\n . pretty: two phase conversion for non utf-8 commits\n . utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences\n . utf8.c: move display_mode_esc_sequence_len() for use by other functions\n . pretty: support %C(auto[,N]) to turn on coloring on next placeholder(s)\n . pretty: split parsing %C into a separate function\n . pretty: share code between format_decoration and show_decorations\n\n This causes warnings with -Wuninitialized, so I've ejected it from pu\n for the time being.\n\n\n* rc/maint-complete-git-p4 (2012-09-24) 1 commit\n  (merged to 'next' on 2012-10-29 at af52cef)\n + Teach git-completion about git p4\n\n Comment from Pete will need to be addressed in a follow-up patch.\n\n\n* as/test-tweaks (2012-09-20) 7 commits\n - tests: paint unexpectedly fixed known breakages in bold red\n - tests: test the test framework more thoroughly\n - [SQUASH] t/t0000-basic.sh: quoting of TEST_DIRECTORY is screwed up\n - tests: refactor mechanics of testing in a sub test-lib\n - tests: paint skipped tests in bold blue\n - tests: test number comes first in 'not ok $count - $message'\n - tests: paint known breakages in bold yellow\n\n Various minor tweaks to the test framework to paint its output\n lines in colors that match what they mean better.\n\n Has the \"is this really blue?\" issue Peff raised resolved???\n\n\n* jc/maint-name-rev (2012-09-17) 7 commits\n - describe --contains: use \"name-rev --algorithm=weight\"\n - name-rev --algorithm=weight: tests and documentation\n - name-rev --algorithm=weight: cache the computed weight in notes\n - name-rev --algorithm=weight: trivial optimization\n - name-rev: --algorithm option\n - name_rev: clarify the logic to assign a new tip-name to a commit\n - name-rev: lose unnecessary typedef\n\n \"git name-rev\" names the given revision based on a ref that can be\n reached in the smallest number of steps from the rev, but that is\n not useful when the caller wants to know which tag is the oldest one\n that contains the rev.  This teaches a new mode to the command that\n uses the oldest ref among those which contain the rev.\n\n I am not sure if this is worth it; for one thing, even with the help\n from notes-cache, it seems to make the \"describe --contains\" even\n slower. Also the command will be unusably slow for a user who does\n not have a write access (hence unable to create or update the\n notes-cache).\n\n Stalled mostly due to lack of responses.\n\n\n* jc/xprm-generation (2012-09-14) 1 commit\n - test-generation: compute generation numbers and clock skews\n\n A toy to analyze how bad the clock skews are in histories of real\n world projects.\n\n Stalled mostly due to lack of responses.\n\n\n* jc/blame-no-follow (2012-09-21) 2 commits\n - blame: pay attention to --no-follow\n - diff: accept --no-follow option\n\n Teaches \"--no-follow\" option to \"git blame\" to disable its\n whole-file rename detection.\n\n Stalled mostly due to lack of responses.\n\n\n* jc/doc-default-format (2012-10-07) 2 commits\n - [SQAUSH] allow \"cd Doc* && make DEFAULT_DOC_TARGET=...\"\n - Allow generating a non-default set of documentation\n\n Need to address the installation half if this is to be any useful.\n\n\n* mk/maint-graph-infinity-loop (2012-09-25) 1 commit\n - graph.c: infinite loop in git whatchanged --graph -m\n\n The --graph code fell into infinite loop when asked to do what the\n code did not expect ;-)\n\n Anybody who worked on \"--graph\" wants to comment?\n Stalled mostly due to lack of responses.\n\n\n* jc/add-delete-default (2012-08-13) 1 commit\n - git add: notice removal of tracked paths by default\n\n \"git add dir/\" updated modified files and added new files, but does\n not notice removed files, which may be \"Huh?\" to some users.  They\n can of course use \"git add -A dir/\", but why should they?\n\n Resurrected from graveyard, as I thought it was a worthwhile thing\n to do in the longer term.\n\n Waiting for comments.\n\n\n* mb/remote-default-nn-origin (2012-07-11) 6 commits\n - Teach get_default_remote to respect remote.default.\n - Test that plain \"git fetch\" uses remote.default when on a detached HEAD.\n - Teach clone to set remote.default.\n - Teach \"git remote\" about remote.default.\n - Teach remote.c about the remote.default configuration setting.\n - Rename remote.c's default_remote_name static variables.\n\n When the user does not specify what remote to interact with, we\n often attempt to use 'origin'.  This can now be customized via a\n configuration variable.\n\n Expecting a re-roll.\n\n \"The first remote becomes the default\" bit is better done as a\n separate step.\n\n\n* mh/ceiling (2012-10-29) 8 commits\n - string_list_longest_prefix(): remove function\n - setup_git_directory_gently_1(): resolve symlinks in ceiling paths\n - longest_ancestor_length(): require prefix list entries to be normalized\n - longest_ancestor_length(): take a string_list argument for prefixes\n - longest_ancestor_length(): use string_list_split()\n - Introduce new function real_path_if_valid()\n - real_path_internal(): add comment explaining use of cwd\n - Introduce new static function real_path_internal()\n\n Elements of GIT_CEILING_DIRECTORIES list may not match the real\n pathname we obtain from getcwd(), leading the GIT_DIR discovery\n logic to escape the ceilings the user thought to have specified.\n\n--------------------------------------------------\n[Cooking]\n\n* jl/submodule-rm (2012-11-14) 1 commit\n  (merged to 'next' on 2012-11-18 at bf4525d)\n + docs: move submodule section\n\n Documentation correction for d21240f (Merge branch\n 'jl/submodule-rm', 2012-10-29) that needs to be fast-tracked.\n\n Will merge to 'master' in the sixth batch.\n\n\n* sg/complete-help-undup (2012-11-14) 1 commit\n  (merged to 'next' on 2012-11-18 at eadd0f3)\n + completion: remove 'help' duplicate from porcelain commands\n\n Will merge to 'master' in the seventh batch.\n\n\n* bc/do-not-recurse-in-die (2012-11-15) 1 commit\n  (merged to 'next' on 2012-11-18 at 79d62a8)\n + usage.c: detect recursion in die routines and bail out immediately\n\n Will merge to 'master' in the seventh batch.\n\n\n* cn/config-missing-path (2012-11-15) 1 commit\n  (merged to 'next' on 2012-11-18 at c08b73c)\n + config: don't segfault when given --path with a missing value\n\n Will merge to 'master' in the sixth batch.\n\n\n* jk/checkout-out-of-unborn (2012-11-15) 1 commit\n  (merged to 'next' on 2012-11-18 at 7d2aa24)\n + checkout: print a message when switching unborn branches\n\n Will merge to 'master' in the sixth batch.\n\n\n* mk/complete-tcsh (2012-11-16) 1 commit\n  (merged to 'next' on 2012-11-19 at 8309029)\n + tcsh-completion re-using git-completion.bash\n\n Will merge to 'master' in the seventh batch.\n\n\n* mm/status-push-pull-advise (2012-11-16) 1 commit\n - status: add advice on how to push/pull to tracking branch\n\n Will merge to 'next'.\n\n\n* jk/maint-gitweb-xss (2012-11-12) 1 commit\n  (merged to 'next' on 2012-11-14 at 7a667bc)\n + gitweb: escape html in rss title\n\n Fixes an XSS vulnerability in gitweb.\n\n Will merge to 'master' in the sixth batch.\n\n\n* mg/replace-resolve-delete (2012-11-13) 1 commit\n  (merged to 'next' on 2012-11-14 at fa785ae)\n + replace: parse revision argument for -d\n\n Be more user friendly to people using \"git replace -d\".\n\n Will merge to 'master' in the sixth batch.\n\n\n* ml/cygwin-mingw-headers (2012-11-18) 2 commits\n  (merged to 'next' on 2012-11-19 at f9964da)\n + USE CGYWIN_V15_WIN32API as macro to select api for cygwin\n  (merged to 'next' on 2012-11-15 at 22e11b3)\n + Update cygwin.c for new mingw-64 win32 api headers\n\n Make git work on newer cygwin.\n\n Will merge to 'master' in the sixth batch.\n\n\n* ta/doc-cleanup (2012-10-25) 6 commits\n  (merged to 'next' on 2012-11-13 at e11fafd)\n + Documentation: build html for all files in technical and howto\n + Documentation/howto: convert plain text files to asciidoc\n + Documentation/technical: convert plain text files to asciidoc\n + Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt\n + Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1\n + Split over-long synopsis in git-fetch-pack.txt into several lines\n\n Will merge to 'master' in the sixth batch.\n\n\n* lt/diff-stat-show-0-lines (2012-10-17) 1 commit\n  (merged to 'next' on 2012-11-19 at 0037290)\n + Fix \"git diff --stat\" for interesting - but empty - file changes\n\n We failed to mention a file without any content change but whose\n permission bit was modified, or (worse yet) a new file without any\n content in the \"git diff --stat\" output.\n\n Will merge to 'master' in the seventh batch.\n\n\n* fc/zsh-completion (2012-11-19) 2 commits\n - completion: start moving to the new zsh completion\n - completion: add new zsh completion\n\n Replaced by shedding large changes to other independent topics.\n Any comments from zsh users?\n\n\n* so/prompt-command (2012-10-17) 4 commits\n  (merged to 'next' on 2012-10-25 at 79565a1)\n + coloured git-prompt: paint detached HEAD marker in red\n + Fix up colored git-prompt\n + show color hints based on state of the git tree\n + Allow __git_ps1 to be used in PROMPT_COMMAND\n\n Updates __git_ps1 so that it can be used as $PROMPT_COMMAND,\n instead of being used for command substitution in $PS1, to embed\n color escape sequences in its output.\n\n Will cook in 'next'.\n\n\n* nd/wildmatch (2012-10-15) 13 commits\n  (merged to 'next' on 2012-10-25 at 510e8df)\n + Support \"**\" wildcard in .gitignore and .gitattributes\n + wildmatch: make /**/ match zero or more directories\n + wildmatch: adjust \"**\" behavior\n + wildmatch: fix case-insensitive matching\n + wildmatch: remove static variable force_lower_case\n + wildmatch: make wildmatch's return value compatible with fnmatch\n + t3070: disable unreliable fnmatch tests\n + Integrate wildmatch to git\n + wildmatch: follow Git's coding convention\n + wildmatch: remove unnecessary functions\n + Import wildmatch from rsync\n + ctype: support iscntrl, ispunct, isxdigit and isprint\n + ctype: make sane_ctype[] const array\n\n Allows pathname patterns in .gitignore and .gitattributes files\n with double-asterisks \"foo/**/bar\" to match any number of directory\n hierarchies.\n\n I suspect that this needs to be plugged to pathspec matching code;\n otherwise \"git log -- 'Docum*/**/*.txt'\" would not show the log for\n commits that touch Documentation/git.txt, which would be confusing\n to the users.\n\n Will cook in 'next'.\n\n\n* jh/update-ref-d-through-symref (2012-10-21) 2 commits\n  (merged to 'next' on 2012-11-19 at 6bcca4c)\n + Fix failure to delete a packed ref through a symref\n + t1400-update-ref: Add test verifying bug with symrefs in delete_ref()\n\n \"update-ref -d --deref SYM\" to delete a ref through a symbolic ref\n that points to it did not remove it correctly.\n\n Will merge to 'master' in the seventh batch.\n\n\n* jk/config-ignore-duplicates (2012-10-29) 9 commits\n  (merged to 'next' on 2012-10-29 at 67fa0a2)\n + builtin/config.c: Fix a sparse warning\n  (merged to 'next' on 2012-10-25 at 233df08)\n + git-config: use git_config_with_options\n + git-config: do not complain about duplicate entries\n + git-config: collect values instead of immediately printing\n + git-config: fix regexp memory leaks on error conditions\n + git-config: remove memory leak of key regexp\n + t1300: test \"git config --get-all\" more thoroughly\n + t1300: remove redundant test\n + t1300: style updates\n\n Drop duplicate detection from git-config; this lets it\n better match the internal config callbacks, which clears up\n some corner cases with includes.\n\n Will merge to 'master' in the sixth batch.\n\n\n* fc/completion-test-simplification (2012-11-16) 6 commits\n - completion: simplify __gitcomp() test helper\n - completion: refactor __gitcomp related tests\n - completion: consolidate test_completion*() tests\n - completion: simplify tests using test_completion_long()\n - completion: standardize final space marker in tests\n - completion: add comment for test_completion()\n\n Clean up completion tests.  Use of conslidated helper may make\n instrumenting one particular test during debugging of the test\n itself, but I think that issue should be addressed in some other\n way (e.g. making sure individual tests in 9902 can be skipped).\n\n\n* jk/pickaxe-textconv (2012-10-28) 2 commits\n - pickaxe: use textconv for -S counting\n - pickaxe: hoist empty needle check\n\n Use textconv filters when searching with \"log -S\".\n\n It probably should lose \"are the textconv on the two sides the\n same?\" check.\n\n\n* fc/remote-bzr (2012-11-08) 5 commits\n  (merged to 'next' on 2012-11-18 at 86add07)\n + remote-bzr: update working tree\n + remote-bzr: add support for remote repositories\n + remote-bzr: add support for pushing\n + remote-bzr: add simple tests\n + Add new remote-bzr transport helper\n\n New remote helper for bzr.\n\n Will merge to 'master' in the seventh batch.\n\n\n* fc/remote-hg (2012-11-12) 20 commits\n  (merged to 'next' on 2012-11-18 at 4a4f2e4)\n + remote-hg: avoid bad refs\n + remote-hg: try the 'tip' if no checkout present\n + remote-hg: fix compatibility with older versions of hg\n + remote-hg: add missing config for basic tests\n + remote-hg: the author email can be null\n + remote-hg: add option to not track branches\n + remote-hg: add extra author test\n + remote-hg: add tests to compare with hg-git\n + remote-hg: add bidirectional tests\n + test-lib: avoid full path to store test results\n + remote-hg: add basic tests\n + remote-hg: fake bookmark when there's none\n + remote-hg: add compat for hg-git author fixes\n + remote-hg: add support for hg-git compat mode\n + remote-hg: match hg merge behavior\n + remote-hg: make sure the encoding is correct\n + remote-hg: add support to push URLs\n + remote-hg: add support for remote pushing\n + remote-hg: add support for pushing\n + Add new remote-hg transport helper\n\n New remote helper for hg.\n\n Will merge to 'master' in the seventh batch.\n\n\n* jk/maint-http-half-auth-fetch (2012-10-31) 2 commits\n  (merged to 'next' on 2012-11-09 at af69926)\n + remote-curl: retry failed requests for auth even with gzip\n + remote-curl: hoist gzip buffer size to top of post_rpc\n\n Fixes fetch from servers that ask for auth only during the actual\n packing phase. This is not really a recommended configuration, but it\n cleans up the code at the same time.\n\n Will merge to 'master' in the sixth batch.\n\n\n* kb/preload-index-more (2012-11-02) 1 commit\n  (merged to 'next' on 2012-11-09 at a750ebd)\n + update-index/diff-index: use core.preloadindex to improve performance\n\n Use preloadindex in more places, which has a nice speedup on systems\n with slow stat calls (and even on Linux).\n\n Will merge to 'master' in the sixth batch.\n\n\n* cr/push-force-tag-update (2012-11-19) 5 commits\n - push: update remote tags only with force\n - push: flag updates that require force\n - push: keep track of \"update\" state separately\n - push: add advice for rejected tag reference\n - push: return reject reasons via a mask\n\n Require \"-f\" for push to update a tag, even if it is a fast-forward.\n\n\n* fc/fast-export-fixes (2012-11-08) 14 commits\n - fast-export: don't handle uninteresting refs\n - fast-export: make sure updated refs get updated\n - fast-export: fix comparison in tests\n - fast-export: trivial cleanup\n - remote-testgit: make clear the 'done' feature\n - remote-testgit: report success after an import\n - remote-testgit: exercise more features\n - remote-testgit: cleanup tests\n - remote-testgit: remove irrelevant test\n - remote-testgit: get rid of non-local functionality\n - Add new simplified git-remote-testgit\n - Rename git-remote-testgit to git-remote-testpy\n - remote-testgit: fix direction of marks\n - fast-export: avoid importing blob marks\n\n Improvements to fix fast-export bugs, including how refs pointing to\n already-seen commits are handled. An earlier 4-commit version of this\n series looked good to me, but this much-expanded version has not seen\n any comments.\n\n Looks like it has been re-rolled, but I haven't checked it out yet.\n\n Needs review.\n\n\n* mh/alt-odb-string-list-cleanup (2012-11-08) 2 commits\n  (merged to 'next' on 2012-11-13 at 2bf41d9)\n + link_alt_odb_entries(): take (char *, len) rather than two pointers\n + link_alt_odb_entries(): use string_list_split_in_place()\n\n Cleanups in the alternates code. Fixes a potential bug and makes the\n code much cleaner.\n\n Will merge to 'master' in the sixth batch.\n\n\n* pw/maint-p4-rcs-expansion-newline (2012-11-08) 1 commit\n  (merged to 'next' on 2012-11-13 at e90cc7c)\n + git p4: RCS expansion should not span newlines\n\n I do not have p4 to play with, but looks obviously correct to me.\n\n Will merge to 'master' in the sixth batch.\n\n\n* rh/maint-gitweb-highlight-ext (2012-11-08) 1 commit\n  (merged to 'next' on 2012-11-13 at c57d856)\n + gitweb.perl: fix %highlight_ext mappings\n\n Fixes a clever misuse of perl's list interpretation.\n\n Will merge to 'master' in the sixth batch.\n\n\n* rr/submodule-diff-config (2012-11-18) 4 commits\n  (merged to 'next' on 2012-11-19 at 355319e)\n + submodule: display summary header in bold\n + diff: rename \"set\" variable\n + diff: introduce diff.submodule configuration variable\n + Documentation: move diff.wordRegex from config.txt to diff-config.txt\n\n Lets \"git diff --submodule=log\" become the default via configuration.\n\n Will merge to 'master' in the seventh batch.\n"},{"id":"203535","messageId":"CAMP44s3xW1qMzNmZm6-c0bXaREut6TDJoRBZ5mu=HWndSgYCyg@mail.gmail.com","threadId":"32149","inReplyTo":"7vpq39up0m.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Nov 2012, #06; Mon, 19)","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2012-11-20T01:41:46Z","receivedAt":"2012-11-20T01:41:46Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Tue, Nov 20, 2012 at 12:55 AM, Junio C Hamano <gitster@pobox.com> wrote:\n\n> * fc/remote-testgit-feature-done (2012-10-29) 1 commit\n>  - remote-testgit: properly check for errors\n\nPinging Sverre again.\n\nI now think that we need a better solution with waitpid() to check the\nstatus of the process, so that both import and export get proper error\nchecks. I found that out the hard way with a buggy remote helper.\n\nI still think this patch is good regardless, but not so big of a\npriority. I'm not going to purse it more, if it gets in, good, if not,\na waitpid() patch would take care of it.\n\nCheers.\n\n-- \nFelipe Contreras\n"},{"id":"203553","messageId":"20121120115923.746252E9301@grass.foxharp.boston.ma.us","threadId":"32149","inReplyTo":"7vpq39up0m.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Nov 2012, #06; Mon, 19)","fromName":"Paul Fox","fromEmail":"pgf@foxharp.boston.ma.us","sentAt":"2012-11-20T11:59:22Z","receivedAt":"2012-11-20T11:59:22Z","isPatch":false,"sender":{"key":"pgf@foxharp.boston.ma.us","avatar":"https://avatars.githubusercontent.com/u/4249842?v=4"},"body":"junio c hamano wrote:\n > [Stalled]\n > \n > * pf/editor-ignore-sigint (2012-11-11) 5 commits\n >  - launch_editor: propagate SIGINT from editor to git\n >  - run-command: do not warn about child death by SIGINT\n >  - run-command: drop silent_exec_failure arg from wait_or_whine\n >  - launch_editor: ignore SIGINT while the editor has control\n >  - launch_editor: refactor to use start/finish_command\n > \n >  Avoid confusing cases where the user hits Ctrl-C while in the editor\n >  session, not realizing git will receive the signal. Since most editors\n >  will take over the terminal and will block SIGINT, this is not likely\n >  to confuse anyone.\n > \n >  Some people raised issues with emacsclient, which are addressed by this\n >  re-roll. It should probably also handle SIGQUIT, and there were a\n >  handful of other review comments.\n > \n >  Expecting a re-roll.\n\ni don't have strong feelings on any of the later review comments\n(though i guess the check on finish_command()'s return code needed\nattention), and wasn't the last submitter, but would certainly like to\nsee this move forward.\n\npaul\n=---------------------\n paul fox, pgf@foxharp.boston.ma.us (arlington, ma, where it's 26.1 degrees)\n"},{"id":"203583","messageId":"7vy5hvq1ey.fsf@alter.siamese.dyndns.org","threadId":"32149","inReplyTo":"7vpq39up0m.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Nov 2012, #06; Mon, 19)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-11-20T23:50:45Z","receivedAt":"2012-11-20T23:50:45Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> 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>\n> Bunch of topics have been merged to 'next'.\n>\n> We are at the beginning of the 5th week of this release cycle\n> (cf. http://tinyurl.com/gitcal), and I've moved many topics to the\n> Stalled category, which will be discarded without prejudice soonish\n> unless there are some updates.  I am still a bit behind on some\n> topics and already posted rerolls may have to be pulled in.\n\nIt feels a bit too busy/loud to issue two \"What's cooking\" in a row,\nso here is an informal update.\n\n - The following have graduated to 'master'.\n\n     cn/config-missing-path\n     jk/checkout-out-of-unborn\n     jk/maint-gitweb-xss\n     jk/maint-http-half-auth-fetch\n     jl/submodule-rm\n     kb/preload-index-more\n     mg/replace-resolve-delete\n     mh/alt-odb-string-list-cleanup\n     ml/cygwin-mingw-headers\n     pw/maint-p4-rcs-expansion-newline\n     rh/maint-gitweb-highlight-ext\n     ta/doc-cleanup\n\n - Many topics have been merged to 'maint' in preparation for 1.8.0.1.\n\n     mg/maint-pull-suggest-upstream-to\n     mm/maint-doc-commit-edit\n     as/maint-doc-fix-no-post-rewrite\n     rs/lock-correct-ref-during-delete\n     rf/maint-mailmap-off-by-one\n     jk/maint-diff-grep-textconv\n     js/format-2047\n     sz/maint-curl-multi-timeout\n     po/maint-refs-replace-docs\n     ph/pull-rebase-detached\n     mm/maint-doc-remote-tracking\n     rs/branch-del-symref\n     nd/grep-true-path\n     jc/grep-pcre-loose-ends (early part)\n     da/mergetools-p4\n     jc/test-say-color-avoid-echo-escape\n     bw/config-lift-variable-name-length-limit\n\n - A few topics have been resurrected from the stalled category to\n   cooking:\n\n     pp/gitweb-config-underscore\n     jc/apply-trailing-blank-removal\n"},{"id":"203585","messageId":"7vobirq0q2.fsf_-_@alter.siamese.dyndns.org","threadId":"32149","inReplyTo":"7vy5hvq1ey.fsf@alter.siamese.dyndns.org","subject":"Topics currently in the Stalled category","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-11-21T00:05:41Z","receivedAt":"2012-11-21T00:05:41Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here is a list of stalled topics I am having trouble deciding what\nto do (the default is to dismiss them around feature freeze).\n\n* fc/fast-export-fixes (2012-11-08) 14 commits\n\n Renaming of remote-testgit feels to be a mistake.  It probably\n should keep its source in remote-testgit.bash and generate it, and\n moreover, if it wants to rename remote-testgit.py to remote-testpy,\n the new one should be called remote-testbash.  There was one reroll\n after what used to be queued, but nobody seemed to be interested in\n reviewing the series.\n\n This mostly happened while I was away, and judging from the\n discussion around this topic (and earlier iterations), I do not\n feel comfortable merging this series (or v5 reroll) as-is.\n\n Help?\n\n\n* pf/editor-ignore-sigint (2012-11-11) 5 commits\n\n Avoid confusing cases where the user hits Ctrl-C while in the editor\n session, not realizing git will receive the signal. Since most editors\n will take over the terminal and will block SIGINT, this is not likely\n to confuse anyone.\n\n Some people raised issues with emacsclient, which are addressed by this\n re-roll. It should probably also handle SIGQUIT, and there were a\n handful of other review comments.\n\n Anybody interested in moving this forward?\n \n\n* mo/cvs-server-updates (2012-10-16) 10 commits\n - cvsserver Documentation: new cvs ... -r support\n - cvsserver: add t9402 to test branch and tag refs\n - cvsserver: support -r and sticky tags for most operations\n - cvsserver: Add version awareness to argsfromdir\n - cvsserver: generalize getmeta() to recognize commit refs\n - cvsserver: implement req_Sticky and related utilities\n - cvsserver: add misc commit lookup, file meta data, and file listing functions\n - cvsserver: define a tag name character escape mechanism\n - cvsserver: cleanup extra slashes in filename arguments\n - cvsserver: factor out git-log parsing logic\n\n Needs review by folks interested in cvsserver.\n\n\n* jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits\n - config: exit on error accessing any config file\n - doc: advertise GIT_CONFIG_NOSYSTEM\n - config: treat user and xdg config permission problems as errors\n - config, gitignore: failure to access with ENOTDIR is ok\n\n An RFC to deal with a situation where .config/git is a file and we\n notice .config/git/config is not readable due to ENOTDIR, not\n ENOENT; I think a bit more refactored approach to consistently\n address permission errors across config, exclude and attrs may be\n desirable.\n\n Should we merge this as-is and build on top?  What are the chances\n of potential regressions?\n\n\n* as/check-ignore (2012-11-08) 14 commits\n - t0007: fix tests on Windows\n - Documentation/check-ignore: we show the deciding match, not the first\n - Add git-check-ignore sub-command\n - dir.c: provide free_directory() for reclaiming dir_struct memory\n - pathspec.c: move reusable code from builtin/add.c\n - dir.c: refactor treat_gitlinks()\n - dir.c: keep track of where patterns came from\n - dir.c: refactor is_path_excluded()\n - dir.c: refactor is_excluded()\n - dir.c: refactor is_excluded_from_list()\n - dir.c: rename excluded() to is_excluded()\n - dir.c: rename excluded_from_list() to is_excluded_from_list()\n - dir.c: rename path_excluded() to is_path_excluded()\n - dir.c: rename cryptic 'which' variable to more consistent name\n\n Duy helped to reroll this, but it seems that there weren't any\n activity since then during my absense.\n\n\n* fc/remote-testgit-feature-done (2012-10-29) 1 commit\n - remote-testgit: properly check for errors\n\n Is this still in \"Needs review\" state?  Are people involved in the\n remote interface happy with this change?\n\n\n* jk/send-email-sender-prompt (2012-11-15) 8 commits\n - send-email: do not prompt for explicit repo ident\n - Git.pm: teach \"ident\" to query explicitness\n - var: provide explicit/implicit ident information\n - var: accept multiple variables on the command line\n - ident: keep separate \"explicit\" flags for author and committer\n - ident: make user_ident_explicitly_given static\n - t7502: factor out autoident prerequisite\n - test-lib: allow negation of prerequisites\n\n Avoid annoying sender prompt in git-send-email, but only when it is\n safe to do so.\n\n Perhaps keep only the first three patches, and replace the rest\n with the one from Felipe that takes a much simpler approach (the\n rationale of that patch needs to be cleaned up first, along the\n lines Jeff outlined, though).  Frozen until that happens.\n\n\n* nd/unify-appending-of-s-o-b (2012-11-15) 1 commit\n - Unify appending signoff in format-patch, commit and sequencer\n\n I am not sure if the logic to refrain from adding a sign-off based\n on the existing run of sign-offs is done correctly in this change.\n\n\n* rc/maint-complete-git-p4 (2012-09-24) 1 commit\n  (merged to 'next' on 2012-10-29 at af52cef)\n + Teach git-completion about git p4\n\n Comment from Pete will need to be addressed in a follow-up patch.\n\n\n* as/test-tweaks (2012-09-20) 7 commits\n - tests: paint unexpectedly fixed known breakages in bold red\n - tests: test the test framework more thoroughly\n - [SQUASH] t/t0000-basic.sh: quoting of TEST_DIRECTORY is screwed up\n - tests: refactor mechanics of testing in a sub test-lib\n - tests: paint skipped tests in bold blue\n - tests: test number comes first in 'not ok $count - $message'\n - tests: paint known breakages in bold yellow\n\n Various minor tweaks to the test framework to paint its output\n lines in colors that match what they mean better.\n\n Has the \"is this really blue?\" issue Peff raised resolved???\n\n\n* mk/maint-graph-infinity-loop (2012-09-25) 1 commit\n - graph.c: infinite loop in git whatchanged --graph -m\n\n The --graph code fell into infinite loop when asked to do what the\n code did not expect ;-)\n\n Anybody who worked on \"--graph\" wants to comment?\n Stalled mostly due to lack of responses.\n\n\n* mb/remote-default-nn-origin (2012-07-11) 6 commits\n - Teach get_default_remote to respect remote.default.\n - Test that plain \"git fetch\" uses remote.default when on a detached HEAD.\n - Teach clone to set remote.default.\n - Teach \"git remote\" about remote.default.\n - Teach remote.c about the remote.default configuration setting.\n - Rename remote.c's default_remote_name static variables.\n\n When the user does not specify what remote to interact with, we\n often attempt to use 'origin'.  This can now be customized via a\n configuration variable.\n\n Expecting a re-roll.\n\n \"The first remote becomes the default\" bit is better done as a\n separate step.\n\n\n* mh/ceiling (2012-10-29) 8 commits\n - string_list_longest_prefix(): remove function\n - setup_git_directory_gently_1(): resolve symlinks in ceiling paths\n - longest_ancestor_length(): require prefix list entries to be normalized\n - longest_ancestor_length(): take a string_list argument for prefixes\n - longest_ancestor_length(): use string_list_split()\n - Introduce new function real_path_if_valid()\n - real_path_internal(): add comment explaining use of cwd\n - Introduce new static function real_path_internal()\n\n Elements of GIT_CEILING_DIRECTORIES list may not match the real\n pathname we obtain from getcwd(), leading the GIT_DIR discovery\n logic to escape the ceilings the user thought to have specified.\n\n I think the fear that this would regress the intended use case of\n the environment variable turned out to be unfounded during the\n discussion.\n\n Should we merge this as-is to 'next', cook for a while to make sure\n nobody screams?\n\nThanks.\n"},{"id":"203591","messageId":"CAMP44s30cbH5+HUxRBByk5sZGq=j_MdqLSnNzREozEk40_zbOw@mail.gmail.com","threadId":"32149","inReplyTo":"7vobirq0q2.fsf_-_@alter.siamese.dyndns.org","subject":"Re: Topics currently in the Stalled category","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2012-11-21T03:31:11Z","receivedAt":"2012-11-21T03:31:11Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Wed, Nov 21, 2012 at 1:05 AM, Junio C Hamano <gitster@pobox.com> wrote:\n> Here is a list of stalled topics I am having trouble deciding what\n> to do (the default is to dismiss them around feature freeze).\n>\n> * fc/fast-export-fixes (2012-11-08) 14 commits\n>\n>  Renaming of remote-testgit feels to be a mistake.  It probably\n>  should keep its source in remote-testgit.bash and generate it,\n\nWhy generate it? There's nothing to generate. python's source code\nneeds regeneration, bash's code doesn't.\n\n> and\n>  moreover, if it wants to rename remote-testgit.py to remote-testpy,\n>  the new one should be called remote-testbash.\n\nNo, remote-testbash is not testing anything that is specific to bash,\nit's testing the remote helper framework itself. It could be written\nin Ruby, or Python, or C, or anything.\n\nremote-testgit.py is *not* testing the remote helper framework, it's\ntesting the Python-specific remote helper framework.\n\nIOW. remote-testgit tests this:\n\n  transport-helper.c\n\nremote-testpy tests this:\n\n  git_remote_helpers/Makefile\n  git_remote_helpers/__init__.py\n  git_remote_helpers/git/__init__.py\n  git_remote_helpers/git/exporter.py\n  git_remote_helpers/git/git.py\n  git_remote_helpers/git/importer.py\n  git_remote_helpers/git/non_local.py\n  git_remote_helpers/git/repo.py\n  git_remote_helpers/setup.cfg\n  git_remote_helpers/setup.py\n  git_remote_helpers/util.py\n\nCheers.\n\n-- \nFelipe Contreras\n"},{"id":"203603","messageId":"50ACEB50.2060107@xiplink.com","threadId":"32149","inReplyTo":"7vobirq0q2.fsf_-_@alter.siamese.dyndns.org","subject":"Re: Topics currently in the Stalled category","fromName":"Marc Branchaud","fromEmail":"mbranchaud@xiplink.com","sentAt":"2012-11-21T14:55:12Z","receivedAt":"2012-11-21T14:55:12Z","isPatch":false,"sender":{"key":"mbranchaud@xiplink.com","avatar":null},"body":"On 12-11-20 07:05 PM, Junio C Hamano wrote:\n> Here is a list of stalled topics I am having trouble deciding what\n> to do (the default is to dismiss them around feature freeze).\n> \n\n[ snip ]\n\n> \n> * mb/remote-default-nn-origin (2012-07-11) 6 commits\n>  - Teach get_default_remote to respect remote.default.\n>  - Test that plain \"git fetch\" uses remote.default when on a detached HEAD.\n>  - Teach clone to set remote.default.\n>  - Teach \"git remote\" about remote.default.\n>  - Teach remote.c about the remote.default configuration setting.\n>  - Rename remote.c's default_remote_name static variables.\n> \n>  When the user does not specify what remote to interact with, we\n>  often attempt to use 'origin'.  This can now be customized via a\n>  configuration variable.\n> \n>  Expecting a re-roll.\n> \n>  \"The first remote becomes the default\" bit is better done as a\n>  separate step.\n\nThis is still on my list of things to do soon.  Unfortunately \"soon\" seems to\nbe rather perpetual these days.\n\nIf you're tired of carrying the branch feel free to dismiss it and I'll\nresurrect the topic when \"soon\" finally comes around.\n\n\t\tM.\n"},{"id":"204109","messageId":"20121128025928.GA27772@sigill.intra.peff.net","threadId":"32149","inReplyTo":"CAMP44s30cbH5+HUxRBByk5sZGq=j_MdqLSnNzREozEk40_zbOw@mail.gmail.com","subject":"Re: Topics currently in the Stalled category","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-11-28T02:59:28Z","receivedAt":"2012-11-28T02:59:28Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Nov 21, 2012 at 04:31:11AM +0100, Felipe Contreras wrote:\n\n> On Wed, Nov 21, 2012 at 1:05 AM, Junio C Hamano <gitster@pobox.com> wrote:\n> > Here is a list of stalled topics I am having trouble deciding what\n> > to do (the default is to dismiss them around feature freeze).\n> >\n> > * fc/fast-export-fixes (2012-11-08) 14 commits\n> >\n> >  Renaming of remote-testgit feels to be a mistake.  It probably\n> >  should keep its source in remote-testgit.bash and generate it,\n> \n> Why generate it? There's nothing to generate. python's source code\n> needs regeneration, bash's code doesn't.\n\nWe fix up the #!-lines on all of the existing shell scripts (as well as\npython and perl). Wouldn't we want to do the same for people who have\nbash in an alternate location?\n\nAs the series is now, people with bash in their PATH, but not in\n/bin/bash, will fail t5801 (the prereq to skip the test uses \"type\", but\ngit-remote-testgit hardcodes /bin/bash).\n\n-Peff\n"},{"id":"204111","messageId":"CAMP44s3F4MPm-kLAW67rZG8oZg76CGS32h44LnK05UT11TOnSA@mail.gmail.com","threadId":"32149","inReplyTo":"20121128025928.GA27772@sigill.intra.peff.net","subject":"Re: Topics currently in the Stalled category","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2012-11-28T03:10:07Z","receivedAt":"2012-11-28T03:10:07Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Wed, Nov 28, 2012 at 3:59 AM, Jeff King <peff@peff.net> wrote:\n> On Wed, Nov 21, 2012 at 04:31:11AM +0100, Felipe Contreras wrote:\n>\n>> On Wed, Nov 21, 2012 at 1:05 AM, Junio C Hamano <gitster@pobox.com> wrote:\n>> > Here is a list of stalled topics I am having trouble deciding what\n>> > to do (the default is to dismiss them around feature freeze).\n>> >\n>> > * fc/fast-export-fixes (2012-11-08) 14 commits\n>> >\n>> >  Renaming of remote-testgit feels to be a mistake.  It probably\n>> >  should keep its source in remote-testgit.bash and generate it,\n>>\n>> Why generate it? There's nothing to generate. python's source code\n>> needs regeneration, bash's code doesn't.\n>\n> We fix up the #!-lines on all of the existing shell scripts (as well as\n> python and perl). Wouldn't we want to do the same for people who have\n> bash in an alternate location?\n\n'#!/usr/bin/env bash' should take care of people who have bash in an\nalternate location, no?\n\n-- \nFelipe Contreras\n"},{"id":"204112","messageId":"20121128031118.GB27772@sigill.intra.peff.net","threadId":"32149","inReplyTo":"20121128025928.GA27772@sigill.intra.peff.net","subject":"Re: Topics currently in the Stalled category","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-11-28T03:11:18Z","receivedAt":"2012-11-28T03:11:18Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Nov 27, 2012 at 09:59:28PM -0500, Jeff King wrote:\n\n> > >  Renaming of remote-testgit feels to be a mistake.  It probably\n> > >  should keep its source in remote-testgit.bash and generate it,\n> > \n> > Why generate it? There's nothing to generate. python's source code\n> > needs regeneration, bash's code doesn't.\n> \n> We fix up the #!-lines on all of the existing shell scripts (as well as\n> python and perl). Wouldn't we want to do the same for people who have\n> bash in an alternate location?\n> \n> As the series is now, people with bash in their PATH, but not in\n> /bin/bash, will fail t5801 (the prereq to skip the test uses \"type\", but\n> git-remote-testgit hardcodes /bin/bash).\n\nWe could improve the test in t5801, but it is nice to let people on such\nsystems test it, as well. And the infrastructure might be useful if we\never acquire more bash scripts.\n\nThere's a fair bit of boilerplate, but I think this squashable patch\nwould do it:\n\ndiff --git a/.gitignore b/.gitignore\nindex 46595db..3b636bd 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -124,6 +124,7 @@\n /git-remote-ftps\n /git-remote-fd\n /git-remote-ext\n+/git-remote-testgit\n /git-remote-testsvn\n /git-remote-testpy\n /git-repack\ndiff --git a/Makefile b/Makefile\nindex 68f1ac2..19f6fd2 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -424,6 +424,7 @@ PROGRAM_OBJS =\n PROGRAMS =\n SCRIPT_PERL =\n SCRIPT_PYTHON =\n+SCRIPT_BASH =\n SCRIPT_SH =\n SCRIPT_LIB =\n TEST_PROGRAMS_NEED_X =\n@@ -473,9 +474,12 @@ SCRIPT_PERL += git-svn.perl\n SCRIPT_PYTHON += git-remote-testpy.py\n SCRIPT_PYTHON += git-p4.py\n \n+SCRIPT_BASH += git-remote-testgit.bash\n+\n SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \\\n \t  $(patsubst %.perl,%,$(SCRIPT_PERL)) \\\n \t  $(patsubst %.py,%,$(SCRIPT_PYTHON)) \\\n+\t  $(patsubst %.bash,%,$(SCRIPT_BASH)) \\\n \t  git-instaweb\n \n ETAGS_TARGET = TAGS\n@@ -571,9 +575,13 @@ endif\n ifndef PYTHON_PATH\n \tPYTHON_PATH = /usr/bin/python\n endif\n+ifndef BASH_PATH\n+\tBASH_PATH = /bin/bash\n+endif\n \n export PERL_PATH\n export PYTHON_PATH\n+export BASH_PATH\n \n LIB_FILE=libgit.a\n XDIFF_LIB=xdiff/lib.a\n@@ -1931,6 +1939,10 @@ ifeq ($(PYTHON_PATH),)\n NO_PYTHON=NoThanks\n endif\n \n+ifeq ($(BASH_PATH),)\n+NO_BASH=NoThanks\n+endif\n+\n QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir\n QUIET_SUBDIR1  =\n \n@@ -2006,6 +2018,7 @@ gitwebdir_SQ = $(subst ','\\'',$(gitwebdir))\n SHELL_PATH_SQ = $(subst ','\\'',$(SHELL_PATH))\n PERL_PATH_SQ = $(subst ','\\'',$(PERL_PATH))\n PYTHON_PATH_SQ = $(subst ','\\'',$(PYTHON_PATH))\n+BASH_PATH_SQ = $(subst ','\\'',$(BASH_PATH))\n TCLTK_PATH_SQ = $(subst ','\\'',$(TCLTK_PATH))\n DIFF_SQ = $(subst ','\\'',$(DIFF))\n \n@@ -2267,6 +2280,15 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : unimplemented.sh\n \tmv $@+ $@\n endif # NO_PYTHON\n \n+ifndef NO_BASH\n+$(patsubst %.bash,%,$(SCRIPT_BASH)):\n+\t$(QUIET_GEN)$(RM) $@ $@+ && \\\n+\tsed -e '1s|#!.*/bash|#!$(BASH_PATH_SQ)|' \\\n+\t    $@.bash >$@+ && \\\n+\tchmod +x $@+ && \\\n+\tmv $@+ $@\n+endif\n+\n configure: configure.ac GIT-VERSION-FILE\n \t$(QUIET_GEN)$(RM) $@ $<+ && \\\n \tsed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \\\n@@ -2599,6 +2621,7 @@ GIT-BUILD-OPTIONS: FORCE\n \t@echo USE_LIBPCRE=\\''$(subst ','\\'',$(subst ','\\'',$(USE_LIBPCRE)))'\\' >>$@\n \t@echo NO_PERL=\\''$(subst ','\\'',$(subst ','\\'',$(NO_PERL)))'\\' >>$@\n \t@echo NO_PYTHON=\\''$(subst ','\\'',$(subst ','\\'',$(NO_PYTHON)))'\\' >>$@\n+\t@echo NO_BASH=\\''$(subst ','\\'',$(subst ','\\'',$(NO_BASH)))'\\' >>$@\n \t@echo NO_UNIX_SOCKETS=\\''$(subst ','\\'',$(subst ','\\'',$(NO_UNIX_SOCKETS)))'\\' >>$@\n ifdef GIT_TEST_OPTS\n \t@echo GIT_TEST_OPTS=\\''$(subst ','\\'',$(subst ','\\'',$(GIT_TEST_OPTS)))'\\' >>$@\ndiff --git a/git-remote-testgit b/git-remote-testgit.bash\nsimilarity index 100%\nrename from git-remote-testgit\nrename to git-remote-testgit.bash\ndiff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh\nindex 456303b..d6ebc5e 100755\n--- a/t/t5801-remote-helpers.sh\n+++ b/t/t5801-remote-helpers.sh\n@@ -7,7 +7,7 @@ test_description='Test remote-helper import and export commands'\n \n . ./test-lib.sh\n \n-if ! type \"${BASH-bash}\" >/dev/null 2>&1; then\n+if ! test_have_prereq BASH; then\n \tskip_all='skipping remote-testgit tests, bash not available'\n \ttest_done\n fi\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex 489bc80..5300fa9 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -675,6 +675,7 @@ esac\n ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1\n test -z \"$NO_PERL\" && test_set_prereq PERL\n test -z \"$NO_PYTHON\" && test_set_prereq PYTHON\n+test -z \"$NO_BASH\" && test_set_prereq BASH\n test -n \"$USE_LIBPCRE\" && test_set_prereq LIBPCRE\n test -z \"$NO_GETTEXT\" && test_set_prereq GETTEXT\n \n"},{"id":"204113","messageId":"20121128031238.GC27772@sigill.intra.peff.net","threadId":"32149","inReplyTo":"CAMP44s3F4MPm-kLAW67rZG8oZg76CGS32h44LnK05UT11TOnSA@mail.gmail.com","subject":"Re: Topics currently in the Stalled category","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-11-28T03:12:38Z","receivedAt":"2012-11-28T03:12:38Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Nov 28, 2012 at 04:10:07AM +0100, Felipe Contreras wrote:\n\n> >> Why generate it? There's nothing to generate. python's source code\n> >> needs regeneration, bash's code doesn't.\n> >\n> > We fix up the #!-lines on all of the existing shell scripts (as well as\n> > python and perl). Wouldn't we want to do the same for people who have\n> > bash in an alternate location?\n> \n> '#!/usr/bin/env bash' should take care of people who have bash in an\n> alternate location, no?\n\nIf that is where there env is. I do not recall offhand if that is a\nproblem for anyone. Still, I don't think it is that big a deal to treat\nit like we do other scripts, and provide the usual boilerplate (which\nalso gets us NO_BASH if you have an old or broken bash and want to skip\nthe tests). I just sent a patch.\n\n-Peff\n"},{"id":"204115","messageId":"CAMP44s3ZtCNsedJtsHDJx5d4Myjbbp+D6yT-rO-CmKOTtt91VQ@mail.gmail.com","threadId":"32149","inReplyTo":"20121128031118.GB27772@sigill.intra.peff.net","subject":"Re: Topics currently in the Stalled category","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2012-11-28T03:15:12Z","receivedAt":"2012-11-28T03:15:12Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Wed, Nov 28, 2012 at 4:11 AM, Jeff King <peff@peff.net> wrote:\n> On Tue, Nov 27, 2012 at 09:59:28PM -0500, Jeff King wrote:\n>\n>> > >  Renaming of remote-testgit feels to be a mistake.  It probably\n>> > >  should keep its source in remote-testgit.bash and generate it,\n>> >\n>> > Why generate it? There's nothing to generate. python's source code\n>> > needs regeneration, bash's code doesn't.\n>>\n>> We fix up the #!-lines on all of the existing shell scripts (as well as\n>> python and perl). Wouldn't we want to do the same for people who have\n>> bash in an alternate location?\n>>\n>> As the series is now, people with bash in their PATH, but not in\n>> /bin/bash, will fail t5801 (the prereq to skip the test uses \"type\", but\n>> git-remote-testgit hardcodes /bin/bash).\n>\n> We could improve the test in t5801, but it is nice to let people on such\n> systems test it, as well. And the infrastructure might be useful if we\n> ever acquire more bash scripts.\n>\n> There's a fair bit of boilerplate, but I think this squashable patch\n> would do it:\n\nYeah, but I wonder what's the point of installing this script, it's\nmostly for testing and reference, and to add a whole category for that\nseems like overkill.\n\nCheers.\n\n-- \nFelipe Contreras\n"},{"id":"204116","messageId":"20121128032245.GD27772@sigill.intra.peff.net","threadId":"32149","inReplyTo":"CAMP44s3ZtCNsedJtsHDJx5d4Myjbbp+D6yT-rO-CmKOTtt91VQ@mail.gmail.com","subject":"Re: Topics currently in the Stalled category","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-11-28T03:22:45Z","receivedAt":"2012-11-28T03:22:45Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Nov 28, 2012 at 04:15:12AM +0100, Felipe Contreras wrote:\n\n> > We could improve the test in t5801, but it is nice to let people on such\n> > systems test it, as well. And the infrastructure might be useful if we\n> > ever acquire more bash scripts.\n> >\n> > There's a fair bit of boilerplate, but I think this squashable patch\n> > would do it:\n> \n> Yeah, but I wonder what's the point of installing this script, it's\n> mostly for testing and reference, and to add a whole category for that\n> seems like overkill.\n\nThere's no point in installing it; I just didn't make the effort to\navoid doing so (note that testpy and testsvn are also installed, which\nare in the same boat; it might make sense to split them all out like we\ndo for $TEST_PROGRAMS).\n\nI agree it's an annoying amount of boilerplate, but it seems simpler\ncognitively to me for it to behave as the other SCRIPT_* builds than to\ndo something simple but inconsistent.\n\nI do not care enough to argue about it. We need to do something to fix\nthe impending test breakage on systems like Solaris. I have posted the\npatch to handle BASH_PATH, so do what you want.\n\n-Peff\n"},{"id":"204120","messageId":"CAMP44s2Cw-Vr0pEi7vOYx3aPxrKWZNpRxx+DjjtejndsC0P7Bw@mail.gmail.com","threadId":"32149","inReplyTo":"20121128032245.GD27772@sigill.intra.peff.net","subject":"Re: Topics currently in the Stalled category","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2012-11-28T03:33:41Z","receivedAt":"2012-11-28T03:33:41Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Wed, Nov 28, 2012 at 4:22 AM, Jeff King <peff@peff.net> wrote:\n> On Wed, Nov 28, 2012 at 04:15:12AM +0100, Felipe Contreras wrote:\n>\n>> > We could improve the test in t5801, but it is nice to let people on such\n>> > systems test it, as well. And the infrastructure might be useful if we\n>> > ever acquire more bash scripts.\n>> >\n>> > There's a fair bit of boilerplate, but I think this squashable patch\n>> > would do it:\n>>\n>> Yeah, but I wonder what's the point of installing this script, it's\n>> mostly for testing and reference, and to add a whole category for that\n>> seems like overkill.\n>\n> There's no point in installing it; I just didn't make the effort to\n> avoid doing so (note that testpy and testsvn are also installed, which\n> are in the same boat; it might make sense to split them all out like we\n> do for $TEST_PROGRAMS).\n>\n> I agree it's an annoying amount of boilerplate, but it seems simpler\n> cognitively to me for it to behave as the other SCRIPT_* builds than to\n> do something simple but inconsistent.\n>\n> I do not care enough to argue about it. We need to do something to fix\n> the impending test breakage on systems like Solaris. I have posted the\n> patch to handle BASH_PATH, so do what you want.\n\nI'm not objecting to the change, I'm simply wondering.\n\nPersonally I think switching to '/usr/bin/env bash' should be enough\nfor now. Doing a grep on my git installation throws this:\n\n% grep '/usr/bin/env' -r /opt/git\n/opt/git/lib/python2.7/site-packages/git_remote_helpers/git/git.py:#!/usr/bin/env\npython\n/opt/git/lib/python2.7/site-packages/git_remote_helpers/__init__.py:#!/usr/bin/env\npython\n/opt/git/lib/python2.7/site-packages/git_remote_helpers/util.py:#!/usr/bin/env\npython\n/opt/git/libexec/git-core/git-instaweb:#!/usr/bin/env ruby\n\nSo it's doubtful a lack of /usr/bin/env would cause any more breakages\nthan it already does for test-git.\n\nAnd this just landed on 'pu', I don't think there's anything big\nimpending. If the /usr/bin/env solution turned out to be not enough\nfor some reason, we can deal with it then. That's my opinion.\n\nCheers.\n\n-- \nFelipe Contreras\n"},{"id":"204368","messageId":"CAOkDyE-dq+L0Gd4T=8oUeQ4OHE0hgmK4AfUhYgBo0uzq9TrrYw@mail.gmail.com","threadId":"32149","inReplyTo":"7vobirq0q2.fsf_-_@alter.siamese.dyndns.org","subject":"Re: Topics currently in the Stalled category","fromName":"Adam Spiers","fromEmail":"git@adamspiers.org","sentAt":"2012-12-01T00:36:58Z","receivedAt":"2012-12-01T00:36:58Z","isPatch":false,"sender":{"key":"git@adamspiers.org","avatar":"https://avatars.githubusercontent.com/u/100738?v=4"},"body":"On Wed, Nov 21, 2012 at 12:05 AM, Junio C Hamano <gitster@pobox.com> wrote:\n> Here is a list of stalled topics I am having trouble deciding what\n> to do (the default is to dismiss them around feature freeze).\n\n[snipped]\n\n> * as/check-ignore (2012-11-08) 14 commits\n>  - t0007: fix tests on Windows\n>  - Documentation/check-ignore: we show the deciding match, not the first\n>  - Add git-check-ignore sub-command\n>  - dir.c: provide free_directory() for reclaiming dir_struct memory\n>  - pathspec.c: move reusable code from builtin/add.c\n>  - dir.c: refactor treat_gitlinks()\n>  - dir.c: keep track of where patterns came from\n>  - dir.c: refactor is_path_excluded()\n>  - dir.c: refactor is_excluded()\n>  - dir.c: refactor is_excluded_from_list()\n>  - dir.c: rename excluded() to is_excluded()\n>  - dir.c: rename excluded_from_list() to is_excluded_from_list()\n>  - dir.c: rename path_excluded() to is_path_excluded()\n>  - dir.c: rename cryptic 'which' variable to more consistent name\n>\n>  Duy helped to reroll this, but it seems that there weren't any\n>  activity since then during my absense.\n\nI have been delayed several times, but I finally resumed work on\nanother re-roll.  I don't think there is any major reworking required;\njust a number of small tweaks.\n\n> * as/test-tweaks (2012-09-20) 7 commits\n>  - tests: paint unexpectedly fixed known breakages in bold red\n>  - tests: test the test framework more thoroughly\n>  - [SQUASH] t/t0000-basic.sh: quoting of TEST_DIRECTORY is screwed up\n>  - tests: refactor mechanics of testing in a sub test-lib\n>  - tests: paint skipped tests in bold blue\n>  - tests: test number comes first in 'not ok $count - $message'\n>  - tests: paint known breakages in bold yellow\n>\n>  Various minor tweaks to the test framework to paint its output\n>  lines in colors that match what they mean better.\n>\n>  Has the \"is this really blue?\" issue Peff raised resolved???\n\nI have a re-roll of this ready - just need to rebase to latest master,\ndo a final sanity check, and then send.\n\nSorry again for the delays.\n"}]}