{"thread":{"id":"30299","subject":"What's cooking in git.git (Apr 2012, #08; Fri, 20)","startedAt":"2012-04-21T00:06:20Z","lastAt":"2012-04-26T06:31:33Z","messageCount":7,"participants":["Junio C Hamano","SZEDER Gábor","Felipe Contreras","Johannes Sixt","Tim Henigan"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"189789","messageId":"xmqqobqmkkxv.fsf@junio.mtv.corp.google.com","threadId":"30299","inReplyTo":null,"subject":"What's cooking in git.git (Apr 2012, #08; Fri, 20)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-04-21T00:06:20Z","receivedAt":"2012-04-21T00:06:20Z","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 '-' are\nonly in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.\n\nThe third batch of topics in this cycle is now in 'master'.\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[Graduated to \"master\"]\n\n* bw/submodule-sed-solaris (2012-04-09) 1 commit\n  (merged to 'next' on 2012-04-12 at 3bf1d83)\n + Avoid bug in Solaris xpg4/sed as used in submodule\n\n* ct/advise-push-default (2012-04-12) 3 commits\n  (merged to 'next' on 2012-04-12 at b0613cd)\n + Fix httpd tests that broke when non-ff push advice changed\n + clean up struct ref's nonfastforward field\n + push: Provide situational hints for non-fast-forward errors\n (this branch is used by mm/push-default-switch-warning.)\n\nBreaks down the cases in which \"git push\" fails due to non-ff into three\ncategories, and gives separate advise messages.  This should be a good\nchange regardless of mm/push-default-switch-warning topic.\n\n* jb/am-include (2012-03-28) 1 commit\n  (merged to 'next' on 2012-04-12 at ddbf96d)\n + am: support --include option\n\n\"git am\" learned the \"--include\" option, which is an opposite of existing\nthe \"--exclude\" option.\n\n* jc/am-report-3way (2012-03-28) 1 commit\n  (merged to 'next' on 2012-04-12 at cf5d599)\n + am -3: list the paths that needed 3-way fallback\n\nWhen \"git am -3\" needs to fall back to an application to a synthesized\npreimage followed by a 3-way merge, the paths that needed such treatment\nare now reported to the end user, so that the result in them can be\neyeballed with extra care.\n\n* jc/fmt-merge-msg-people (2012-03-13) 1 commit\n  (merged to 'next' on 2012-04-12 at 4c2031c)\n + fmt-merge-msg: show those involved in a merged series\n\nThe \"fmt-merge-msg\" command learns to list the primary contributors\ninvolved in the side topic you are merging.\n\n* jc/push-upstream-sanity (2012-04-05) 1 commit\n  (merged to 'next' on 2012-04-12 at 288e1ad)\n + push: error out when the \"upstream\" semantics does not make sense\n (this branch is used by mm/push-default-switch-warning.)\n\nFix broken 'push to upstream' implementation.  \"git push $there\" without\nrefspec, when the current branch is set to push to a remote different from\n$there, used to push to $there using the upstream information to a remote\nunreleated to $there.\n\n* jk/run-command-eacces (2012-04-05) 2 commits\n  (merged to 'next' on 2012-04-12 at ef3782e)\n + run-command: treat inaccessible directories as ENOENT\n + compat/mingw.[ch]: Change return type of exec functions to int\n\nWhen PATH contains an unreadable directory, alias expansion code did not\nkick in, and failed with an error that said \"git-subcmd\" was not found.\n\n* js/spawn-via-shell-path-fix (2012-04-17) 1 commit\n  (merged to 'next' on 2012-04-19 at 3e04ef6)\n + Do not use SHELL_PATH from build system in prepare_shell_cmd on Windows\n\nMops up an unfortunate fallout from bw/spawn-via-shell-path topic.\n\n--------------------------------------------------\n[New Topics]\n\n* bw/test-fix-grep-gnuism (2012-04-19) 1 commit\n  (merged to 'next' on 2012-04-20 at ee7eec4)\n + t9400: fix gnuism in grep\n\nFix two places that were the only place in the test suite that gave \"a\\+\"\nto platform grep and expected it to mean one or more \"a\", which is a\nblatant GNUism.\n\n* rt/cherry-revert-conflict-summary (2012-04-19) 1 commit\n - sequencer: remove additional blank line\n\nIn the older days, the header \"Conflicts:\" in \"cherry-pick\" and\n\"merge\" was separated by a blank line from the list of paths that\nfollow for readability, but when \"merge\" was rewritten in C, we lost\nit by mistake. Remove the newline from \"cherry-pick\" to make them\nmatch again.\n\n* js/fast-import-test-9300 (2012-04-20) 1 commit\n - t9300-fast-import: avoid 'exit' in test_expect_success snippets\n\n--------------------------------------------------\n[Stalled]\n\n* jc/split-blob (2012-04-03) 7 commits\n - chunked-object: streaming checkout\n - chunked-object: fallback checkout codepaths\n - bulk-checkin: support chunked-object encoding\n - bulk-checkin: allow the same data to be multiply hashed\n - new representation types in the packstream\n - packfile: use varint functions\n + varint: make it available outside the context of pack\n (this branch is tangled with jc/index-v4.)\n\nNot ready.\n\nI finished the streaming checkout codepath, but as explained in\n127b177 (bulk-checkin: support chunked-object encoding, 2011-11-30),\nthese are still early steps of a long and painful journey. At least\npack-objects and fsck need to learn the new encoding for the series\nto be usable locally, and then index-pack/unpack-objects needs to\nlearn it to be used remotely.\n\nGiven that I heard a lot of noise that people want large files, and\nthat I was asked by somebody at GitTogether'11 privately for an\nadvice on how to pay developers (not me) to help adding necessary\nsupport, I am somewhat dissapointed that the original patch series\nthat was sent almost two months ago still remains here without much\ncomments and updates from the developer community. I even made the\ninterface to the logic that decides where to split chunks easily\nreplaceable, and I deliberately made the logic in the original patch\nextremely stupid to entice others, especially the \"bup\" fanboys, to\ncome up with a better logic, thinking that giving people an easy\ntarget to shoot for, they may be encouraged to help out. The plan is\nnot working :-(.\n\n--------------------------------------------------\n[Cooking]\n\n* jm/maint-strncpy-diff-no-index (2012-04-16) 1 commit\n  (merged to 'next' on 2012-04-20 at 638ed9f)\n + diff: avoid stack-buffer-read-overrun for very long name\n\n* lp/diffstat-with-graph (2012-04-18) 6 commits\n - Prevent graph_width of stat width from falling below min\n - t4052: Test diff-stat output with minimum columns\n - t4052: Adjust --graph --stat output for prefixes\n - Adjust stat width calculations to take --graph output into account\n - Add output_prefix_length to diff_options\n - t4052: test --stat output with --graph\n\nLooked reasonable.\nWill merge to 'next'.\n\n* jc/merge-reduce-parents-early (2012-04-18) 5 commits\n - fmt-merge-msg: discard needless merge parents\n - builtin/merge.c: reduce parents early\n - builtin/merge.c: collect other parents early\n - builtin/merge.c: remove \"remoteheads\" global variable\n - merge tests: octopus with redundant parents\n (this branch is tangled with lt/octopus-simplify.)\n\nI based this and Linus's on top of the same test script, but it\nturns out that this is more correct way to deal with the issue, so\nI'll drop the other one.\n\n* rj/mingw-isguid (2012-04-18) 1 commit\n  (merged to 'next' on 2012-04-20 at 9dbebca)\n + compat/mingw.h: Set S_ISUID to prevent a fast-import test failure\n\n* rj/sh-setup-mswin-pwd (2012-04-18) 1 commit\n  (merged to 'next' on 2012-04-20 at 6125f8d)\n + git-sh-setup.sh: Add an pwd() function for MinGW\n\n* rj/submodule-mswin-path (2012-04-18) 1 commit\n  (merged to 'next' on 2012-04-20 at fd9f8b3)\n + git-submodule.sh: Don't use $path variable in eval_gettext string\n\n* lp/maint-diff-three-dash-with-graph (2012-03-20) 3 commits\n  (merged to 'next' on 2012-04-20 at b6cf0ff)\n + t4202: add test for \"log --graph --stat -p\" separator lines\n + log --graph: fix break in graph lines\n + log --graph --stat: three-dash separator should come after graph lines\n\n* cb/cherry-pick-rev-path-confusion (2012-04-15) 1 commit\n - cherry-pick: do not expect file arguments\n\nThe command line parser choked \"git cherry-pick $name\" when $name can be\nboth revision name and a pathname, even though $name can never be a path\nin the context of the command.\n\nThe issue the patch addresses is real, but the way it is implemented felt\nunnecessarily invasive a bit.  It may be cleaner for this caller to add\nthe \"--\" to the end of the argv_array it passes to setup_revisions().\n\n* cb/daemon-test-race-fix (2012-04-19) 1 commit\n - git-daemon wrapper to wait until daemon is ready\n\nFix race condition between starting and waiting for git-daemon in the\ntest.\n\nRe-queued with a fix.\n\n* cb/maint-report-mount-point-correctly-in-setup (2012-04-15) 1 commit\n - properly keep track of current working directory\n\nThe filesystem boundary was not correctly reported when .git directory\ndiscovery stopped at a mount point.\n\nWill merge to 'next'.\n\n* jl/maint-submodule-recurse-fetch (2012-04-14) 1 commit\n  (merged to 'next' on 2012-04-20 at 2769d39)\n + submodules: recursive fetch also checks new tags for submodule commits\n\n* jn/fast-import-doc (2012-04-15) 1 commit\n  (merged to 'next' on 2012-04-20 at b9a7250)\n + fast-import doc: cat-blob and ls responses need to be consumed quickly\n\n* jn/more-i18ncmp (2012-04-14) 3 commits\n  (merged to 'next' on 2012-04-20 at b5548a3)\n + test: am of empty patch should not succeed\n + test: use test_i18ncmp for \"Patch format detection failed\" message\n + test: do not rely on US English tracking-info messages\n\n* rl/maint-stash-i18n-save-error (2012-04-14) 1 commit\n - stash: use eval_gettextln correctly\n\nWill merge to 'next'.\n\n* nd/columns (2012-04-15) 9 commits\n - tag: add --column\n - column: support piping stdout to external git-column process\n - status: add --column\n - branch: add --column\n - help: reuse print_columns() for help -a\n - column: add dense layout support\n - column: add columnar layout\n - Stop starting pager recursively\n - Add column layout skeleton and git-column\n\nWill merge to 'next'.\n\n* nl/http-proxy-more (2012-04-19) 7 commits\n - http: fix proxy password passing\n - http: fix proxy authentication\n - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY\n - http: Avoid limit of retrying request only twice\n - http: handle proxy authentication failure (error 407)\n - http: handle proxy proactive authentication\n - http: try http_proxy env var when http.proxy config option is not set\n\nThe code to talk to http proxies learn to use the same credential\nAPI used to talk to the final http destinations.  This still needs\nto peek into $ENV{HTTPS_PROXY}.\n\n* mb/fetch-call-a-non-branch-a-ref (2012-04-17) 2 commits\n  (merged to 'next' on 2012-04-20 at df2c57e)\n + fetch: describe new refs based on where it came from\n + fetch: Give remote_ref to update_local_ref() as well\n\n* mh/ref-api (2012-04-10) 13 commits\n  (merged to 'next' on 2012-04-20 at 94e9384)\n + do_for_each_ref(): only iterate over the subtree that was requested\n + refs: store references hierarchically\n + sort_ref_dir(): simplify logic\n + refs.c: rename ref_array -> ref_dir\n + struct ref_entry: nest the value part in a union\n + check_refname_component(): return 0 for zero-length components\n + free_ref_entry(): new function\n + names_conflict(): simplify implementation\n + repack_without_ref(): reimplement using do_for_each_ref_in_array()\n + do_for_each_ref_in_arrays(): new function\n + do_for_each_ref_in_array(): new function\n + refs: manage current_ref within do_one_ref()\n + refs.c: reorder definitions more logically\n\nAllows walking only a sub-hierarchy in refs/*.\n\n* jc/maint-blame-minimal (2012-04-11) 1 commit\n  (merged to 'next' on 2012-04-20 at 2213284)\n + blame: accept --need-minimal\n\n\"git blame\" started missing quite a few changes from the origin since we\nstopped using the diff minimalization by default in v1.7.2 era.\n\n* jk/repack-no-explode-objects-from-old-pack (2012-04-18) 4 commits\n  (merged to 'next' on 2012-04-20 at 4eb2534)\n + gc: use argv-array for sub-commands\n + argv-array: add a new \"pushl\" method\n + argv-array: refactor empty_argv initialization\n  (merged to 'next' on 2012-04-15 at 7586e50)\n + gc: do not explode objects which will be immediately pruned\n\n* ld/git-p4-tags-and-labels (2012-04-11) 2 commits\n  (merged to 'next' on 2012-04-15 at 1b1e9a1)\n + git p4: import/export of labels to/from p4\n + git p4: Fixing script editor checks\n (this branch uses pw/git-p4.)\n\nA review from Pete Wyckoff needs to be addressed.\nMessage-ID: <20120418113422.GB19994@padd.com>\n\n* nh/empty-rebase (2012-04-20) 7 commits\n - fixup! git-rebase: add keep_empty flag\n - git-rebase: add keep_empty flag\n - fixup! git-cherry-pick: Add test to validate new options\n - git-cherry-pick: Add test to validate new options\n - fixup! git-cherry-pick: Add keep-redundant-commits option\n - git-cherry-pick: Add keep-redundant-commits option\n - git-cherry-pick: add allow-empty option\n\n* sl/test-wc-l-line-count (2012-04-11) 1 commit\n  (merged to 'next' on 2012-04-15 at 40797d9)\n + tests: modernise style: more uses of test_line_count\n\nWill merge to 'master'.\n\n* zj/upstream-error-message (2012-04-15) 5 commits\n  (merged to 'next' on 2012-04-20 at 1ed9682)\n + i18n: mark @{upstream} error messages for translation\n + Be more specific if upstream branch is not tracked\n + Provide better message for barnhc_wiht_tpyo@{u}\n + Provide branch name in error message when using @{u}\n + t1507: add tests to document @{upstream} behaviour\n\n* fc/completion-tests (2012-04-18) 7 commits\n - tests: add tests for the __gitcomp() completion helper function\n - completion: fix completion after 'git --option <TAB>'\n - completion: avoid trailing space for --exec-path\n - completion: add missing general options\n - completion: simplify by using $prev\n - completion: simplify __gitcomp_1\n - tests: add initial bash completion tests\n\nWill merge to 'next'.\n\n* jh/apply-free-patch (2012-04-11) 9 commits\n  (merged to 'next' on 2012-04-15 at 8cccf57)\n + apply: document buffer ownership rules across functions\n + apply: tighten constness of line buffer\n + apply: drop unused macro\n + apply: free unused fragments for submodule patch\n + apply: free patch->result\n + apply: release memory for fn_table\n + apply: free patch->{def,old,new}_name fields\n + apply: rename free_patch() to free_patch_list()\n + apply: do not leak patches and fragments\n\nValgrind reports quite a lot of discarded memory inside apply.\n\n* nd/threaded-index-pack (2012-04-19) 4 commits\n - index-pack: disable threading if NO_PREAD is defined\n - index-pack: support multithreaded delta resolving\n - index-pack: split second pass obj handling into own function\n - compat/win32/pthread.h: Add an pthread_key_delete() implementation\n\n* cb/http-multi-curl-auth (2012-04-14) 4 commits\n - http: use newer curl options for setting credentials\n - http: clean up leak in init_curl_http_auth\n - fix http auth with multiple curl handles\n - http auth fails with multiple curl handles\n\nFixes http authentication breakage when we keep multiple HTTP requests in\nflight using curl-multi.\n\nWill merge to 'next'.\n\n* jk/rebase-i-submodule-conflict-only (2012-04-09) 1 commit\n  (merged to 'next' on 2012-04-15 at 94367a8)\n + rebase -i continue: don't skip commits that only change submodules\n\nGiving \"--continue\" to a conflicted \"rebase -i\" session skipped a commit\nthat only results in changes to submodules.\n\nWill merge to 'master'.\n\n* ms/remote-usage-string (2012-04-09) 1 commit\n  (merged to 'next' on 2012-04-15 at 704be8f)\n + remote: update builtin usage\n\nAs an independent follow-up, we may want to rethink how the overall usage\nstring and subcommand usage strings are maintained.\n\nWill merge to 'master'.\n\n* pw/fast-import-dataref-parsing (2012-04-10) 1 commit\n  (merged to 'next' on 2012-04-20 at c299a63)\n + fast-import: tighten parsing of datarefs\n\n* pw/git-p4 (2012-04-09) 3 commits\n  (merged to 'next' on 2012-04-15 at 81ea41a)\n + git p4: use \"git p4\" directly in tests\n + git p4: update name in script\n + git-p4: move to toplevel\n (this branch is used by ld/git-p4-tags-and-labels.)\n\nWill merge to 'master'.\n\n* rl/show-empty-prefix (2012-04-10) 1 commit\n  (merged to 'next' on 2012-04-15 at b2e5938)\n + rev-parse --show-prefix: add in trailing newline\n\nWill merge to 'master'.\n\n* tr/xdiff-fast-hash (2012-04-09) 1 commit\n - xdiff: load full words in the inner loop of xdl_hash_record\n\nWill merge to 'next'.\n\n* jc/index-v4 (2012-04-04) 10 commits\n  (merged to 'next' on 2012-04-19 at 5e4b029)\n + update-index: upgrade/downgrade on-disk index version\n + read-cache.c: write prefix-compressed names in the index\n + read-cache.c: read prefix-compressed names in index on-disk version v4\n + read-cache.c: move code to copy incore to ondisk cache to a helper function\n + read-cache.c: move code to copy ondisk to incore cache to a helper function\n + read-cache.c: report the header version we do not understand\n + read-cache.c: make create_from_disk() report number of bytes it consumed\n + read-cache.c: allow unaligned mapping of the index file\n + cache.h: hide on-disk index details\n + varint: make it available outside the context of pack\n (this branch is tangled with jc/split-blob.)\n\nTrivially shrinks the on-disk size of the index file to save both I/O and\nchecksum overhead.  The \"v4\" format represented here may not be what we\neventually want to have, but the preparatory refactoring steps and the way\nhow backward compatibility is retained should give plenty to learn to GSoC\nstudent-hopefuls.\n\nThe bottom one makes use of \"varint\" encoding from the stalled\njc/split-blob topic.\n\n* mk/gitweb-diff-hl (2012-04-11) 8 commits\n  (merged to 'next' on 2012-04-20 at 54179a2)\n + gitweb: Refinement highlightning in combined diffs\n + gitweb: Highlight interesting parts of diff\n + gitweb: Push formatting diff lines to print_diff_chunk()\n + gitweb: Use print_diff_chunk() for both side-by-side and inline diffs\n + gitweb: Extract print_sidebyside_diff_lines()\n + gitweb: Pass esc_html_hl_regions() options to esc_html()\n + gitweb: esc_html_hl_regions(): Don't create empty <span> elements\n + gitweb: Use descriptive names in esc_html_hl_regions()\n\n* it/fetch-pack-many-refs (2012-04-10) 4 commits\n  (merged to 'next' on 2012-04-20 at e2126d7)\n + remote-curl: main test case for the OS command line overflow\n + fetch-pack: test cases for the new --stdin option\n + remote-curl: send the refs to fetch-pack on stdin\n + fetch-pack: new --stdin option to read refs from stdin\n\n* jn/debian-customizes-default-editor (2012-04-10) 2 commits\n  (merged to 'next' on 2012-04-15 at 0fc85c3)\n + var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings\n + var doc: default editor and pager are configurable at build time\n\nWill merge to 'master'.\n\n* rs/commit-list-sort-in-batch (2012-04-17) 4 commits\n  (merged to 'next' on 2012-04-17 at 21208e9)\n + mergesort: rename it to llist_mergesort()\n  (merged to 'next' on 2012-04-15 at 39fe527)\n + revision: insert unsorted, then sort in prepare_revision_walk()\n + commit: use mergesort() in commit_list_sort_by_date()\n + add mergesort() for linked lists\n\n* hv/submodule-recurse-push (2012-03-30) 3 commits\n  (merged to 'next' on 2012-04-20 at fe99e3d)\n + push: teach --recurse-submodules the on-demand option\n + Refactor submodule push check to use string list instead of integer\n + Teach revision walking machinery to walk multiple times sequencially\n\n* th/difftool-diffall (2012-04-14) 8 commits\n - difftool: print list of valid tools with '--tool-help'\n - difftool: teach difftool to handle directory diffs\n - difftool: eliminate setup_environment function\n - difftool: stop appending '.exe' to git\n - difftool: remove explicit change of PATH\n - difftool: exit(0) when usage is printed\n - difftool: add '--no-gui' option\n - difftool: parse options using Getopt::Long\n\nRolls the two-directory-diff logic from diffall script (in contrib/) into\n\"git difftool\" framework. \n\nStill being reworked.\n\n* jc/run-hook-env-1 (2012-03-11) 1 commit\n - run_hook(): enhance the interface to pass arbitrary environment\n\nNot urgent.\n\nUpdates run_hook() API to be much less specific to \"commit\".  It would\nonly be useful if people start doing more interesting things with hooks.\n\n* mm/push-default-switch-warning (2012-04-20) 4 commits\n - push: start warning upcoming default change for push.default\n - t5570: use explicit push refspec\n - push: introduce new push.default mode \"simple\"\n - Documentation: explain push.default option a bit more\n\nThis resurrects an ancient patch I wrote during a discussion we had in the\n1.6.3-1.6.4 era.  This should probably come after ct/advise-push-default\ntopic and at that point the advise messages need to be rephrased, taking\nthe future default change into account.\n\n--------------------------------------------------\n[Discarded]\n\n* cn/apply-fix-ws-can-lengthen-lines (2012-03-11) 1 commit\n . apply: reallocate the postimage buffer when needed\n\nAttempts to address an ancient bug that dates back to the addition\nof an oddball \"tab-in-indent\" whitespace breakage class that wants\nto have longer lines than the original when fixing things up; broken\nand results in double-frees.\n\n* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits\n . fixup! 15eaaf4\n . git-svn, perl/Git.pm: extend Git::prompt helper for querying users\n . perl/Git.pm: \"prompt\" helper to honor GIT_ASKPASS and SSH_ASKPASS\n\nHas been stalled for too long.\n\n* lt/octopus-simplify (2012-04-17) 3 commits\n . git-merge: Reduce heads before trying to merge them\n . Make 'git merge' simplify parents earlier\n - merge tests: octopus with redundant parents\n (this branch is tangled with jc/merge-reduce-parents-early.)\n\nOctopus merge strategy did not reduce heads that are recorded in the final\ncommit, but follow-up broke badly.\n"},{"id":"189803","messageId":"20120421102335.GA29660@goldbirke","threadId":"30299","inReplyTo":"xmqqobqmkkxv.fsf@junio.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Apr 2012, #08; Fri, 20)","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2012-04-21T10:23:35Z","receivedAt":"2012-04-21T10:23:35Z","isPatch":false,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"Hi,\n\nOn Fri, Apr 20, 2012 at 05:06:20PM -0700, Junio C Hamano wrote:\n> * fc/completion-tests (2012-04-18) 7 commits\n>  - tests: add tests for the __gitcomp() completion helper function\n>  - completion: fix completion after 'git --option <TAB>'\n>  - completion: avoid trailing space for --exec-path\n>  - completion: add missing general options\n>  - completion: simplify by using $prev\n>  - completion: simplify __gitcomp_1\n>  - tests: add initial bash completion tests\n\nPerhaps you could move 'tests: add tests for the __gitcomp()\ncompletion helper function' from the top after 'tests: add initial\nbash completion tests', to show that Felipe's 'completion: simplify\n__gitcomp_1' doesn't break any of the tests.\n\n\nBest,\nGábor\n"},{"id":"189830","messageId":"xmqq8vhomj7w.fsf@junio.mtv.corp.google.com","threadId":"30299","inReplyTo":"20120421102335.GA29660@goldbirke","subject":"Re: What's cooking in git.git (Apr 2012, #08; Fri, 20)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-04-22T05:25:07Z","receivedAt":"2012-04-22T05:25:07Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"SZEDER Gábor <szeder@ira.uka.de> writes:\n\n> On Fri, Apr 20, 2012 at 05:06:20PM -0700, Junio C Hamano wrote:\n>> * fc/completion-tests (2012-04-18) 7 commits\n>>  - tests: add tests for the __gitcomp() completion helper function\n>>  - completion: fix completion after 'git --option <TAB>'\n>>  - completion: avoid trailing space for --exec-path\n>>  - completion: add missing general options\n>>  - completion: simplify by using $prev\n>>  - completion: simplify __gitcomp_1\n>>  - tests: add initial bash completion tests\n>\n> Perhaps you could move 'tests: add tests for the __gitcomp()\n> completion helper function' from the top after 'tests: add initial\n> bash completion tests', to show that Felipe's 'completion: simplify\n> __gitcomp_1' doesn't break any of the tests.\n\nI don't mind.  Felipe, what do you think?\n"},{"id":"189834","messageId":"CAMP44s3yy9yQ+KDtcit2RQeCs1GXx3G4F=FZJ36Jt5jgO8ZsgQ@mail.gmail.com","threadId":"30299","inReplyTo":"xmqq8vhomj7w.fsf@junio.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Apr 2012, #08; Fri, 20)","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2012-04-22T15:05:42Z","receivedAt":"2012-04-22T15:05:42Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Sun, Apr 22, 2012 at 8:25 AM, Junio C Hamano <gitster@pobox.com> wrote:\n> SZEDER Gábor <szeder@ira.uka.de> writes:\n>\n>> On Fri, Apr 20, 2012 at 05:06:20PM -0700, Junio C Hamano wrote:\n>>> * fc/completion-tests (2012-04-18) 7 commits\n>>>  - tests: add tests for the __gitcomp() completion helper function\n>>>  - completion: fix completion after 'git --option <TAB>'\n>>>  - completion: avoid trailing space for --exec-path\n>>>  - completion: add missing general options\n>>>  - completion: simplify by using $prev\n>>>  - completion: simplify __gitcomp_1\n>>>  - tests: add initial bash completion tests\n>>\n>> Perhaps you could move 'tests: add tests for the __gitcomp()\n>> completion helper function' from the top after 'tests: add initial\n>> bash completion tests', to show that Felipe's 'completion: simplify\n>> __gitcomp_1' doesn't break any of the tests.\n>\n> I don't mind.  Felipe, what do you think?\n\nFine by me.\n\n-- \nFelipe Contreras\n"},{"id":"189835","messageId":"4F941EA3.7080200@kdbg.org","threadId":"30299","inReplyTo":"xmqqobqmkkxv.fsf@junio.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Apr 2012, #08; Fri, 20)","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2012-04-22T15:07:15Z","receivedAt":"2012-04-22T15:07:15Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 21.04.2012 02:06, schrieb Junio C Hamano:\n> * th/difftool-diffall (2012-04-14) 8 commits\n>   - difftool: print list of valid tools with '--tool-help'\n>   - difftool: teach difftool to handle directory diffs\n>   - difftool: eliminate setup_environment function\n>   - difftool: stop appending '.exe' to git\n>   - difftool: remove explicit change of PATH\n>   - difftool: exit(0) when usage is printed\n>   - difftool: add '--no-gui' option\n>   - difftool: parse options using Getopt::Long\n> \n> Rolls the two-directory-diff logic from diffall script (in contrib/) into\n> \"git difftool\" framework.\n\nThis does not pass test 33 (the last one) on Windows:\n\n+++ git difftool --dir-diff --extcmd ls branch\nUse of uninitialized value in length at d:/Src/mingw-git/git-difftool line 55.\nUse of uninitialized value in length at d:/Src/mingw-git/git-difftool line 55.\nexiting now at d:/Src/mingw-git/git-difftool line 120.\nusage: git diff [--no-index] <path> <path>\ndiff --raw --no-abbrev -z branch: command returned error: 129\n\n(\"exiting now\" is a debugging \"warn\" call that I inserted)\n\nI don't know what's going on. One possibility is that an old Git.pm is\nbeing used, because I haven't 'make install' yet.\n\nI'm not going to look into this, but I can run tests if you tell me what\nto do.\n\n-- Hannes\n"},{"id":"190070","messageId":"CAFouetg1L3qsUQfNNnNKE43AkKGBQcypTw=w8dZKRJBM7LkQoA@mail.gmail.com","threadId":"30299","inReplyTo":"4F941EA3.7080200@kdbg.org","subject":"Re: What's cooking in git.git (Apr 2012, #08; Fri, 20)","fromName":"Tim Henigan","fromEmail":"tim.henigan@gmail.com","sentAt":"2012-04-25T18:14:32Z","receivedAt":"2012-04-25T18:14:32Z","isPatch":false,"sender":{"key":"tim.henigan@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42022?v=4"},"body":"On Sun, Apr 22, 2012 at 11:07 AM, Johannes Sixt <j6t@kdbg.org> wrote:\n> Am 21.04.2012 02:06, schrieb Junio C Hamano:\n>> * th/difftool-diffall (2012-04-14) 8 commits\n>>   - difftool: print list of valid tools with '--tool-help'\n>>   - difftool: teach difftool to handle directory diffs\n>>   - difftool: eliminate setup_environment function\n>>   - difftool: stop appending '.exe' to git\n>>   - difftool: remove explicit change of PATH\n>>   - difftool: exit(0) when usage is printed\n>>   - difftool: add '--no-gui' option\n>>   - difftool: parse options using Getopt::Long\n>>\n>> Rolls the two-directory-diff logic from diffall script (in contrib/) into\n>> \"git difftool\" framework.\n>\n> This does not pass test 33 (the last one) on Windows:\n\nI now have a working test environment using msysgit on Windows 7\n32-bit.  I updated to the tip of 'pu' (on my clone this is commit\n5224ba8) and was able to run all 33 tests in t7800 without error.\n\n\n> +++ git difftool --dir-diff --extcmd ls branch\n> Use of uninitialized value in length at d:/Src/mingw-git/git-difftool line 55.\n> Use of uninitialized value in length at d:/Src/mingw-git/git-difftool line 55.\n\nThe above 2 warnings were fixed in a later version of patch series.\n\n\n> exiting now at d:/Src/mingw-git/git-difftool line 120.\n> usage: git diff [--no-index] <path> <path>\n> diff --raw --no-abbrev -z branch: command returned error: 129\n>\n> (\"exiting now\" is a debugging \"warn\" call that I inserted)\n>\n> I don't know what's going on. One possibility is that an old Git.pm is\n> being used, because I haven't 'make install' yet.\n>\n> I'm not going to look into this, but I can run tests if you tell me what\n> to do.\n\nI have run into issues in the past on Linux where testing without\nrunning 'make install' causes trouble, but never had time to track it\ndown.\n\nWould it be possible for you to update to the latest tip of 'pu' and\nthen 'make install && (cd t && sh t7800-difftool.sh)'?\n"},{"id":"190099","messageId":"4F98EBC5.9020008@kdbg.org","threadId":"30299","inReplyTo":"CAFouetg1L3qsUQfNNnNKE43AkKGBQcypTw=w8dZKRJBM7LkQoA@mail.gmail.com","subject":"Re: What's cooking in git.git (Apr 2012, #08; Fri, 20)","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2012-04-26T06:31:33Z","receivedAt":"2012-04-26T06:31:33Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 25.04.2012 20:14, schrieb Tim Henigan:\n> I now have a working test environment using msysgit on Windows 7\n> 32-bit.  I updated to the tip of 'pu' (on my clone this is commit\n> 5224ba8) and was able to run all 33 tests in t7800 without error.\n\npu passes for me as well, but I'm carrying around this change\n\n-                       $opts{Repository} = abs_path($dir);\n+                       $opts{Repository} = $dir;\n\nin my local git repository. No surprise that \"difftool --dir-diff from \nsubdirectory\" fails with this patch.\n\nSo, all is well, and sorry for the noise and confusion.\n\n-- Hannes\n"}]}