{"thread":{"id":"12603","subject":"What's cooking in git.git (topics)","startedAt":"2008-03-09T10:46:24Z","lastAt":"2010-12-14T14:21:55Z","messageCount":368,"participants":["Junio C Hamano","Johannes Schindelin","Samuel Tardieu","Steffen Prohaska","Govind Salinas","Kristian Høgsberg","Jeff King","Lars Hjemli","Brandon Casey","Ping Yin","Josef Weidendorfer","Michele Ballabio","Fedor Sergeev","Robin Rosenberg","Daniel Barkalow","Stephan Beyer","Jon Loeliger","Steven Grimm","Jakub Narebski","Sebastian Bober","Shawn O. Pearce","Johan Herland","Miklos Vajna","Pieter de Bie","しらいしななこ","Theodore Tso","Tommi Virtanen","Olivier Marin","Linus Torvalds","Johannes Sixt","Andrew Morton","Petr Baudis","Clifford Caoile","Stephen Rothwell","Thomas Rast","Marius Storm-Olsen","Nanako Shiraishi","Peter Harris","Abhijit Menon-Sen","Edward Z. Yang"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"71506","messageId":"7vlk4snpj3.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":null,"subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-03-09T10:46:24Z","receivedAt":"2008-03-09T10:46:24Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\n----------------------------------------------------------------\n[New Topics]\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n\n----------------------------------------------------------------\n[Graduated to 'master']\n\n* dp/clean-fix (Fri Mar 7 21:56:56 2008 -0800) 7 commits\n + git-clean: add tests for relative path\n + git-clean: correct printing relative path\n + Make private quote_path() in wt-status.c available as\n quote_path_relative()\n + Revert part of d089eba (setup: sanitize absolute and funny paths\n in get_pathspec())\n + Revert part of 1abf095 (git-add: adjust to the get_pathspec()\n changes)\n + Revert part of 744dacd (builtin-mv: minimum fix to avoid losing\n files)\n + get_pathspec(): die when an out-of-tree path is given\n\n* sp/fetch-optim (Mon Mar 3 22:27:40 2008 -0500) 11 commits\n + Teach git-fetch to exploit server side automatic tag following\n + Teach fetch-pack/upload-pack about --include-tag\n + git-pack-objects: Automatically pack annotated tags if object was\n packed\n + Teach git-fetch to grab a tag at the same time as a commit\n + Make git-fetch follow tags we already have objects for sooner\n + Teach upload-pack to log the received need lines to an fd\n + Free the path_lists used to find non-local tags in git-fetch\n + Allow builtin-fetch's find_non_local_tags to append onto a list\n + Ensure tail pointer gets setup correctly when we fetch HEAD only\n + Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch\n + Remove unused variable in builtin-fetch find_non_local_tags\n\n* ml/submodule-add-existing (Tue Mar 4 20:15:02 2008 -0500) 1 commit\n + git-submodule - Allow adding a submodule in-place\n\n* jc/describe-always (Sun Mar 2 08:51:57 2008 -0800) 1 commit\n + describe --always: fall back to showing an abbreviated object name\n\n* aw/maint-shortlog-blank-lines (Wed Mar 5 14:24:10 2008 +0000) 1 commit\n + shortlog: take the first populated line of the description\n\n* jn/gitweb-pickaxe (Wed Mar 5 09:31:55 2008 +0100) 1 commit\n + gitweb: Fix and simplify pickaxe search\n\n* cr/reset-parseopt (Tue Mar 4 23:11:34 2008 +0100) 1 commit\n + Make builtin-reset.c use parse_options.\n\n* mr/compat-snprintf (Wed Mar 5 16:46:13 2008 +0100) 1 commit\n + Add compat/snprintf.c for systems that return bogus\n\n* jc/am (Tue Mar 4 00:25:06 2008 -0800) 3 commits\n + am: --rebasing\n + am: remove support for -d .dotest\n + am: read from the right mailbox when started from a subdirectory\n\n* ph/parseopt (Sun Mar 2 11:35:56 2008 +0100) 2 commits\n + parse-options: new option type to treat an option-like parameter\n as an argument.\n + parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --\n parseopt\n\n----------------------------------------------------------------\n[Actively Cooking]\n\n* lt/unpack-trees (Fri Mar 7 13:48:40 2008 -0800) 10 commits\n + unpack_trees(): minor memory leak fix in unused destination index\n + Make 'unpack_trees()' have a separate source and destination index\n + Make 'unpack_trees()' take the index to work on as an argument\n + Add 'const' where appropriate to index handling functions\n + Fix tree-walking compare_entry() in the presense of --prefix\n + Move 'unpack_trees()' over to 'traverse_trees()' interface\n + Make 'traverse_trees()' traverse conflicting DF entries in\n parallel\n + Add return value to 'traverse_tree()' callback\n + Make 'traverse_tree()' use linked structure rather than 'const\n char *base'\n + Add 'df_name_compare()' helper function\n\n* js/remote (Sat Mar 8 23:40:42 2008 +0100) 8 commits\n + builtin remote rm: remove symbolic refs, too\n + remote: fix \"update [group...]\"\n + remote show: Clean up connection correctly if object fetch wasn't\n done\n + builtin-remote: prune remotes correctly that were added with --\n mirror\n + Make git-remote a builtin\n + Test \"git remote show\" and \"git remote prune\"\n + parseopt: add flag to stop on first non option\n + path-list: add functions to work with unsorted lists\n\nSlated for 1.5.5, but probably needs more time to mature.\n\n* jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits\n + t5300: add test for \"index-pack --strict\"\n + receive-pack: allow using --strict mode for unpacking objects\n + unpack-objects: fix --strict handling\n + t5300: add test for \"unpack-objects --strict\"\n + unpack-objects: prevent writing of inconsistent objects\n\nThis would re-instate the \"unpack-objects --strict\" but we probably should\nnot do this before 1.5.5.\n\n* py/submodule (Sat Mar 8 02:27:19 2008 +0800) 4 commits\n - git-submodule summary: documentation\n - git-submodule summary: limit summary size\n - git-submodule summary: show commit summary\n - git-submodule summary: code framework\n\nLooking better. With tests it should be mergeable to 'next'.\n\n----------------------------------------------------------------\n[On Hold]\n\n* nd/worktree (Sun Mar 2 17:35:43 2008 +0700) 10 commits\n - Additional tests to capture worktree special cases\n - Documentation: update api-builtin and api-setup\n - Make setup_git_directory() auto-setup worktree if found\n - builtin-archive: mark unused prefix \"unused_prefix\"\n - Completely move out worktree setup from\n setup_git_directory_gently()\n - http-push: Avoid calling setup_git_directory() twice\n - Make setup_work_tree() return new prefix\n - Make get_git_dir() and 'git rev-parse --git-dir' absolute path\n - Make sure setup_git_directory is called before accessing\n repository\n - \"git read-tree -m\" and the like require worktree\n\nEvery time we touch work-tree stuff we seem to unstabilize; this round\nseems more solid but I am still treading cautiously. Not sure if we want\nthis for 1.5.5.\n\n* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits\n - tests: convert \"cmp\" and \"cmp -s\" to test_cmp\n - tests: test_cmp helper function\n\n* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits\n - diffcore-rename: make file_table available outside exact rename\n detection\n + Optimize rename detection for a huge diff\n\n* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit\n - diff: make --dirstat binary-file safe\n\n* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits\n - Teach GIT-VERSION-GEN about the .git file\n - Teach git-submodule.sh about the .git file\n - Teach resolve_gitlink_ref() about the .git file\n - Add platform-independent .git \"symlink\"\n\nThe idea and the implementation seem Ok, but this leaves\ndistinct feeling that it is a solution still waiting for a user\n(e.g. \"git submodule\" enhancements to take advantage of this\nfacility to preserve the subrepository while switching between a\nrevision with a submodule and another before the submodule was\nbound to the superproject).\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0. I am not sure if we should merge this to\n'next' before 1.5.5. Most active people will be on 'next' and\nif we have this there, the resulting 1.5.5 release might end up\nhaving issues that come from differences this one introduces.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits\n - sha1-lookup: make selection of 'middle' less aggressive\n - sha1-lookup: more memory efficient search in sorted list of SHA-1\n\nMicro-optimization whose real world benefit is not proven.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 5 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n + expose a helper function peel_to_type().\n + merge-recursive: split low-level merge functions out.\n\nThis is meant to improve cherry-pick's behaviour by not using\nmerge-recursive, but unfortunately has stalled for some time now.\n"},{"id":"71792","messageId":"7vwso85qkf.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vlk4snpj3.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-03-12T07:50:24Z","receivedAt":"2008-03-12T07:50:24Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\n----------------------------------------------------------------\n[New Topics]\n\n* cc/help (Tue Mar 11 08:51:12 2008 +0100) 3 commits\n + help: implement multi-valued \"man.viewer\" config option\n + Documentation: help: describe 'man.viewer' config variable\n + help: add \"man.viewer\" config var to use \"woman\" or \"konqueror\"\n\n* ph/maint-quiltimport (Sat Mar 8 19:27:09 2008 +0100) 1 commit\n + git-quiltimport: better parser to grok \"enhanced\" series files.\n\n* mr/autoconf-fread (Tue Mar 11 09:48:34 2008 +0100) 1 commit\n + autoconf: Test FREAD_READS_DIRECTORIES\n\n* db/diff-to-fp (Mon Mar 10 13:58:26 2008 -0400) 2 commits\n - wt-status.c: no need for dup() dance anymore\n - Write diff output to a file in struct diff_options\n\nAll of these can be in 1.5.5 (they may or may not need fix-ups); let's\nclose the 1.5.5 merge window now with these.\n\n----------------------------------------------------------------\n[Graduated to 'master']\n\n* lt/unpack-trees (Fri Mar 7 13:48:40 2008 -0800) 10 commits\n + unpack_trees(): minor memory leak fix in unused destination index\n + Make 'unpack_trees()' have a separate source and destination index\n + Make 'unpack_trees()' take the index to work on as an argument\n + Add 'const' where appropriate to index handling functions\n + Fix tree-walking compare_entry() in the presense of --prefix\n + Move 'unpack_trees()' over to 'traverse_trees()' interface\n + Make 'traverse_trees()' traverse conflicting DF entries in\n parallel\n + Add return value to 'traverse_tree()' callback\n + Make 'traverse_tree()' use linked structure rather than 'const\n char *base'\n + Add 'df_name_compare()' helper function\n\n* js/remote (Sat Mar 8 23:40:42 2008 +0100) 9 commits\n + \"remote update\": print remote name being fetched from\n + builtin remote rm: remove symbolic refs, too\n + remote: fix \"update [group...]\"\n + remote show: Clean up connection correctly if object fetch wasn't\n done\n + builtin-remote: prune remotes correctly that were added with --\n mirror\n + Make git-remote a builtin\n + Test \"git remote show\" and \"git remote prune\"\n + parseopt: add flag to stop on first non option\n + path-list: add functions to work with unsorted lists\n\n----------------------------------------------------------------\n[Actively Cooking]\n\n* py/submodule (Tue Mar 11 21:52:19 2008 +0800) 5 commits\n + git-submodule summary: test\n + git-submodule summary: documentation\n + git-submodule summary: limit summary size\n + git-submodule summary: show commit summary\n + git-submodule summary: code framework\n\nI didn't see anybody very supportive for this series, but I do not think\nthis regresses existing other subcommands to \"git submodule\", so let's\nmerge this to 'master' before 1.5.5 and see how useful submodule users\nfind this.\n\n----------------------------------------------------------------\n[On Hold]\n\n* nd/worktree (Sun Mar 2 17:35:43 2008 +0700) 10 commits\n - Additional tests to capture worktree special cases\n - Documentation: update api-builtin and api-setup\n - Make setup_git_directory() auto-setup worktree if found\n - builtin-archive: mark unused prefix \"unused_prefix\"\n - Completely move out worktree setup from\n setup_git_directory_gently()\n - http-push: Avoid calling setup_git_directory() twice\n - Make setup_work_tree() return new prefix\n - Make get_git_dir() and 'git rev-parse --git-dir' absolute path\n - Make sure setup_git_directory is called before accessing\n repository\n - \"git read-tree -m\" and the like require worktree\n\nEvery time we touch work-tree stuff we seem to unstabilize; this round\nseems more solid but I am still treading cautiously. Not sure if we want\nthis for 1.5.5.\n\n* jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits\n + t5300: add test for \"index-pack --strict\"\n + receive-pack: allow using --strict mode for unpacking objects\n + unpack-objects: fix --strict handling\n + t5300: add test for \"unpack-objects --strict\"\n + unpack-objects: prevent writing of inconsistent objects\n\nThis would re-instate the \"unpack-objects --strict\" but we probably should\nnot do this before 1.5.5.\n\n* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits\n - tests: convert \"cmp\" and \"cmp -s\" to test_cmp\n - tests: test_cmp helper function\n\n* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits\n - diffcore-rename: make file_table available outside exact rename\n detection\n + Optimize rename detection for a huge diff\n\n* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit\n - diff: make --dirstat binary-file safe\n\n* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits\n - Teach GIT-VERSION-GEN about the .git file\n - Teach git-submodule.sh about the .git file\n - Teach resolve_gitlink_ref() about the .git file\n - Add platform-independent .git \"symlink\"\n\nThe idea and the implementation seem Ok, but this leaves\ndistinct feeling that it is a solution still waiting for a user\n(e.g. \"git submodule\" enhancements to take advantage of this\nfacility to preserve the subrepository while switching between a\nrevision with a submodule and another before the submodule was\nbound to the superproject).\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0. I am not sure if we should merge this to\n'next' before 1.5.5. Most active people will be on 'next' and\nif we have this there, the resulting 1.5.5 release might end up\nhaving issues that come from differences this one introduces.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits\n - sha1-lookup: make selection of 'middle' less aggressive\n - sha1-lookup: more memory efficient search in sorted list of SHA-1\n\nMicro-optimization whose real world benefit is not proven.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour by not using\nmerge-recursive, but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"71802","messageId":"alpine.LSU.1.00.0803121316360.1656@racer.site","threadId":"12603","inReplyTo":"7vwso85qkf.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-03-12T12:18:50Z","receivedAt":"2008-03-12T12:18:50Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 12 Mar 2008, Junio C Hamano wrote:\n\n> * nd/worktree (Sun Mar 2 17:35:43 2008 +0700) 10 commits\n> - Additional tests to capture worktree special cases\n> - Documentation: update api-builtin and api-setup\n> - Make setup_git_directory() auto-setup worktree if found\n> - builtin-archive: mark unused prefix \"unused_prefix\"\n> - Completely move out worktree setup from\n> setup_git_directory_gently()\n> - http-push: Avoid calling setup_git_directory() twice\n> - Make setup_work_tree() return new prefix\n> - Make get_git_dir() and 'git rev-parse --git-dir' absolute path\n> - Make sure setup_git_directory is called before accessing\n> repository\n> - \"git read-tree -m\" and the like require worktree\n> \n> Every time we touch work-tree stuff we seem to unstabilize; this round \n> seems more solid but I am still treading cautiously. Not sure if we \n> want this for 1.5.5.\n\nI am sure we do not want this for 1.5.5.\n\nIt is too complicated a patch series to be obviously correct, and as I \nsaid earlier, a few design goals are not to my liking, such as trying to \nseparate git_dir from work_tree logic with a sledgehammer.\n\nCiao,\nDscho\n"},{"id":"72049","messageId":"7vwso5r87q.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vwso85qkf.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-03-14T09:00:25Z","receivedAt":"2008-03-14T09:00:25Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nThe merge window for 1.5.5 is closed as of tonight, except for the\npromised git-gui (0.10) and gitk updates, and topics still cooking in\n'next', and 1.5.5-rc0 will be tagged shortly.\n\nAfter that we will have quite a lot of regression fixes ahead of us, I am\nafraid. Since v1.5.4, a few commands have been reimplemented or made\nbuilt-ins (checkout, remote, merge-recursive), and these inevitably\ninvolve \"growing pains\".\n\nWhile I am reasonably confident that we have long caught showstopper\nregressions in key features of these commands while they were cooking in\n'next', I am sure there would remain regressions here and there in the\nperiphery. It is unavoidable. POSIX-only people may say \"why rewrite, if\nit involves this much pain\", but like it or not, there are people stuck on\nunfortunate platforms that cannot run scripted versions well enough.\n\nLet's see if our regular contributors are as good at fixing their own\nscrew-ups as they are good at coming up with new code, and hope that we\ncan keep this rc cycle manageably short. Touch wood...\n\n----------------------------------------------------------------\n[New Topics]\n\n* jc/makefile (Wed Mar 12 01:46:26 2008 -0700) 2 commits\n - Makefile: flatten enumeration of headers, objects and programs\n - Makefile: DIFF_OBJS is not special at all these days\n\nI promised to do this immediately after -rc0, so this will shortly be in\n'next' and then in 'master'.\n\n* jk/portable (Wed Mar 12 17:42:43 2008 -0400) 13 commits\n + t7505: use SHELL_PATH in hook\n + t9112: add missing #!/bin/sh header\n + filter-branch: use $SHELL_PATH instead of 'sh'\n + filter-branch: don't use xargs -0\n + add NO_EXTERNAL_GREP build option\n + t6000lib: tr portability fix\n + t4020: don't use grep -a\n + add test_cmp function for test scripts\n + remove use of \"tail -n 1\" and \"tail -1\"\n + grep portability fix: don't use \"-e\" or \"-q\"\n + more tr portability test script fixes\n + t0050: perl portability fix\n + tr portability fixes\n\nInitially triggered by Solaris porting effort but these are harmless\nportability changes. Perhaps in 1.5.5, perhaps immediately after that.\n\n----------------------------------------------------------------\n[Dropped]\n\n* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits\n . tests: convert \"cmp\" and \"cmp -s\" to test_cmp\n . tests: test_cmp helper function\n\nThis one may be more elaborate, but Jeff's patch is much simpler.\n\n----------------------------------------------------------------\n[Graduated to 'master']\n\n* ph/maint-quiltimport (Wed Mar 12 21:07:19 2008 -0700) 2 commits\n + quiltimport: fix misquoting of parsed -p parameter\n + git-quiltimport: better parser to grok \"enhanced\" series files.\n\n* mr/autoconf-fread (Tue Mar 11 09:48:34 2008 +0100) 1 commit\n + autoconf: Test FREAD_READS_DIRECTORIES\n\n----------------------------------------------------------------\n[Actively Cooking]\n\n* cc/help (Thu Mar 13 19:15:30 2008 -0700) 6 commits\n + Documentation/git-help: typofix\n + help: warn if specified 'man.viewer' is unsupported, instead of\n erroring out\n + Documentation: help: explain 'man.viewer' multiple values\n + help: implement multi-valued \"man.viewer\" config option\n + Documentation: help: describe 'man.viewer' config variable\n + help: add \"man.viewer\" config var to use \"woman\" or \"konqueror\"\n\n* db/diff-to-fp (Mon Mar 10 13:58:26 2008 -0400) 2 commits\n + wt-status.c: no need for dup() dance anymore\n + Write diff output to a file in struct diff_options\n\n* py/submodule (Wed Mar 12 09:30:01 2008 +0100) 6 commits\n + git-submodule summary: fix that some \"wc\" flavors produce leading\n spaces\n + git-submodule summary: test\n + git-submodule summary: documentation\n + git-submodule summary: limit summary size\n + git-submodule summary: show commit summary\n + git-submodule summary: code framework\n\nI didn't see anybody very supportive for this series, but I do not think\nthis regresses existing other subcommands to \"git submodule\", so let's\nmerge this to 'master' before 1.5.5 and see how useful submodule users\nfind this.\n\n----------------------------------------------------------------\n[On Hold]\n\n* nd/worktree (Sun Mar 2 17:35:43 2008 +0700) 10 commits\n - Additional tests to capture worktree special cases\n - Documentation: update api-builtin and api-setup\n - Make setup_git_directory() auto-setup worktree if found\n - builtin-archive: mark unused prefix \"unused_prefix\"\n - Completely move out worktree setup from\n setup_git_directory_gently()\n - http-push: Avoid calling setup_git_directory() twice\n - Make setup_work_tree() return new prefix\n - Make get_git_dir() and 'git rev-parse --git-dir' absolute path\n - Make sure setup_git_directory is called before accessing\n repository\n - \"git read-tree -m\" and the like require worktree\n\nEvery time we touch work-tree stuff we seem to unstabilize; this round\nseems more solid but I am still treading cautiously. Not sure if we want\nthis for 1.5.5.\n\n* jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits\n + t5300: add test for \"index-pack --strict\"\n + receive-pack: allow using --strict mode for unpacking objects\n + unpack-objects: fix --strict handling\n + t5300: add test for \"unpack-objects --strict\"\n + unpack-objects: prevent writing of inconsistent objects\n\nThis would re-instate the \"unpack-objects --strict\" but we probably should\nnot do this before 1.5.5.\n\n* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits\n - diffcore-rename: make file_table available outside exact rename\n detection\n + Optimize rename detection for a huge diff\n\n* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit\n - diff: make --dirstat binary-file safe\n\n* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits\n - Teach GIT-VERSION-GEN about the .git file\n - Teach git-submodule.sh about the .git file\n - Teach resolve_gitlink_ref() about the .git file\n - Add platform-independent .git \"symlink\"\n\nThe idea and the implementation seem Ok, but this leaves\ndistinct feeling that it is a solution still waiting for a user\n(e.g. \"git submodule\" enhancements to take advantage of this\nfacility to preserve the subrepository while switching between a\nrevision with a submodule and another before the submodule was\nbound to the superproject).\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0. I am not sure if we should merge this to\n'next' before 1.5.5. Most active people will be on 'next' and\nif we have this there, the resulting 1.5.5 release might end up\nhaving issues that come from differences this one introduces.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits\n - sha1-lookup: make selection of 'middle' less aggressive\n - sha1-lookup: more memory efficient search in sorted list of SHA-1\n\nMicro-optimization whose real world benefit is not proven.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour by not using\nmerge-recursive, but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"72730","messageId":"7v8x0992hy.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vwso5r87q.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-03-23T10:08:25Z","receivedAt":"2008-03-23T10:08:25Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nSince we tagged -rc0, we've seen regression fixes at a reasonable rate.\nAt -rc1 tonight, I think we are fairly in good shape.\n\n----------------------------------------------------------------\n[New Topics]\n\n* fl/send-email-outside (Fri Mar 14 18:29:30 2008 +0100) 4 commits\n + send-email: Don't require to be called in a repository\n + Git.pm: Don't require repository instance for ident\n + Git.pm: Don't require a repository instance for config\n + var: Don't require to be in a git repository.\n\nPeople couldn't invoke \"git send-email\" from outside their repositories,\nbut this series allows them to. I do not think it is urgent, though.\nThis does not look risky, even though it touches Git.pm that is shared\nwith other things. This has been cooking in 'next' for some time and we\nhaven't heard about breakages caused by this. Will probably be the first\nthing to be merged in 'master' post 1.5.5.\n\n* jc/rebase (Sat Mar 15 13:17:42 2008 -0700) 1 commit\n + rebase [--onto O] A B: omit needless checkout\n\nWe used to \"git checkout B && git rebase A\" internally to implement this,\nwhich meant the work tree was smudged one time too many. This is probably\na safe optimization, but it case after -rc0 and is not really a must-have\nfix. One of the first after post 1.5.5.\n\n* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits\n - Make git-add behave more sensibly in a case-insensitive\n environment\n - When adding files to the index, add support for case-independent\n matches\n - Make unpack-tree update removed files before any updated files\n - Make branch merging aware of underlying case-insensitive\n filsystems\n - Add 'core.ignorecase' option\n - Make hash_name_lookup able to do case-independent lookups\n - Make \"index_name_exists()\" return the cache_entry it found\n - Move name hashing functions into a file of its own\n - Make unpack_trees_options bit flags actual bitfields\n\nThe beginning of ASCII-only case insensitive filesystem support. It is\nnot complete yet, though. E.g. if you enable core.ignorecase in t0050,\nthe merge test fails.\n\n* gs/pretty-hexval (Fri Mar 21 10:05:06 2008 -0500) 1 commit\n + pretty.c: add %x00 format specifier.\n\nAdds a generic \"insert any byte value\" to --pretty=format:<> specifier.\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n - \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this, but because I have met no real user with shared repository\nworkflow who complained on this issue, I think this is not urgent.\n\n----------------------------------------------------------------\n[Graduated to 'master']\n\n* cc/help (Thu Mar 13 19:15:30 2008 -0700) 6 commits\n + Documentation/git-help: typofix\n + help: warn if specified 'man.viewer' is unsupported, instead of\n erroring out\n + Documentation: help: explain 'man.viewer' multiple values\n + help: implement multi-valued \"man.viewer\" config option\n + Documentation: help: describe 'man.viewer' config variable\n + help: add \"man.viewer\" config var to use \"woman\" or \"konqueror\"\n\nThere are some leftover bits posted after -rc0, but I think they can\nwait.\n\n* db/diff-to-fp (Mon Mar 10 13:58:26 2008 -0400) 2 commits\n + wt-status.c: no need for dup() dance anymore\n + Write diff output to a file in struct diff_options\n\n* py/submodule (Wed Mar 12 09:30:01 2008 +0100) 6 commits\n + git-submodule summary: fix that some \"wc\" flavors produce leading\n spaces\n + git-submodule summary: test\n + git-submodule summary: documentation\n + git-submodule summary: limit summary size\n + git-submodule summary: show commit summary\n + git-submodule summary: code framework\n\nI didn't see anybody very supportive for this series, but I do not think\nthis regresses existing other subcommands to \"git submodule\", so let's see\nhow useful submodule users find this. Maybe they have improvement ideas\nfor its output before we decide post 1.5.5 if it is a good idea to include\nit in \"git status\" output.\n\n* jc/makefile (Wed Mar 12 01:46:26 2008 -0700) 2 commits\n - Makefile: flatten enumeration of headers, objects and programs\n - Makefile: DIFF_OBJS is not special at all these days\n\nI promised to do this immediately after -rc0, so this will shortly be in\n'next' and then in 'master'.\n\n* jk/portable (Wed Mar 12 17:42:43 2008 -0400) 13 commits\n + t7505: use SHELL_PATH in hook\n + t9112: add missing #!/bin/sh header\n + filter-branch: use $SHELL_PATH instead of 'sh'\n + filter-branch: don't use xargs -0\n + add NO_EXTERNAL_GREP build option\n + t6000lib: tr portability fix\n + t4020: don't use grep -a\n + add test_cmp function for test scripts\n + remove use of \"tail -n 1\" and \"tail -1\"\n + grep portability fix: don't use \"-e\" or \"-q\"\n + more tr portability test script fixes\n + t0050: perl portability fix\n + tr portability fixes\n\nInitially triggered by Solaris porting effort but these are harmless\nportability changes. Perhaps in 1.5.5, perhaps immediately after that.\n\n----------------------------------------------------------------\n[Dropped]\n\n* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits\n . tests: convert \"cmp\" and \"cmp -s\" to test_cmp\n . tests: test_cmp helper function\n\nThis one may be more elaborate, but Jeff's patch is much simpler.\n\n* nd/worktree (Sun Mar 2 17:35:43 2008 +0700) 10 commits\n . Additional tests to capture worktree special cases\n . Documentation: update api-builtin and api-setup\n . Make setup_git_directory() auto-setup worktree if found\n . builtin-archive: mark unused prefix \"unused_prefix\"\n . Completely move out worktree setup from\n setup_git_directory_gently()\n . http-push: Avoid calling setup_git_directory() twice\n . Make setup_work_tree() return new prefix\n . Make get_git_dir() and 'git rev-parse --git-dir' absolute path\n . Make sure setup_git_directory is called before accessing\n repository\n . \"git read-tree -m\" and the like require worktree\n\nEvery time we touch work-tree stuff we seem to have unstabilized things.\nThis is excluded from 'pu' for now although I still have copies.\n\n----------------------------------------------------------------\n[On Hold]\n\n* jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits\n + t5300: add test for \"index-pack --strict\"\n + receive-pack: allow using --strict mode for unpacking objects\n + unpack-objects: fix --strict handling\n + t5300: add test for \"unpack-objects --strict\"\n + unpack-objects: prevent writing of inconsistent objects\n\nThis would re-instate the \"unpack-objects --strict\" but we probably should\nnot do this before 1.5.5.\n\n* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits\n - diffcore-rename: make file_table available outside exact rename\n detection\n + Optimize rename detection for a huge diff\n\n* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit\n - diff: make --dirstat binary-file safe\n\n* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits\n - Teach GIT-VERSION-GEN about the .git file\n - Teach git-submodule.sh about the .git file\n - Teach resolve_gitlink_ref() about the .git file\n - Add platform-independent .git \"symlink\"\n\nThe idea and the implementation seem Ok, but this leaves\ndistinct feeling that it is a solution still waiting for a user\n(e.g. \"git submodule\" enhancements to take advantage of this\nfacility to preserve the subrepository while switching between a\nrevision with a submodule and another before the submodule was\nbound to the superproject).\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0. I am not sure if we should merge this to\n'next' before 1.5.5. Most active people will be on 'next' and\nif we have this there, the resulting 1.5.5 release might end up\nhaving issues that come from differences this one introduces.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits\n - sha1-lookup: make selection of 'middle' less aggressive\n - sha1-lookup: more memory efficient search in sorted list of SHA-1\n\nMicro-optimization whose real world benefit is not proven.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour by not using\nmerge-recursive, but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"72735","messageId":"2008-03-23-13-00-28+trackit+sam@rfc1149.net","threadId":"12603","inReplyTo":"7v8x0992hy.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Samuel Tardieu","fromEmail":"sam@rfc1149.net","sentAt":"2008-03-23T12:00:28Z","receivedAt":"2008-03-23T12:00:28Z","isPatch":false,"sender":{"key":"sam@rfc1149.net","avatar":"https://avatars.githubusercontent.com/u/44656?v=4"},"body":"I don't see your MIME/Content-Type fix in the list (adding the\nrequired headers even in presence of user headers). Did I overlook\nsomething?\n\n Sam\n-- \nSamuel Tardieu -- sam@rfc1149.net -- http://www.rfc1149.net/\n"},{"id":"72739","messageId":"alpine.OSX.1.00.0803231334210.11994@cougar","threadId":"12603","inReplyTo":"7v8x0992hy.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Steffen Prohaska","fromEmail":"prohaska@zib.de","sentAt":"2008-03-23T12:39:59Z","receivedAt":"2008-03-23T12:39:59Z","isPatch":false,"sender":{"key":"prohaska@zib.de","avatar":"https://avatars.githubusercontent.com/u/217580?v=4"},"body":"On Sun, 23 Mar 2008, Junio C Hamano wrote:\n\n> * lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits\n> - Make git-add behave more sensibly in a case-insensitive\n> environment\n> - When adding files to the index, add support for case-independent\n> matches\n> - Make unpack-tree update removed files before any updated files\n> - Make branch merging aware of underlying case-insensitive\n> filsystems\n> - Add 'core.ignorecase' option\n> - Make hash_name_lookup able to do case-independent lookups\n> - Make \"index_name_exists()\" return the cache_entry it found\n> - Move name hashing functions into a file of its own\n> - Make unpack_trees_options bit flags actual bitfields\n> \n> The beginning of ASCII-only case insensitive filesystem support. It is\n> not complete yet, though. E.g. if you enable core.ignorecase in t0050,\n> the merge test fails.\n\nThe merge test passes for me (on hfs+). The \"git mv\" test still fails;\nLinus made clear that \"git mv\" is not yet fixed.\n\n Steffen\n"},{"id":"72780","messageId":"7v4pax8iqc.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"2008-03-23-13-00-28+trackit+sam@rfc1149.net","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-03-23T17:15:23Z","receivedAt":"2008-03-23T17:15:23Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Samuel Tardieu writes:\n\n> I don't see your MIME/Content-Type fix in the list (adding the\n> required headers even in presence of user headers). Did I overlook\n> something?\n\nDo you mean 6bf4f1b (format-patch: generate MIME header as needed even\nwhen there is format.header, 2008-03-14)?\n"},{"id":"72783","messageId":"7vve3d734z.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"alpine.OSX.1.00.0803231334210.11994@cougar","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-03-23T17:37:32Z","receivedAt":"2008-03-23T17:37:32Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Steffen Prohaska writes:\n\n> The merge test passes for me (on hfs+). The \"git mv\" test still fails;\n> Linus made clear that \"git mv\" is not yet fixed.\n\nI was actually talking about the case with your patch applied to t0050 on\ncase sensitive systems.\n"},{"id":"72811","messageId":"5d46db230803231406x132e748bm306494ec5f8dfd2b@mail.gmail.com","threadId":"12603","inReplyTo":"7v8x0992hy.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Govind Salinas","fromEmail":"blix@sophiasuchtig.com","sentAt":"2008-03-23T21:06:25Z","receivedAt":"2008-03-23T21:06:25Z","isPatch":false,"sender":{"key":"blix@sophiasuchtig.com","avatar":null},"body":"On Sun, Mar 23, 2008 at 5:08 AM, Junio C Hamano wrote:\n>\n> * gs/pretty-hexval (Fri Mar 21 10:05:06 2008 -0500) 1 commit\n> + pretty.c: add %x00 format specifier.\n>\n> Adds a generic \"insert any byte value\" to --pretty=format:<> specifier.\n>\nI also sent out the following patch that could be put in instead of or in\naddition to this one. The both solve my problem in different ways.\n\nThanks,\nGovind.\n\n---\nFrom: Govind Salinas \nDate: Sun, 23 Mar 2008 16:02:11 -0500\nSubject: [PATCH] log-tree.c: Make log_tree_diff_flush() honor line_termination.\n\nSigned-off-by: Govind Salinas \n---\n log-tree.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/log-tree.c b/log-tree.c\nindex 608f697..5f55683 100644\n--- a/log-tree.c\n+++ b/log-tree.c\n@@ -338,7 +338,7 @@ int log_tree_diff_flush(struct rev_info *opt)\n \t\t\tint pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;\n \t\t\tif ((pch & opt->diffopt.output_format) == pch)\n \t\t\t\tprintf(\"---\");\n-\t\t\tputchar('\\n');\n+\t\t\tputchar(opt->diffopt.line_termination);\n \t\t}\n \t}\n \tdiff_flush(&opt->diffopt);\n-- \n1.5.4.4.550.g77e21.dirty\n"},{"id":"72824","messageId":"2008-03-23-23-34-54+trackit+sam@rfc1149.net","threadId":"12603","inReplyTo":"7v4pax8iqc.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Samuel Tardieu","fromEmail":"sam@rfc1149.net","sentAt":"2008-03-23T22:34:54Z","receivedAt":"2008-03-23T22:34:54Z","isPatch":false,"sender":{"key":"sam@rfc1149.net","avatar":"https://avatars.githubusercontent.com/u/44656?v=4"},"body":">>>>> \"Junio\" == Junio C Hamano writes:\n\nJunio> Do you mean 6bf4f1b (format-patch: generate MIME header as\nJunio> needed even when there is format.header, 2008-03-14)?\n\nYup. I hadn't seen it was in master and main already :)\n\n Sam\n-- \nSamuel Tardieu -- sam@rfc1149.net -- http://www.rfc1149.net/\n"},{"id":"72851","messageId":"7vprtk3jwg.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"5d46db230803231406x132e748bm306494ec5f8dfd2b@mail.gmail.com","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-03-24T03:01:19Z","receivedAt":"2008-03-24T03:01:19Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Govind Salinas\" writes:\n\n> I also sent out the following patch that could be put in instead of...\n\nI had an impression that that change would break the existing output that\nsomebody other than you are depending on.\n\nI personally think it is plausible that everybody wants the new behaviour\nyour patch propose, but that kind of change is not appropriate for 1.5.5\ncycle (might be Ok for 1.6.0 after we see agreements on the list), and\ndefinitely not something we would want to apply after -rc0.\n"},{"id":"73233","messageId":"7vd4pf7h9y.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7v8x0992hy.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-03-28T01:45:45Z","receivedAt":"2008-03-28T01:45:45Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\n----------------------------------------------------------------\n[New Topics]\n\n* dd/cvsserver (Thu Mar 27 23:18:35 2008 +0100) 7 commits\n - cvsserver: Use the user part of the email in log and annotate\n results\n - cvsserver: Add test for update -p\n - cvsserver: Implement update -p (print to stdout)\n - cvsserver: Add a few tests for 'status' command\n - cvsserver: Do not include status output for subdirectories if -l\n is passed\n - cvsserver: Only print the file part of the filename in status\n header\n - cvsserver: Respond to the 'editors' and 'watchers' commands\n\nThe changes seem clean and should affect only locking related client\ncommands, so even though this is a new _feature_, I am inclined to merge\nthis in 1.5.5. Testing by interested parties are encouraged.\n\n* mb/prune (Mon Mar 24 23:20:51 2008 -0700) 4 commits\n + builtin-prune: protect objects listed on the command line\n + builtin-prune.c: use parse_options()\n + Add tests for git-prune\n + parse-options.c: introduce OPT_DATE\n\n\"git prune $this $that\" lost its ability to protect $this and $that from\ngetting pruned when it was rewritten in C; this attempts to resurrect it.\nThis maybe is 1.5.5 material.\n\n* jk/add-i-mode (Thu Mar 27 03:32:25 2008 -0400) 2 commits\n + add--interactive: allow user to choose mode update\n + add--interactive: ignore mode change in 'p'atch command\n\nNew feature, will probably be part of the release after 1.5.5\n\n* gp/gitweb (Wed Mar 26 18:11:19 2008 +0000) 1 commit\n + gitweb: fallback to system-wide config file if default config does\n not exist\n\nNew feature, will probably be part of the release after 1.5.5\n\n----------------------------------------------------------------\n[On Hold]\n\n* gs/pretty-hexval (Fri Mar 21 10:05:06 2008 -0500) 1 commit\n + pretty.c: add %x00 format specifier.\n\nAdds a generic \"insert any byte value\" to --pretty=format:<> specifier.\nNew feature, will probably be part of the release after 1.5.5\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n - \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this, but because I have met no real user with shared repository\nworkflow who complained on this issue, I think this is not urgent.\n\n* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits\n - tests: convert \"cmp\" and \"cmp -s\" to test_cmp\n - tests: test_cmp helper function\n\nThis one may be more elaborate, but Jeff's patch is much simpler.\n\n* fl/send-email-outside (Fri Mar 14 18:29:30 2008 +0100) 4 commits\n + send-email: Don't require to be called in a repository\n + Git.pm: Don't require repository instance for ident\n + Git.pm: Don't require a repository instance for config\n + var: Don't require to be in a git repository.\n\nPeople couldn't invoke \"git send-email\" from outside their repositories,\nbut this series allows them to. I do not think it is urgent, though.\nThis does not look risky, even though it touches Git.pm that is shared\nwith other things. This has been cooking in 'next' for some time and we\nhaven't heard about breakages caused by this. Will probably be the first\nthing to be merged in 'master' post 1.5.5.\n\n* jc/rebase (Sat Mar 15 13:17:42 2008 -0700) 1 commit\n + rebase [--onto O] A B: omit needless checkout\n\nWe used to \"git checkout B && git rebase A\" internally to implement this,\nwhich meant the work tree was smudged one time too many. This is probably\na safe optimization, but it case after -rc0 and is not really a must-have\nfix. One of the first after post 1.5.5.\n\n* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits\n - Make git-add behave more sensibly in a case-insensitive\n environment\n - When adding files to the index, add support for case-independent\n matches\n - Make unpack-tree update removed files before any updated files\n - Make branch merging aware of underlying case-insensitive\n filsystems\n - Add 'core.ignorecase' option\n - Make hash_name_lookup able to do case-independent lookups\n - Make \"index_name_exists()\" return the cache_entry it found\n - Move name hashing functions into a file of its own\n - Make unpack_trees_options bit flags actual bitfields\n\nThe beginning of ASCII-only case insensitive filesystem support.\n\n* jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits\n + t5300: add test for \"index-pack --strict\"\n + receive-pack: allow using --strict mode for unpacking objects\n + unpack-objects: fix --strict handling\n + t5300: add test for \"unpack-objects --strict\"\n + unpack-objects: prevent writing of inconsistent objects\n\nThis would re-instate the \"unpack-objects --strict\" but we probably should\nnot do this before 1.5.5.\n\n* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits\n - diffcore-rename: make file_table available outside exact rename\n detection\n + Optimize rename detection for a huge diff\n\n* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit\n - diff: make --dirstat binary-file safe\n\n* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits\n - Teach GIT-VERSION-GEN about the .git file\n - Teach git-submodule.sh about the .git file\n - Teach resolve_gitlink_ref() about the .git file\n - Add platform-independent .git \"symlink\"\n\nThe idea and the implementation seem Ok, but this leaves\ndistinct feeling that it is a solution still waiting for a user\n(e.g. \"git submodule\" enhancements to take advantage of this\nfacility to preserve the subrepository while switching between a\nrevision with a submodule and another before the submodule was\nbound to the superproject).\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0. I am not sure if we should merge this to\n'next' before 1.5.5. Most active people will be on 'next' and\nif we have this there, the resulting 1.5.5 release might end up\nhaving issues that come from differences this one introduces.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits\n - sha1-lookup: make selection of 'middle' less aggressive\n - sha1-lookup: more memory efficient search in sorted list of SHA-1\n\nMicro-optimization whose real world benefit is not proven.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour by not using\nmerge-recursive, but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"73423","messageId":"7vwsnjl21c.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vd4pf7h9y.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-03-31T08:40:15Z","receivedAt":"2008-03-31T08:40:15Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\n----------------------------------------------------------------\n[New Topics]\n\n* bc/mktag (Thu Mar 27 11:16:04 2008 -0500) 1 commit\n + mktag.c: improve verification of tagger field and tests\n\nThis is not very urgent but not complex nor risky enough to be worth\nholding back. Will merge before 1.5.5.\n\n* je/cvsserver (Thu Mar 27 14:02:14 2008 -0700) 1 commit\n + Allow git-cvsserver database table name prefix to be specified.\n\nThe changes seem clean; even though this is a new _feature_, I am inclined\nto merge this in 1.5.5. Testing by interested parties are encouraged.\n\n* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit\n - filter-branch.sh: support nearly proper tag name filtering\n\nNew feature, will probably be part of the release after 1.5.5\n\n* js/filter-branch (Mon Mar 31 09:14:15 2008 +0200) 2 commits\n + filter-branch: Fix renaming a directory in the tree-filter\n + filter-branch: Test renaming directories in a tree-filter\n\nFix for 1.5.5; I ran out of time this weekend to merge this.\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n* mb/prune (Mon Mar 24 23:20:51 2008 -0700) 4 commits\n + builtin-prune: protect objects listed on the command line\n + builtin-prune.c: use parse_options()\n + Add tests for git-prune\n + parse-options.c: introduce OPT_DATE\n\n\"git prune $this $that\" lost its ability to protect $this and $that from\ngetting pruned when it was rewritten in C; this attempts to resurrect it.\nThis maybe is 1.5.5 material.\n\n----------------------------------------------------------------\n[Actively cooking]\n\n* dd/cvsserver (Thu Mar 27 23:18:35 2008 +0100) 7 commits\n + cvsserver: Use the user part of the email in log and annotate\n results\n + cvsserver: Add test for update -p\n + cvsserver: Implement update -p (print to stdout)\n + cvsserver: Add a few tests for 'status' command\n + cvsserver: Do not include status output for subdirectories if -l\n is passed\n + cvsserver: Only print the file part of the filename in status\n header\n + cvsserver: Respond to the 'editors' and 'watchers' commands\n\nThe changes seem clean and should affect only locking related client\ncommands, so even though this is a new _feature_, I am inclined to merge\nthis in 1.5.5. Testing by interested parties are encouraged.\n\n* pb/cvsserver (Sun Mar 16 20:00:21 2008 +0100) 1 commit\n + git-cvsserver: handle change type T\n\nThis should be 1.5.5 material.\n\n----------------------------------------------------------------\n[On Hold]\n\n* jk/add-i-mode (Thu Mar 27 03:32:25 2008 -0400) 2 commits\n + add--interactive: allow user to choose mode update\n + add--interactive: ignore mode change in 'p'atch command\n\nNew feature, will probably be part of the release after 1.5.5\n\n* gp/gitweb (Wed Mar 26 18:11:19 2008 +0000) 1 commit\n + gitweb: fallback to system-wide config file if default config does\n not exist\n\nNew feature, will probably be part of the release after 1.5.5\n\n* gs/pretty-hexval (Fri Mar 21 10:05:06 2008 -0500) 1 commit\n + pretty.c: add %x00 format specifier.\n\nAdds a generic \"insert any byte value\" to --pretty=format:<> specifier.\nNew feature, will probably be part of the release after 1.5.5\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n - \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this, but because I have met no real user with shared repository\nworkflow who complained on this issue, I think this is not urgent.\n\n* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits\n - tests: convert \"cmp\" and \"cmp -s\" to test_cmp\n - tests: test_cmp helper function\n\nThis one may be more elaborate, but Jeff's patch is much simpler.\n\n* fl/send-email-outside (Fri Mar 14 18:29:30 2008 +0100) 4 commits\n + send-email: Don't require to be called in a repository\n + Git.pm: Don't require repository instance for ident\n + Git.pm: Don't require a repository instance for config\n + var: Don't require to be in a git repository.\n\nPeople couldn't invoke \"git send-email\" from outside their repositories,\nbut this series allows them to. I do not think it is urgent, though.\nThis does not look risky, even though it touches Git.pm that is shared\nwith other things. This has been cooking in 'next' for some time and we\nhaven't heard about breakages caused by this. Will probably be the first\nthing to be merged in 'master' post 1.5.5.\n\n* jc/rebase (Sat Mar 15 13:17:42 2008 -0700) 1 commit\n + rebase [--onto O] A B: omit needless checkout\n\nWe used to \"git checkout B && git rebase A\" internally to implement this,\nwhich meant the work tree was smudged one time too many. This is probably\na safe optimization, but it case after -rc0 and is not really a must-have\nfix. One of the first after post 1.5.5.\n\n* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits\n - Make git-add behave more sensibly in a case-insensitive\n environment\n - When adding files to the index, add support for case-independent\n matches\n - Make unpack-tree update removed files before any updated files\n - Make branch merging aware of underlying case-insensitive\n filsystems\n - Add 'core.ignorecase' option\n - Make hash_name_lookup able to do case-independent lookups\n - Make \"index_name_exists()\" return the cache_entry it found\n - Move name hashing functions into a file of its own\n - Make unpack_trees_options bit flags actual bitfields\n\nThe beginning of ASCII-only case insensitive filesystem support.\n\n* jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits\n + t5300: add test for \"index-pack --strict\"\n + receive-pack: allow using --strict mode for unpacking objects\n + unpack-objects: fix --strict handling\n + t5300: add test for \"unpack-objects --strict\"\n + unpack-objects: prevent writing of inconsistent objects\n\nThis would re-instate the \"unpack-objects --strict\" but we probably should\nnot do this before 1.5.5.\n\n* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits\n - diffcore-rename: make file_table available outside exact rename\n detection\n + Optimize rename detection for a huge diff\n\n* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit\n - diff: make --dirstat binary-file safe\n\n* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits\n - Teach GIT-VERSION-GEN about the .git file\n - Teach git-submodule.sh about the .git file\n - Teach resolve_gitlink_ref() about the .git file\n - Add platform-independent .git \"symlink\"\n\nThe idea and the implementation seem Ok, but this leaves\ndistinct feeling that it is a solution still waiting for a user\n(e.g. \"git submodule\" enhancements to take advantage of this\nfacility to preserve the subrepository while switching between a\nrevision with a submodule and another before the submodule was\nbound to the superproject).\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0. I am not sure if we should merge this to\n'next' before 1.5.5. Most active people will be on 'next' and\nif we have this there, the resulting 1.5.5 release might end up\nhaving issues that come from differences this one introduces.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits\n - sha1-lookup: make selection of 'middle' less aggressive\n - sha1-lookup: more memory efficient search in sorted list of SHA-1\n\nMicro-optimization whose real world benefit is not proven.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour by not using\nmerge-recursive, but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"73660","messageId":"7vhcehzdeg.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vwsnjl21c.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-04-04T18:24:39Z","receivedAt":"2008-04-04T18:24:39Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nWith a handful topics graduated to \"master\", we hopefully will have the\nfinal 1.5.5 soon.\n\n----------------------------------------------------------------\n[New Topics]\n\n* mv/defer-gc (Wed Apr 2 21:35:11 2008 +0200) 3 commits\n - contrib/hooks: add an example pre-auto-gc hook\n - Documentation/hooks: add pre-auto-gc hook\n - git-gc --auto: add pre-auto-gc hook\n\nA new hook to stop \"git gc --auto\" from running.\n\n* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit\n - filter-branch.sh: support nearly proper tag name filtering\n\nNew feature, will probably be part of the release after 1.5.5\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n* bc/mktag (Thu Mar 27 11:16:04 2008 -0500) 1 commit\n + mktag.c: improve verification of tagger field and tests\n\n* je/cvsserver (Thu Mar 27 14:02:14 2008 -0700) 1 commit\n + Allow git-cvsserver database table name prefix to be specified.\n\n* dd/cvsserver (Thu Mar 27 23:18:35 2008 +0100) 7 commits\n + cvsserver: Use the user part of the email in log and annotate\n results\n + cvsserver: Add test for update -p\n + cvsserver: Implement update -p (print to stdout)\n + cvsserver: Add a few tests for 'status' command\n + cvsserver: Do not include status output for subdirectories if -l\n is passed\n + cvsserver: Only print the file part of the filename in status\n header\n + cvsserver: Respond to the 'editors' and 'watchers' commands\n\n* pb/cvsserver (Sun Mar 16 20:00:21 2008 +0100) 1 commit\n + git-cvsserver: handle change type T\n\n* js/filter-branch (Mon Mar 31 09:14:15 2008 +0200) 2 commits\n + filter-branch: Fix renaming a directory in the tree-filter\n + filter-branch: Test renaming directories in a tree-filter\n\n----------------------------------------------------------------\n[On Hold]\n\n* jk/add-i-mode (Thu Mar 27 03:32:25 2008 -0400) 2 commits\n + add--interactive: allow user to choose mode update\n + add--interactive: ignore mode change in 'p'atch command\n\nNew feature, will probably be part of the release after 1.5.5\n\n* gp/gitweb (Wed Mar 26 18:11:19 2008 +0000) 1 commit\n + gitweb: fallback to system-wide config file if default config does\n not exist\n\nNew feature, will probably be part of the release after 1.5.5\n\n* gs/pretty-hexval (Fri Mar 21 10:05:06 2008 -0500) 1 commit\n + pretty.c: add %x00 format specifier.\n\nAdds a generic \"insert any byte value\" to --pretty=format:<> specifier.\nNew feature, will probably be part of the release after 1.5.5\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n - \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this, but because I have met no real user with shared repository\nworkflow who complained on this issue, I think this is not urgent.\n\n* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits\n - tests: convert \"cmp\" and \"cmp -s\" to test_cmp\n - tests: test_cmp helper function\n\nThis one may be more elaborate, but Jeff's patch is much simpler.\n\n* fl/send-email-outside (Fri Mar 14 18:29:30 2008 +0100) 4 commits\n + send-email: Don't require to be called in a repository\n + Git.pm: Don't require repository instance for ident\n + Git.pm: Don't require a repository instance for config\n + var: Don't require to be in a git repository.\n\nPeople couldn't invoke \"git send-email\" from outside their repositories,\nbut this series allows them to. I do not think it is urgent, though.\nThis does not look risky, even though it touches Git.pm that is shared\nwith other things. This has been cooking in 'next' for some time and we\nhaven't heard about breakages caused by this. Will probably be the first\nthing to be merged in 'master' post 1.5.5.\n\n* jc/rebase (Sat Mar 15 13:17:42 2008 -0700) 1 commit\n + rebase [--onto O] A B: omit needless checkout\n\nWe used to \"git checkout B && git rebase A\" internally to implement this,\nwhich meant the work tree was smudged one time too many. This is probably\na safe optimization, but it case after -rc0 and is not really a must-have\nfix. One of the first after post 1.5.5.\n\n* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits\n - Make git-add behave more sensibly in a case-insensitive\n environment\n - When adding files to the index, add support for case-independent\n matches\n - Make unpack-tree update removed files before any updated files\n - Make branch merging aware of underlying case-insensitive\n filsystems\n - Add 'core.ignorecase' option\n - Make hash_name_lookup able to do case-independent lookups\n - Make \"index_name_exists()\" return the cache_entry it found\n - Move name hashing functions into a file of its own\n - Make unpack_trees_options bit flags actual bitfields\n\nThe beginning of ASCII-only case insensitive filesystem support.\n\n* jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits\n + t5300: add test for \"index-pack --strict\"\n + receive-pack: allow using --strict mode for unpacking objects\n + unpack-objects: fix --strict handling\n + t5300: add test for \"unpack-objects --strict\"\n + unpack-objects: prevent writing of inconsistent objects\n\nThis would re-instate the \"unpack-objects --strict\" but we probably should\nnot do this before 1.5.5.\n\n* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits\n - diffcore-rename: make file_table available outside exact rename\n detection\n + Optimize rename detection for a huge diff\n\n* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit\n - diff: make --dirstat binary-file safe\n\n* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits\n - Teach GIT-VERSION-GEN about the .git file\n - Teach git-submodule.sh about the .git file\n - Teach resolve_gitlink_ref() about the .git file\n - Add platform-independent .git \"symlink\"\n\nThe idea and the implementation seem Ok, but this leaves\ndistinct feeling that it is a solution still waiting for a user\n(e.g. \"git submodule\" enhancements to take advantage of this\nfacility to preserve the subrepository while switching between a\nrevision with a submodule and another before the submodule was\nbound to the superproject).\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits\n - sha1-lookup: make selection of 'middle' less aggressive\n - sha1-lookup: more memory efficient search in sorted list of SHA-1\n\nMicro-optimization whose real world benefit is not proven.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour by not using\nmerge-recursive, but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"73664","messageId":"1207340506.10992.28.camel@gaara.boston.redhat.com","threadId":"12603","inReplyTo":"7vhcehzdeg.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Kristian Høgsberg","fromEmail":"krh@redhat.com","sentAt":"2008-04-04T20:21:46Z","receivedAt":"2008-04-04T20:21:46Z","isPatch":false,"sender":{"key":"krh@redhat.com","avatar":"https://gravatar.com/avatar/763dee6f9594ac474f725b137a39565792928e583ddf59b32befc2907409027e?d=mp&s=160"},"body":"On Fri, 2008-04-04 at 11:24 -0700, Junio C Hamano wrote:\n> Here are the topics that have been cooking. Commits prefixed\n> with '-' are only in 'pu' while commits prefixed with '+' are\n> in 'next'.\n> \n> The topics list the commits in reverse chronological order.\n> \n> With a handful topics graduated to \"master\", we hopefully will have\n> the\n> final 1.5.5 soon.\n\nWhat happened to builtin-clone? I know I just threw it over the fence,\nbut Daniel picked it up and got it a lot closer to working? Did it fall\nthrough the cracks or is it just 1.5.6 material?\n\nKristian\n"},{"id":"73667","messageId":"7vzls9xs05.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"1207340506.10992.28.camel@gaara.boston.redhat.com","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-04-04T20:52:10Z","receivedAt":"2008-04-04T20:52:10Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Kristian Høgsberg writes:\n\n> On Fri, 2008-04-04 at 11:24 -0700, Junio C Hamano wrote:\n>> Here are the topics that have been cooking. Commits prefixed\n>> with '-' are only in 'pu' while commits prefixed with '+' are\n>> in 'next'.\n>> \n>> The topics list the commits in reverse chronological order.\n>> \n>> With a handful topics graduated to \"master\", we hopefully will have the\n>> final 1.5.5 soon.\n>\n> What happened to builtin-clone?\n\nNothing.\n\n> ... I know I just threw it over the fence,\n> but Daniel picked it up and got it a lot closer to working? Did it fall\n> through the cracks or is it just 1.5.6 material?\n\nIf I recall correctly, \"a lot closer to working\" happened way after 1.5.5\nmerge window closed, so it definitely is not 1.5.5 material.\n\nJudging from the fact that we recently had to deal with the fallouts of C\nrewrites that happened during the 1.5.4 timeframe, I would have to say\nthat any C rewrite of a substantial and important program needs to be\ncooked at least for one (or preferably two cycles, especially we are\ntrying to have shorter cycles) in 'next'.\n\nSo at this point, I optimistically say that it has a good chance of being\ndeeply in 'next' and all the active git people would hopefully be using\nit, by the time 1.5.6 (or perhaps that is named 1.6.0, depending on what\nelse we will do) ships, but I cannot say much more than that. It very\nmuch depends on how hard the code has been scrutinized already at this\npoint; I haven't personally looked at it in any serious depth yet.\n"},{"id":"73679","messageId":"alpine.LSU.1.00.0804050221000.4008@racer.site","threadId":"12603","inReplyTo":"7vzls9xs05.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-04-05T00:26:53Z","receivedAt":"2008-04-05T00:26:53Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 4 Apr 2008, Junio C Hamano wrote:\n\n> Kristian Høgsberg writes:\n> \n> > ... I know I just threw it over the fence, but Daniel picked it up and \n> > got it a lot closer to working? Did it fall through the cracks or is \n> > it just 1.5.6 material?\n> \n> If I recall correctly, \"a lot closer to working\" happened way after \n> 1.5.5 merge window closed, so it definitely is not 1.5.5 material.\n> \n> Judging from the fact that we recently had to deal with the fallouts of \n> C rewrites that happened during the 1.5.4 timeframe, I would have to say \n> that any C rewrite of a substantial and important program needs to be \n> cooked at least for one (or preferably two cycles, especially we are \n> trying to have shorter cycles) in 'next'.\n\nThat would mean that you'd have to merge it into 'next'. And rather \nsooner than later, since everything else would lead to a dragging out of \nthe timeline.\n\nAs it happens, until you called out the 'please test master' phase, I was \nrunning with builtin clone, and did not find it lacking. Although I have \nto admit that I have some cleanups, and I haven't merged with Daniel in a \nlong time. And I do not do anything particularly fancy, such as shallow \nclone or shared clone.\n\nCiao,\nDscho \"who hopes that the please-test-master phase is over soon\""},{"id":"73688","messageId":"7vmyo8yhl2.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"alpine.LSU.1.00.0804050221000.4008@racer.site","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-04-05T05:51:53Z","receivedAt":"2008-04-05T05:51:53Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> On Fri, 4 Apr 2008, Junio C Hamano wrote:\n>\n>> Judging from the fact that we recently had to deal with the fallouts of \n>> C rewrites that happened during the 1.5.4 timeframe, I would have to say \n>> that any C rewrite of a substantial and important program needs to be \n>> cooked at least for one (or preferably two cycles, especially we are \n>> trying to have shorter cycles) in 'next'.\n>\n> That would mean that you'd have to merge it into 'next'. And rather \n> sooner than later, since everything else would lead to a dragging out of \n> the timeline.\n\nYes, which means somebody needs to present a mergeable history rather\nsooner than later, and that somebody does not have to be me ;-)\n"},{"id":"73938","messageId":"7vbq4j748l.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vhcehzdeg.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-04-09T09:43:38Z","receivedAt":"2008-04-09T09:43:38Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nCaution. \"next\" has been rebuilt with the remaining topics on top of\n\"master\". \"maint\" is still for 1.5.4.X maintenance track for tonight.\n\nA rough timeline from now on.\n\n * Brown paper back fixes, if any, for 1.5.5.1 (2008-04-16).\n\n * Discussion and review on new feature and enhancement patch series\n begins. Please resubmit things that you were cooking in your head\n during 1.5.5-rc period after cleaning up and retesting.\n\n * 1.5.6 merge window closes (2008-05-14).\n\n * Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).\n\n * 1.5.6 Final (2008-06-08).\n\n----------------------------------------------------------------\n[New Topics]\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 6 commits\n - merge: remove deprecated summary and diffstat options and config\n variables\n - merge, pull: add '--(no-)log' command line option\n - fmt-merge-msg: add '--(no-)log' options and 'merge.log' config\n variable\n - add 'merge.stat' config variable\n - merge, pull: introduce '--(no-)stat' option\n - doc: moved merge.* config variables into separate merge-config.txt\n\nI tried to fix its too-eager deprecation. The last one needs re-review;\nit should remove \"these are still supported but will be removed\" comments\nthat earlier ones add, and must be held back until 1.6.0 or later.\n\n* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits\n - git-blame --reverse\n - builtin-blame.c: allow more than 16 parents\n - builtin-blame.c: move prepare_final() into a separate function.\n - rev-list --children\n - revision traversal: --children option\n\nThe reverse blame I talked about earlier.\n\n* jc/lstat (Sun Mar 30 12:39:25 2008 -0700) 3 commits\n - diff-files: mark an index entry we know is up-to-date as such\n - write_index(): optimize ce_smudge_racily_clean_entry() calls with\n CE_UPTODATE\n - lstat: introduce a wrapper xlstat\n\nFurther reduce redundant lstat(2) calls during \"git status\" and other\ncommon operations.\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n* jc/rebase (Sat Mar 15 13:17:42 2008 -0700) 1 commit\n + rebase [--onto O] A B: omit needless checkout\n\nWe used to \"git checkout B && git rebase A\" internally to implement this,\nwhich meant the work tree was smudged one time too many.\n\n* gs/pretty-hexval (Fri Mar 21 10:05:06 2008 -0500) 1 commit\n + pretty.c: add %x00 format specifier.\n\nAdds a generic \"insert any byte value\" to --pretty=format:<> specifier.\n\n* jk/add-i-mode (Thu Mar 27 03:32:25 2008 -0400) 2 commits\n + add--interactive: allow user to choose mode update\n + add--interactive: ignore mode change in 'p'atch command\n\nAllows mode change \"pseudo hunk\" to be staged separately.\n\nNOTE NOTE NOTE! It might be interesting to extend the idea of this patch\nto treat \"new file\" as a pseudo hunk to record the much talked about\n\"intent to add\". That is, add a new command (or a new submode to patch\nsubcommand) that lets you add a file that is so far untracked, but only\nwith its mode and e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 which is the\nblob object name for an _empty_ blob. After such an operation is done,\n\"git diff\" will show the new contents of the file you build in your work\ntree that you _could_ commit with \"git commit -a\".\n\n* fl/send-email-outside (Fri Mar 14 18:29:30 2008 +0100) 4 commits\n + send-email: Don't require to be called in a repository\n + Git.pm: Don't require repository instance for ident\n + Git.pm: Don't require a repository instance for config\n + var: Don't require to be in a git repository.\n\nPeople couldn't invoke \"git send-email\" from outside their repositories,\nbut this series allows them to.\n\n* mk/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits\n + t5300: add test for \"index-pack --strict\"\n + receive-pack: allow using --strict mode for unpacking objects\n + unpack-objects: fix --strict handling\n + t5300: add test for \"unpack-objects --strict\"\n + unpack-objects: prevent writing of inconsistent objects\n\nThis would re-instate the \"unpack-objects --strict\".\n\n* gp/gitweb (Sat Apr 5 16:37:18 2008 +0000) 2 commits\n + gitweb: fallback to system-wide config file (fixup)\n + gitweb: fallback to system-wide config file if default config does\n not exist\n\n* jc/rename (Fri Mar 7 14:03:19 2008 -0800) 1 commit\n + Optimize rename detection for a huge diff\n\nThis makes memory consumption of the rename detection operation for a huge\ndiff (that is, a change that touches many many files). I've been running\nwith this for quite a while in my day-job repository without adverse\neffects.\n\n----------------------------------------------------------------\n[Actively Cooking]\n\n* mv/defer-gc (Wed Apr 2 21:35:11 2008 +0200) 3 commits\n + contrib/hooks: add an example pre-auto-gc hook\n + Documentation/hooks: add pre-auto-gc hook\n + git-gc --auto: add pre-auto-gc hook\n\nA new hook to stop \"git gc --auto\" from running.\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n + \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this. There recently was a problem report that had a scent of this\nissue which turned out to be a false alarm (it was about http-push which\ndoes not do the native pack protocol optimization and the reporter was\npushing into an empty repository which needs full transfer anyway).\n\n* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit\n + diff: make --dirstat binary-file safe\n\nThe current \"dirstat\" does totally wrong thing when the set of files\nchanged includes a binary one. This uses the same similarity evaluation\ncode as rename heuristics uses to treat text and binary the same way.\n\n* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits\n + Make git-add behave more sensibly in a case-insensitive\n environment\n + When adding files to the index, add support for case-independent\n matches\n + Make unpack-tree update removed files before any updated files\n + Make branch merging aware of underlying case-insensitive\n filsystems\n + Add 'core.ignorecase' option\n + Make hash_name_lookup able to do case-independent lookups\n + Make \"index_name_exists()\" return the cache_entry it found\n + Move name hashing functions into a file of its own\n + Make unpack_trees_options bit flags actual bitfields\n\nThe beginning of case insensitive filesystem support, currently\nASCII-only.\n\n* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits\n + Teach GIT-VERSION-GEN about the .git file\n + Teach git-submodule.sh about the .git file\n + Teach resolve_gitlink_ref() about the .git file\n + Add platform-independent .git \"symlink\"\n\nThe idea and the implementation seem Ok, but this leaves\ndistinct feeling that it is a solution still waiting for a user\n(e.g. \"git submodule\" enhancements to take advantage of this\nfacility to preserve the subrepository while switching between a\nrevision with a submodule and another before the submodule was\nbound to the superproject).\n\n* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits\n + sha1-lookup: make selection of 'middle' less aggressive\n + sha1-lookup: more memory efficient search in sorted list of SHA-1\n\nMicro-optimization whose real world benefit is not proven, so let's prove\nit or revert it by giving it a bit more exposure.\n\n----------------------------------------------------------------\n[On Hold]\n\nSome of these will start moving to \"next\", some I may have to ask for\nclean-up and resubmission for further discussion. Also the topics raised\nduring the 1.5.5-rc freeze period should be rebased, cleaned-up and\nresubmit for discussion and review for inclusion in 1.5.6.\n\n* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit\n - filter-branch.sh: support nearly proper tag name filtering\n\nInstead of discarding signed tags, this demotes them to simply annotated,\nwhich is technically not that different from signed tags.\n\n* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits\n - tests: convert \"cmp\" and \"cmp -s\" to test_cmp\n - tests: test_cmp helper function\n\nThis one may be more elaborate, but Jeff's patch is much simpler.\n\n* jc/rename-file-table (Fri Mar 7 14:03:19 2008 -0800) 1 commit\n - diffcore-rename: make file_table available outside exact rename\n detection\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour by not using\nmerge-recursive, but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"74319","messageId":"7vr6d8apjx.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vbq4j748l.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-04-14T07:00:50Z","receivedAt":"2008-04-14T07:00:50Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nCaution. \"next\" has been rebuilt with the remaining topics on top of\n\"master\".\n\nA rough timeline from now on.\n\n * Brown paper back fixes, if any, for 1.5.5.1 (2008-04-16).\n\n * Discussion and review on new feature and enhancement patch series\n begins. Please resubmit things that you were cooking in your head\n during 1.5.5-rc period after cleaning up and retesting.\n\n * 1.5.6 merge window closes (2008-05-14).\n\n * Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).\n\n * 1.5.6 Final (2008-06-08).\n\n----------------------------------------------------------------\n[New Topics]\n\n* mk/color (Wed Apr 9 21:32:06 2008 +0200) 1 commit\n + Use color.ui variable in scripts too\n\n* jk/remote-default-show (Wed Apr 9 11:15:51 2008 -0400) 1 commit\n + git-remote: show all remotes with \"git remote show\"\n\n* jc/terminator-separator (Mon Apr 7 17:11:34 2008 -0700) 1 commit\n + log: teach \"terminator\" vs \"separator\" mode to \"--pretty=format\"\n\n* js/decorate (Mon Apr 7 14:41:12 2008 +0100) 2 commits\n - pretty=format: Add %d to show decoration\n - decorate: use \"const struct object\"\n\n* jk/fetch-status (Wed Apr 9 20:11:52 2008 -0400) 1 commit\n + git-fetch: always show status of non-tracking-ref fetches\n\n* py/submodule (Sat Apr 12 23:05:33 2008 +0800) 3 commits\n + builtin-status: Add tests for submodule summary\n + builtin-status: submodule summary support\n + git-submodule summary: --for-status option\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n\n----------------------------------------------------------------\n[Actively Cooking]\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 6 commits\n - merge: remove deprecated summary and diffstat options and config\n variables\n + merge, pull: add '--(no-)log' command line option\n + fmt-merge-msg: add '--(no-)log' options and 'merge.log' config\n variable\n + add 'merge.stat' config variable\n + merge, pull: introduce '--(no-)stat' option\n + doc: moved merge.* config variables into separate merge-config.txt\n\nI fixed its too-eager deprecation. The last one needs to be held back, as\nit actually removes the support for features that the main part of the\nseries deprecates, until 1.6.0 or later.\n\n* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to.\n\n* jc/lstat (Sun Mar 30 12:39:25 2008 -0700) 2 commits\n + diff-files: mark an index entry we know is up-to-date as such\n + write_index(): optimize ce_smudge_racily_clean_entry() calls with\n CE_UPTODATE\n\nFurther reduce redundant lstat(2) calls during \"git status\" and other\ncommon operations.\n\n* mv/defer-gc (Wed Apr 2 21:35:11 2008 +0200) 3 commits\n + contrib/hooks: add an example pre-auto-gc hook\n + Documentation/hooks: add pre-auto-gc hook\n + git-gc --auto: add pre-auto-gc hook\n\nA new hook to stop \"git gc --auto\" from running.\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n + \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this. There recently was a problem report that had a scent of this\nissue which turned out to be a false alarm (it was about http-push which\ndoes not do the native pack protocol optimization and the reporter was\npushing into an empty repository which needs full transfer anyway).\n\n* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit\n + diff: make --dirstat binary-file safe\n\nThe current \"dirstat\" does totally wrong thing when the set of files\nchanged includes a binary one. This uses the same similarity evaluation\ncode as rename heuristics uses to treat text and binary the same way.\n\n* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits\n + Make git-add behave more sensibly in a case-insensitive\n environment\n + When adding files to the index, add support for case-independent\n matches\n + Make unpack-tree update removed files before any updated files\n + Make branch merging aware of underlying case-insensitive\n filsystems\n + Add 'core.ignorecase' option\n + Make hash_name_lookup able to do case-independent lookups\n + Make \"index_name_exists()\" return the cache_entry it found\n + Move name hashing functions into a file of its own\n + Make unpack_trees_options bit flags actual bitfields\n\nThe beginning of case insensitive filesystem support, currently\nASCII-only.\n\n* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits\n + Teach GIT-VERSION-GEN about the .git file\n + Teach git-submodule.sh about the .git file\n + Teach resolve_gitlink_ref() about the .git file\n + Add platform-independent .git \"symlink\"\n\nThe idea and the implementation seem Ok, but this leaves\ndistinct feeling that it is a solution still waiting for a user\n(e.g. \"git submodule\" enhancements to take advantage of this\nfacility to preserve the subrepository while switching between a\nrevision with a submodule and another before the submodule was\nbound to the superproject).\n\n* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits\n + sha1-lookup: make selection of 'middle' less aggressive\n + sha1-lookup: more memory efficient search in sorted list of SHA-1\n\nMicro-optimization whose real world benefit is not proven, so let's prove\nit or revert it by giving it a bit more exposure.\n\n----------------------------------------------------------------\n[On Hold]\n\n* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit\n - filter-branch.sh: support nearly proper tag name filtering\n\nInstead of discarding signed tags, this demotes them to simply annotated,\nwhich is technically not that different from signed tags.\n\n* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits\n - tests: convert \"cmp\" and \"cmp -s\" to test_cmp\n - tests: test_cmp helper function\n\nThis one may be more elaborate, but Jeff's patch is much simpler.\n\n* jc/rename-file-table (Fri Mar 7 14:03:19 2008 -0800) 1 commit\n - diffcore-rename: make file_table available outside exact rename\n detection\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour by not using\nmerge-recursive, but unfortunately has stalled for some time now.\n\n* jc/lstat-debug (Thu Mar 27 16:56:53 2008 -0700) 3 commits\n - lstat: introduce a wrapper xlstat\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"74470","messageId":"20080415192301.GD31395@sigill.intra.peff.net","threadId":"12603","inReplyTo":"7vr6d8apjx.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-04-15T19:23:02Z","receivedAt":"2008-04-15T19:23:02Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Apr 14, 2008 at 12:00:50AM -0700, Junio C Hamano wrote:\n\n> * jk/fetch-status (Wed Apr 9 20:11:52 2008 -0400) 1 commit\n> + git-fetch: always show status of non-tracking-ref fetches\n\nI have been out of touch for a few days. My plan had been to come back\nwith a new version that suppressed the status on pull, but I haven't\nseen anyone screaming about the change, so maybe it should just be left.\n\n-Peff\n"},{"id":"74749","messageId":"7vhcdyfe9u.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vr6d8apjx.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-04-19T08:19:09Z","receivedAt":"2008-04-19T08:19:09Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nCaution. \"next\" has been rebuilt with the remaining topics on top of\n\"master\".\n\nA rough timeline from now on.\n\n * 1.5.5.1 this Sunday, with what's in 'maint' tonight.\n\n * Discussion and review on new feature and enhancement patch series\n begins. Please resubmit things that you were cooking in your head\n during 1.5.5-rc period after cleaning up and retesting.\n\n * 1.5.6 merge window closes (2008-05-14).\n\n * Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).\n\n * 1.5.6 Final (2008-06-08).\n\n----------------------------------------------------------------\n[New Topics]\n\n* ho/shared (Wed Apr 16 11:34:24 2008 +0300) 1 commit\n + Make core.sharedRepository more generic\n\nLooked Ok, and will start cooking soon.\n\n* pb/remote-mirror-config (Thu Apr 17 13:17:20 2008 +0200) 1 commit\n - Add a remote.*.mirror configuration option\n\nI haven't gave this very careful review yet.\n\n* ap/svn (Tue Apr 15 21:04:18 2008 -0400) 3 commits\n - git-svn: add documentation for --add-author-from option.\n - git-svn: Add --add-author-from option.\n - git-svn: add documentation for --use-log-author option.\n\nEric requested a new set of tests for this series.\n\n* lh/branch-merged (Fri Apr 18 18:30:15 2008 +0200) 3 commits\n - Add tests for `branch --[no-]merged`\n - git-branch.txt: compare --contains, --merged and --no-merged\n - git-branch: add support for --merged and --no-merged\n\nLooked Ok, and will start cooking soon.\n\n* py/submodule-2 (Wed Apr 16 22:19:31 2008 +0800) 1 commit\n - git-submodule: Extract functions module_info and module_url\n\nI am a bit slow reviewing this series; only managed to queue the first one\nso far.\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n----------------------------------------------------------------\n[Actively Cooking]\n\n* mk/color (Wed Apr 9 21:32:06 2008 +0200) 1 commit\n + Use color.ui variable in scripts too\n\n* jk/remote-default-show (Wed Apr 9 11:15:51 2008 -0400) 1 commit\n + git-remote: show all remotes with \"git remote show\"\n\n* jc/terminator-separator (Mon Apr 7 17:11:34 2008 -0700) 1 commit\n + log: teach \"terminator\" vs \"separator\" mode to \"--pretty=format\"\n\n* jk/fetch-status (Wed Apr 9 20:11:52 2008 -0400) 1 commit\n + git-fetch: always show status of non-tracking-ref fetches\n\n* py/submodule (Sat Apr 12 23:05:33 2008 +0800) 3 commits\n + builtin-status: Add tests for submodule summary\n + builtin-status: submodule summary support\n + git-submodule summary: --for-status option\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 6 commits\n - merge: remove deprecated summary and diffstat options and config\n variables\n + merge, pull: add '--(no-)log' command line option\n + fmt-merge-msg: add '--(no-)log' options and 'merge.log' config\n variable\n + add 'merge.stat' config variable\n + merge, pull: introduce '--(no-)stat' option\n + doc: moved merge.* config variables into separate merge-config.txt\n\nI fixed its too-eager deprecation. The last one needs to be held back, as\nit actually removes the support for features that the main part of the\nseries deprecates, until 1.6.0 or later.\n\n* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to.\n\n* jc/lstat (Sun Mar 30 12:39:25 2008 -0700) 2 commits\n + diff-files: mark an index entry we know is up-to-date as such\n + write_index(): optimize ce_smudge_racily_clean_entry() calls with\n CE_UPTODATE\n\nFurther reduce redundant lstat(2) calls during \"git status\" and other\ncommon operations.\n\n* mv/defer-gc (Wed Apr 2 21:35:11 2008 +0200) 3 commits\n + contrib/hooks: add an example pre-auto-gc hook\n + Documentation/hooks: add pre-auto-gc hook\n + git-gc --auto: add pre-auto-gc hook\n\nA new hook to stop \"git gc --auto\" from running.\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n + \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this. There recently was a problem report that had a scent of this\nissue which turned out to be a false alarm (it was about http-push which\ndoes not do the native pack protocol optimization and the reporter was\npushing into an empty repository which needs full transfer anyway).\n\n* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit\n + diff: make --dirstat binary-file safe\n\nThe current \"dirstat\" does totally wrong thing when the set of files\nchanged includes a binary one. This uses the same similarity evaluation\ncode as rename heuristics uses to treat text and binary the same way.\n\n* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits\n + Make git-add behave more sensibly in a case-insensitive\n environment\n + When adding files to the index, add support for case-independent\n matches\n + Make unpack-tree update removed files before any updated files\n + Make branch merging aware of underlying case-insensitive\n filsystems\n + Add 'core.ignorecase' option\n + Make hash_name_lookup able to do case-independent lookups\n + Make \"index_name_exists()\" return the cache_entry it found\n + Move name hashing functions into a file of its own\n + Make unpack_trees_options bit flags actual bitfields\n\nThe beginning of case insensitive filesystem support, currently\nASCII-only.\n\n* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits\n + Teach GIT-VERSION-GEN about the .git file\n + Teach git-submodule.sh about the .git file\n + Teach resolve_gitlink_ref() about the .git file\n + Add platform-independent .git \"symlink\"\n\nThe idea and the implementation seem Ok, but this leaves\ndistinct feeling that it is a solution still waiting for a user\n(e.g. \"git submodule\" enhancements to take advantage of this\nfacility to preserve the subrepository while switching between a\nrevision with a submodule and another before the submodule was\nbound to the superproject).\n\n* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits\n + sha1-lookup: make selection of 'middle' less aggressive\n + sha1-lookup: more memory efficient search in sorted list of SHA-1\n\nMicro-optimization whose real world benefit is not proven, so let's prove\nit or revert it by giving it a bit more exposure.\n\n----------------------------------------------------------------\n[On Hold]\n\n* js/decorate (Mon Apr 7 14:41:12 2008 +0100) 2 commits\n - pretty=format: Add %d to show decoration\n - decorate: use \"const struct object\"\n\nThis has stalled, after a petered-out discussion.\n\n* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit\n - filter-branch.sh: support nearly proper tag name filtering\n\nInstead of discarding signed tags, this demotes them to simply annotated,\nwhich is technically not that different from signed tags. There was an\nobjection if what this claims to do is the right thing to do to begin\nwith. Also I haven't verified if it does what it claims to do.\n\nComments?\n\n* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits\n - tests: convert \"cmp\" and \"cmp -s\" to test_cmp\n - tests: test_cmp helper function\n\nThis one may be more elaborate, but Jeff's patch is much simpler.\n\n* jc/rename-file-table (Fri Mar 7 14:03:19 2008 -0800) 1 commit\n - diffcore-rename: make file_table available outside exact rename\n detection\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour by not using\nmerge-recursive, but unfortunately has stalled for some time now.\n\n* jc/lstat-debug (Thu Mar 27 16:56:53 2008 -0700) 3 commits\n - lstat: introduce a wrapper xlstat\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"74752","messageId":"alpine.DEB.1.00.0804191523030.3945@eeepc-johanness","threadId":"12603","inReplyTo":"7vhcdyfe9u.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-04-19T14:23:53Z","receivedAt":"2008-04-19T14:23:53Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sat, 19 Apr 2008, Junio C Hamano wrote:\n\n> ----------------------------------------------------------------\n> [On Hold]\n> \n> * js/decorate (Mon Apr 7 14:41:12 2008 +0100) 2 commits\n> - pretty=format: Add %d to show decoration\n> - decorate: use \"const struct object\"\n> \n> This has stalled, after a petered-out discussion.\n\nI am not personally interested, but I thought that it was easy enough to \ndo. So let's just scrap it, the mailing list has it should anybody need \nit in the future.\n\nCiao,\nDscho\n"},{"id":"74756","messageId":"8c5c35580804190934q3ea27328j76418745b7e7665e@mail.gmail.com","threadId":"12603","inReplyTo":"7vhcdyfe9u.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Lars Hjemli","fromEmail":"hjemli@gmail.com","sentAt":"2008-04-19T16:34:35Z","receivedAt":"2008-04-19T16:34:35Z","isPatch":false,"sender":{"key":"hjemli@gmail.com","avatar":null},"body":"On Sat, Apr 19, 2008 at 10:19 AM, Junio C Hamano wrote:\n> * lh/branch-merged (Fri Apr 18 18:30:15 2008 +0200) 3 commits\n> - Add tests for `branch --[no-]merged`\n> - git-branch.txt: compare --contains, --merged and --no-merged\n> - git-branch: add support for --merged and --no-merged\n\nI notice that you moved the test script into t3201 while still adding\nt3202, which probably wasn't your intent.\n\nWould you like me to resend the patches with your fixups to tests and\ndocs (and maybe even squash them into a single patch)?\n\n--\nlarsh\n"},{"id":"74795","messageId":"7vmynpdv7l.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"8c5c35580804190934q3ea27328j76418745b7e7665e@mail.gmail.com","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-04-20T04:08:30Z","receivedAt":"2008-04-20T04:08:30Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Lars Hjemli\" writes:\n\n> On Sat, Apr 19, 2008 at 10:19 AM, Junio C Hamano wrote:\n>> * lh/branch-merged (Fri Apr 18 18:30:15 2008 +0200) 3 commits\n>> - Add tests for `branch --[no-]merged`\n>> - git-branch.txt: compare --contains, --merged and --no-merged\n>> - git-branch: add support for --merged and --no-merged\n>\n> I notice that you moved the test script into t3201 while still adding\n> t3202, which probably wasn't your intent.\n>\n> Would you like me to resend the patches with your fixups to tests and\n> docs (and maybe even squash them into a single patch)?\n\nThanks, but it's easy enough for me to amend the tip of lh/branch-merged\nto drop t3202 and that should be sufficient.\n"},{"id":"74874","messageId":"480CBC76.7020303@nrlssc.navy.mil","threadId":"12603","inReplyTo":"7vhcdyfe9u.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2008-04-21T16:10:30Z","receivedAt":"2008-04-21T16:10:30Z","isPatch":false,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"Junio C Hamano wrote:\n\n> * bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit\n> - filter-branch.sh: support nearly proper tag name filtering\n> \n> Instead of discarding signed tags, this demotes them to simply annotated,\n> which is technically not that different from signed tags.\n\nI just want to point out that this patch is not exclusively about signed\ntags.\n\nThe patch is about retaining annotated tags rather than demoting them to\nlight-weight tag references as is done currently for _all_ annotated tags,\nsigned and unsigned. When rewriting signed tags, the signature is stripped\nso that we don't write a tag with a bogus signature.\n\n-brandon\n"},{"id":"74938","messageId":"7vabjm1a0q.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vhcdyfe9u.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-04-22T10:03:49Z","receivedAt":"2008-04-22T10:03:49Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nNote.\n\n Some commits on 'pu' have [comment] in front of their title, primarily\n to remind myself not to accidentally merge them to 'next' before\n issues are resolved. They will be amended either by replacement patch\n from the author, or when the issue raised on the list gets refuted\n convincingly enough to justify the original patch (in which case only\n the comment like \"[questionable???]\" will be removed without changing\n the tree of the commit).\n\nThe topics list the commits in reverse chronological order.\n\nA rough timeline from now on.\n\n * Discussion and review on new feature and enhancement patch series\n begins. Please resubmit things that you were cooking in your head\n during 1.5.5-rc period after cleaning up and retesting.\n\n * 1.5.6 merge window closes (2008-05-14).\n\n * Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).\n\n * 1.5.6 Final (2008-06-08).\n\n----------------------------------------------------------------\n[New Topics]\n\n* js/rebase-i-sequencer (Mon Apr 14 02:21:09 2008 +0200) 13 commits\n + Add option --preserve-tags\n + Teach rebase interactive the tag command\n + Add option --first-parent\n + Do rebase with preserve merges with advanced TODO list\n + Select all lines with fake-editor\n + Unify the length of $SHORT* and the commits in the TODO list\n + Teach rebase interactive the merge command\n + Move redo merge code in a function\n + Teach rebase interactive the reset command\n + Teach rebase interactive the mark command\n + Move cleanup code into it's own function\n + Don't append default merge message to -m message\n + fake-editor: output TODO list if unchanged\n\nThis may complement the proposed \"sequencer\" GSoC project.\n\n* db/clone-in-c (Thu Apr 17 19:32:43 2008 -0400) 8 commits\n - [mess] Build in clone\n - [strdup() and other clean-ups needed] Provide API access to\n init_db()\n - [waiting for response] Add a function to set a non-default work\n tree\n - Allow for having for_each_ref() list extra refs\n - Have a constant extern refspec for \"--tags\"\n - Add a library function to add an alternate to the alternates file\n - Add a lockfile function to append to a file\n - Mark the list of refs to fetch as const\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n* mk/color (Wed Apr 9 21:32:06 2008 +0200) 1 commit\n + Use color.ui variable in scripts too\n\n* jk/remote-default-show (Wed Apr 9 11:15:51 2008 -0400) 1 commit\n + git-remote: show all remotes with \"git remote show\"\n\n* jc/terminator-separator (Mon Apr 7 17:11:34 2008 -0700) 1 commit\n + log: teach \"terminator\" vs \"separator\" mode to \"--pretty=format\"\n\n* py/submodule (Sat Apr 12 23:05:33 2008 +0800) 3 commits\n + builtin-status: Add tests for submodule summary\n + builtin-status: submodule summary support\n + git-submodule summary: --for-status option\n\n* mv/defer-gc (Wed Apr 2 21:35:11 2008 +0200) 3 commits\n + contrib/hooks: add an example pre-auto-gc hook\n + Documentation/hooks: add pre-auto-gc hook\n + git-gc --auto: add pre-auto-gc hook\n\nA new hook to stop \"git gc --auto\" from running.\n\n* jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit\n + diff: make --dirstat binary-file safe\n\nThe current \"dirstat\" does totally wrong thing when the set of files\nchanged includes a binary one. This uses the same similarity evaluation\ncode as rename heuristics uses to treat text and binary the same way.\n\n* jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits\n + sha1-lookup: make selection of 'middle' less aggressive\n + sha1-lookup: more memory efficient search in sorted list of SHA-1\n\nMicro-optimization whose real world benefit is not proven, so let's prove\nit or revert it by giving it a bit more exposure.\n\n----------------------------------------------------------------\n[Actively Cooking]\n\n* pb/remote-mirror-config (Thu Apr 17 13:17:20 2008 +0200) 1 commit\n + Add a remote.*.mirror configuration option\n\n* ho/shared (Wed Apr 16 11:34:24 2008 +0300) 1 commit\n + Make core.sharedRepository more generic\n\n* lh/branch-merged (Fri Apr 18 18:30:15 2008 +0200) 3 commits\n + Add tests for `branch --[no-]merged`\n + git-branch.txt: compare --contains, --merged and --no-merged\n + git-branch: add support for --merged and --no-merged\n\n* jk/fetch-status (Wed Apr 9 20:11:52 2008 -0400) 1 commit\n + git-fetch: always show status of non-tracking-ref fetches\n\nThis changes reporting behaviour of one-shot \"git pull $url $branch\",\nwhich would affect long-time users in integrator role (that's you, Linus\n;-). Let's see if we hear anybody screaming.\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 6 commits\n - merge: remove deprecated summary and diffstat options and config\n variables\n + merge, pull: add '--(no-)log' command line option\n + fmt-merge-msg: add '--(no-)log' options and 'merge.log' config\n variable\n + add 'merge.stat' config variable\n + merge, pull: introduce '--(no-)stat' option\n + doc: moved merge.* config variables into separate merge-config.txt\n\nThe last one needs to be held back, as it actually removes the support for\nfeatures that the main part of the series deprecates, until 1.6.0 or\nlater.\n\n* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to.\n\n* jc/lstat (Sun Mar 30 12:39:25 2008 -0700) 2 commits\n + diff-files: mark an index entry we know is up-to-date as such\n + write_index(): optimize ce_smudge_racily_clean_entry() calls with\n CE_UPTODATE\n\nFurther reduce redundant lstat(2) calls during \"git status\" and other\ncommon operations.\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n + \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this. There recently was a problem report that had a scent of this\nissue which turned out to be a false alarm (it was about http-push which\ndoes not do the native pack protocol optimization and the reporter was\npushing into an empty repository which needs full transfer anyway).\n\n* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits\n + Make git-add behave more sensibly in a case-insensitive\n environment\n + When adding files to the index, add support for case-independent\n matches\n + Make unpack-tree update removed files before any updated files\n + Make branch merging aware of underlying case-insensitive\n filsystems\n + Add 'core.ignorecase' option\n + Make hash_name_lookup able to do case-independent lookups\n + Make \"index_name_exists()\" return the cache_entry it found\n + Move name hashing functions into a file of its own\n + Make unpack_trees_options bit flags actual bitfields\n\nThe beginning of case insensitive filesystem support, currently\nASCII-only.\n\n* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits\n + Teach GIT-VERSION-GEN about the .git file\n + Teach git-submodule.sh about the .git file\n + Teach resolve_gitlink_ref() about the .git file\n + Add platform-independent .git \"symlink\"\n\nThere was a GSoC project idea to enhance \"git submodule\" to take advantage\nof this facility to preserve the subrepository while switching between a\nrevision with a submodule and another before the submodule was bound to\nthe superproject, but it appears nobody took it.\n\n* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit\n + filter-branch.sh: support nearly proper tag name filtering\n\nInstead of discarding annotated and/or signed tags, this keeps them and\ndemotes the signed ones to simply annotated. It issues warning when it\ndoes this demotion. I think the behaviour is sensible.\n\n----------------------------------------------------------------\n[Dropped]\n\n* js/decorate (Mon Apr 7 14:41:12 2008 +0100) 2 commits\n . pretty=format: Add %d to show decoration\n . decorate: use \"const struct object\"\n\nPer author's lack of interest\n\n----------------------------------------------------------------\n[On Hold]\n\n* ap/svn (Tue Apr 15 21:04:18 2008 -0400) 3 commits\n - git-svn: add documentation for --add-author-from option.\n - git-svn: Add --add-author-from option.\n - git-svn: add documentation for --use-log-author option.\n\nEric requested a new set of tests for this series.\n\n* py/submodule-2 (Wed Apr 16 22:19:31 2008 +0800) 1 commit\n - git-submodule: Extract functions module_info and module_url\n\nI only managed to queue the first one so far.\n\nIt does not help motivating me reviewing the series that the overall tone\nof it is to ignore .git/config more and make .gitmodules take more active\nrole, either. I have already said number of times why that is not a good\nidea and why it is against the overall submodule design.\n\n* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits\n - tests: convert \"cmp\" and \"cmp -s\" to test_cmp\n - tests: test_cmp helper function\n\nThis one may be more elaborate, but Jeff's patch is much simpler.\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour by not using\nmerge-recursive, but unfortunately has stalled for some time now.\n\n* jc/lstat-debug (Thu Mar 27 16:56:53 2008 -0700) 1 commit\n - lstat: introduce a wrapper xlstat\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"74966","messageId":"46dff0320804220659j66dea3fehc2a9bdcdc0371025@mail.gmail.com","threadId":"12603","inReplyTo":"7vabjm1a0q.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Ping Yin","fromEmail":"pkufranky@gmail.com","sentAt":"2008-04-22T13:59:46Z","receivedAt":"2008-04-22T13:59:46Z","isPatch":false,"sender":{"key":"pkufranky@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5346?v=4"},"body":"On Tue, Apr 22, 2008 at 6:03 PM, Junio C Hamano wrote:\n> Here are the topics that have been cooking. Commits prefixed\n> with '-' are only in 'pu' while commits prefixed with '+' are\n> in 'next'.\n>\n\n>\n> * py/submodule-2 (Wed Apr 16 22:19:31 2008 +0800) 1 commit\n> - git-submodule: Extract functions module_info and module_url\n>\n>\n> I only managed to queue the first one so far.\n>\n> It does not help motivating me reviewing the series that the overall tone\n> of it is to ignore .git/config more and make .gitmodules take more active\n> role, either. I have already said number of times why that is not a good\n> idea and why it is against the overall submodule design.\n\nI summarize junio's points that says $GIT_DIR/config is authoritative.\n\n1. .gitmodules shouldn't be authoritative and should be just a hint\n to fill $GIT_DIR/config because\n\n a) url may be rewritten with different protocol, such as from\n \"http://\" to \"git://\"\n b) url may be total different between .gitmodules and\n $GIT_DIR/config\n\n2. When going back to an old HEAD of super project and do\n \"git submodule update\", the url recorded in .gitmodules may be\n stale or not existent anymore, so we should refer to\n $GIT_DIR/config for the right url.\n\n3. We can record what contents we've seen in the .gitmodules, so that\n we can give users a chance to adjust what is in $GIT_DIR/config\n when we notice the entry in .gitmodules has changed.\n\nAny others?\n\nHowever, i argue the fall back strategy (say fall back to .gitmodules\nwhen we can't find an entries in $GIT_DIR/config) doesn't break the\nauthority and isn't in contrast with the cases above. It just attachs\nmore importance to .gitmodules and can make the world better in most\ncases.\n\nFor 1.a, i think we can keep these entries in .gitmodules, and use\n\"url..insteadof = \" to override the urls.\n\nFor 1.b, i think this is a rare case. And we can override these urls\nin $GIT_DIR/config. However, in many cases, we havn't to do that.\n\nFor 2, i think it is also a rare case. And before going back, we can\noverride the urls in $GIT_DIR/config.\n\nFor 3, i havn't found a good way to do that. And it doesn't conflict\nwith the fall back strategy (say, wh\n\nSo, my conclusion\n\n* 1.b, 2 and 3 are all rare cases, and these cases don't conflict with\n the fall back strategy\n\n* 1.a is a usual case, and fallback + 'url insteadOf\" will make things\n better\n\n* The most common case is that most (even all) entries in .gitmodules\n are the same as entires in $GIT_DIR/config. So with fallback, we\n don't have to copy entries from .gitmodules to $GIT_DIR/config.\n\n* And, in a central environment, i think it's common that the super\n project and sub project use the same protocol. So if we use relative\n urls in .gitmodules, when changing the url protocol the super\n project, the urls in .gitmodules needn't change and can be\n dynamically expanded with the url of the super project (Of course,\n after applying the 2nd patch of this series)\n\n\n-- \nPing Yin\n"},{"id":"74972","messageId":"200804221655.11914.Josef.Weidendorfer@gmx.de","threadId":"12603","inReplyTo":"46dff0320804220659j66dea3fehc2a9bdcdc0371025@mail.gmail.com","subject":"Re: What's cooking in git.git (topics)","fromName":"Josef Weidendorfer","fromEmail":"josef.weidendorfer@gmx.de","sentAt":"2008-04-22T14:55:11Z","receivedAt":"2008-04-22T14:55:11Z","isPatch":false,"sender":{"key":"josef.weidendorfer@gmx.de","avatar":null},"body":"On Tuesday 22 April 2008, Ping Yin wrote:\n> On Tue, Apr 22, 2008 at 6:03 PM, Junio C Hamano wrote:\n> > It does not help motivating me reviewing the series that the overall tone\n> > of it is to ignore .git/config more and make .gitmodules take more active\n> > role, either. I have already said number of times why that is not a good\n> > idea and why it is against the overall submodule design.\n> \n> I summarize junio's points that says $GIT_DIR/config is authoritative.\n>\n> [...]\n> \n> Any others?\n\nA reason you did not mention is security:\nYou never want your .git/config to be changed behind your back, which\neffectivly is the case when using the versioned .gitmodules information\n(similar problem as with a .gitconfig in-tree).\n\nAnother one:\nFrom a design point of view, submodule URLs are project meta information\nunrelated to source history. So, actually, I think it was wrong to put\nsubmodule URLs (even hints only) into the versioned .gitmodules files (*).\n\nThe main reason for .gitmodules is to store submodule information which\nhas to be in sync with commits, such as a submodule name related to some\npath where the submodule happens to be checked out in a given commit, and\nalso related to some config entry holding the URL to allow for fetch/pull.\nThe idea is that submodules have an identity in the supermodule (in contrast\nto files in git), such that related configuration keeps valid when moving\nsubmodules around. This needs simultanous adjusting the path attribute in\n.gitmodules when a submodule is moved.\n\nJosef\n\n(*) IMHO, it would be far better if such project meta/policy information could\nbe in its own history (e.g. branch \"gitconfig\" to allow for easy propagation\nat clone/fetch time). However, any such configuration should need\nexplicit interaction by the user to take over project config into the\nlocal git config (e.g. via a \"git config merge gitconfig:config\" after\ninspecting via \"git show gitconfig:config\").\n"},{"id":"74989","messageId":"46dff0320804221013m2ff0320am31b7f8beb5f26f1b@mail.gmail.com","threadId":"12603","inReplyTo":"200804221655.11914.Josef.Weidendorfer@gmx.de","subject":"Re: What's cooking in git.git (topics)","fromName":"Ping Yin","fromEmail":"pkufranky@gmail.com","sentAt":"2008-04-22T17:13:48Z","receivedAt":"2008-04-22T17:13:48Z","isPatch":false,"sender":{"key":"pkufranky@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5346?v=4"},"body":"On Tue, Apr 22, 2008 at 10:55 PM, Josef Weidendorfer\n wrote:\n> On Tuesday 22 April 2008, Ping Yin wrote:\n> > On Tue, Apr 22, 2008 at 6:03 PM, Junio C Hamano wrote:\n>\n> > > It does not help motivating me reviewing the series that the overall tone\n> > > of it is to ignore .git/config more and make .gitmodules take more active\n> > > role, either. I have already said number of times why that is not a good\n> > > idea and why it is against the overall submodule design.\n> >\n> > I summarize junio's points that says $GIT_DIR/config is authoritative.\n> >\n> > [...]\n> >\n> > Any others?\n>\n> A reason you did not mention is security:\n> You never want your .git/config to be changed behind your back, which\n> effectivly is the case when using the versioned .gitmodules information\n> (similar problem as with a .gitconfig in-tree).\n\nAs discussed in another thread about in-tree .gitconfig, security\nissues only arise on limited configuration entries. However, there are\nno entries in .gitmodules falling into any of these entries.\n\n>\n> Another one:\n> From a design point of view, submodule URLs are project meta information\n> unrelated to source history. So, actually, I think it was wrong to put\n> submodule URLs (even hints only) into the versioned .gitmodules files (*).\n\nBut now it actually acts as hints and we don't find a better way. I\njust propose that the hints become the good default.\n\n>\n> The main reason for .gitmodules is to store submodule information which\n> has to be in sync with commits, such as a submodule name related to some\n> path where the submodule happens to be checked out in a given commit, and\n> also related to some config entry holding the URL to allow for fetch/pull.\n> The idea is that submodules have an identity in the supermodule (in contrast\n> to files in git), such that related configuration keeps valid when moving\n> submodules around. This needs simultanous adjusting the path attribute in\n> .gitmodules when a submodule is moved.\n\nIf we go back to a old HEAD or switch to another branch with changed\npath for a submodule, what should 'git submodule update' do?\nI think entries in .gitmodules should take precedence.\n\nSo url in $GIT_DIR/config is authoritative, and path in .gitmodules is\nauthoritative.\n\n\n\n\n-- \nPing Yin\n"},{"id":"74993","messageId":"alpine.DEB.1.00.0804221827330.4460@eeepc-johanness","threadId":"12603","inReplyTo":"46dff0320804221013m2ff0320am31b7f8beb5f26f1b@mail.gmail.com","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-04-22T17:28:37Z","receivedAt":"2008-04-22T17:28:37Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 23 Apr 2008, Ping Yin wrote:\n\n> If we go back to a old HEAD or switch to another branch with changed \n> path for a submodule, what should 'git submodule update' do? I think \n> entries in .gitmodules should take precedence.\n\nLiterally the most common reason for a _different_ .gitmodules in an older \nrevision is that the repository was moved to another machine.\n\nIn this case, your suggestion is actively wrong.\n\nCiao,\nDscho\n"},{"id":"74998","messageId":"200804222007.03439.Josef.Weidendorfer@gmx.de","threadId":"12603","inReplyTo":"46dff0320804221013m2ff0320am31b7f8beb5f26f1b@mail.gmail.com","subject":"Re: What's cooking in git.git (topics)","fromName":"Josef Weidendorfer","fromEmail":"josef.weidendorfer@gmx.de","sentAt":"2008-04-22T18:07:03Z","receivedAt":"2008-04-22T18:07:03Z","isPatch":false,"sender":{"key":"josef.weidendorfer@gmx.de","avatar":null},"body":"On Tuesday 22 April 2008, Ping Yin wrote:\n> > A reason you did not mention is security:\n> > You never want your .git/config to be changed behind your back, which\n> > effectivly is the case when using the versioned .gitmodules information\n> > (similar problem as with a .gitconfig in-tree).\n> \n> As discussed in another thread about in-tree .gitconfig, security\n> issues only arise on limited configuration entries. However, there are\n> no entries in .gitmodules falling into any of these entries.\n\nHmm... At least, it can be very annoying when git fetches data from repositories\nyou did not expect, only because submodule URLs change via this\nfallback mechanism. Perhaps it is a little far reached, but suppose a project\nchanges its URL, and the old one becomes occupied by a malicious person.\nThe problem is that the URL with the now malicious repository is bound in the\nhistory of the project. For sure, you do not want to fetch from that old repository\nby accident, after you did a checkout of an old commit. And there would be no\nway to protect other people from this malicious repository other than rewriting\nthe whole history.\n\n> > Another one:\n> > From a design point of view, submodule URLs are project meta information\n> > unrelated to source history. So, actually, I think it was wrong to put\n> > submodule URLs (even hints only) into the versioned .gitmodules files (*).\n> \n> But now it actually acts as hints and we don't find a better way. I\n> just propose that the hints become the good default.\n\nFor me this sounds like: Now that we have made this bad decision, it does\nnot matter to make it even worse.\n\nWhat was the motivation for this fallback mechanism?\n\nIn any way, it is preferable to always use the correct URL for submodules.\nThus, when the URL ever changes in the projects livetime (covered by\ngit history), you want to have the correct URL in your .git/config\n(not to accidently use the wrong URL when checking out an old commit).\nBut then, the fallback mechanism does not trigger anyway.\n\n> > The main reason for .gitmodules is to store submodule information which\n> > has to be in sync with commits, such as a submodule name related to some\n> > path where the submodule happens to be checked out in a given commit, and\n> > also related to some config entry holding the URL to allow for fetch/pull.\n> > The idea is that submodules have an identity in the supermodule (in contrast\n> > to files in git), such that related configuration keeps valid when moving\n> > submodules around. This needs simultanous adjusting the path attribute in\n> > .gitmodules when a submodule is moved.\n> \n> If we go back to a old HEAD or switch to another branch with changed\n> path for a submodule, what should 'git submodule update' do?\n> I think entries in .gitmodules should take precedence.\n\nOf course. It makes no sense to have submodule path configuration in .git/config,\nas it has to be in sync with the current commit. That has nothing to do with\nprecedence. The same is true for .gitattributes, for example.\n\n> So url in $GIT_DIR/config is authoritative, and path in .gitmodules is\n> authoritative.\n\nNo.\nThese are totally different types of configurations.\n\nJosef\n"},{"id":"75011","messageId":"200804222251.04559.barra_cuda@katamail.com","threadId":"12603","inReplyTo":"7vabjm1a0q.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2008-04-22T20:51:04Z","receivedAt":"2008-04-22T20:51:04Z","isPatch":false,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"On Tuesday 22 April 2008, Junio C Hamano wrote:\n> * mv/defer-gc (Wed Apr 2 21:35:11 2008 +0200) 3 commits\n>  + contrib/hooks: add an example pre-auto-gc hook\n>  + Documentation/hooks: add pre-auto-gc hook\n>  + git-gc --auto: add pre-auto-gc hook\n> \n> A new hook to stop \"git gc --auto\" from running.\n\nAbout \"git gc --auto\", there was a patch sometime ago:\n\n\t[PATCH] commit: resurrect \"gc --auto\" at the end\n\nhttp://marc.info/?l=git&m=120716427130606&w=2\n\nWas it dropped?\n"},{"id":"75020","messageId":"7vd4ohwhcj.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"200804222251.04559.barra_cuda@katamail.com","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-04-23T00:22:04Z","receivedAt":"2008-04-23T00:22:04Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michele Ballabio writes:\n\n> On Tuesday 22 April 2008, Junio C Hamano wrote:\n>> * mv/defer-gc (Wed Apr 2 21:35:11 2008 +0200) 3 commits\n>>  + contrib/hooks: add an example pre-auto-gc hook\n>>  + Documentation/hooks: add pre-auto-gc hook\n>>  + git-gc --auto: add pre-auto-gc hook\n>> \n>> A new hook to stop \"git gc --auto\" from running.\n>\n> About \"git gc --auto\", there was a patch sometime ago:\n>\n> \t[PATCH] commit: resurrect \"gc --auto\" at the end\n>\n> http://marc.info/?l=git&m=120716427130606&w=2\n>\n> Was it dropped?\n\nIn the thread, addition of an extra hook to \"gc --auto\" wasdiscussed. It\nwas judged conditionally Ok as long as nobody assumes \"gc --auto\" is\nultra-cheap. We used to have a \"gc --auto\" at the end of git-commit which\nviolated that condition, but we do not have that anymore.\n\nThe patch resurrects the behaviour that makes the extra hook possibly\nunacceptable again, dosn't it?\n"},{"id":"75025","messageId":"46dff0320804221827g6579919fid69d581256de90e1@mail.gmail.com","threadId":"12603","inReplyTo":"alpine.DEB.1.00.0804221827330.4460@eeepc-johanness","subject":"Re: What's cooking in git.git (topics)","fromName":"Ping Yin","fromEmail":"pkufranky@gmail.com","sentAt":"2008-04-23T01:27:37Z","receivedAt":"2008-04-23T01:27:37Z","isPatch":false,"sender":{"key":"pkufranky@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5346?v=4"},"body":"On Wed, Apr 23, 2008 at 1:28 AM, Johannes Schindelin\n wrote:\n> Hi,\n>\n>\n> On Wed, 23 Apr 2008, Ping Yin wrote:\n>\n> > If we go back to a old HEAD or switch to another branch with changed\n> > path for a submodule, what should 'git submodule update' do? I think\n> > entries in .gitmodules should take precedence.\n>\n> Literally the most common reason for a _different_ .gitmodules in an older\n> revision is that the repository was moved to another machine.\n>\n> In this case, your suggestion is actively wrong.\n>\nAnother common reason is the adjustment of repository directory in the\ncentral environment\nso i said *path*, not *url*. I agree what Josef said in the the\nfollowing reply: \"It makes no sense to have submodule path\nconfiguration in .git/config, as it has to be in sync with the current\ncommit\". So it should be bettter to store path info only in\n.gitmodules instead of $GIT_DIR/config\n\n\n-- \nPing Yin\n"},{"id":"75027","messageId":"46dff0320804221859x7641144fua34df89fcc686aa2@mail.gmail.com","threadId":"12603","inReplyTo":"200804222007.03439.Josef.Weidendorfer@gmx.de","subject":"Re: What's cooking in git.git (topics)","fromName":"Ping Yin","fromEmail":"pkufranky@gmail.com","sentAt":"2008-04-23T01:59:29Z","receivedAt":"2008-04-23T01:59:29Z","isPatch":false,"sender":{"key":"pkufranky@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5346?v=4"},"body":"On Wed, Apr 23, 2008 at 2:07 AM, Josef Weidendorfer\n wrote:\n> On Tuesday 22 April 2008, Ping Yin wrote:\n>\n> > > A reason you did not mention is security:\n> > > You never want your .git/config to be changed behind your back, which\n> > > effectivly is the case when using the versioned .gitmodules information\n> > > (similar problem as with a .gitconfig in-tree).\n> >\n> > As discussed in another thread about in-tree .gitconfig, security\n> > issues only arise on limited configuration entries. However, there are\n> > no entries in .gitmodules falling into any of these entries.\n>\n> Hmm... At least, it can be very annoying when git fetches data from repositories\n> you did not expect, only because submodule URLs change via this\n> fallback mechanism. Perhaps it is a little far reached, but suppose a project\n> changes its URL, and the old one becomes occupied by a malicious person.\n> The problem is that the URL with the now malicious repository is bound in the\n> history of the project.\n\nIt is always bound now without the fallback patch :)\n\n> For sure, you do not want to fetch from that old repository\n> by accident, after you did a checkout of an old commit. And there would be no\n> way to protect other people from this malicious repository other than rewriting\n> the whole history.\n\nI wonder how the *malicious* repository can hurt us since only the\ncommit recorded in commit of the super project will be checked out.\n\n>\n>\n> > > Another one:\n> > > From a design point of view, submodule URLs are project meta information\n> > > unrelated to source history. So, actually, I think it was wrong to put\n> > > submodule URLs (even hints only) into the versioned .gitmodules files (*).\n> >\n> > But now it actually acts as hints and we don't find a better way. I\n> > just propose that the hints become the good default.\n>\n> For me this sounds like: Now that we have made this bad decision, it does\n> not matter to make it even worse.\n\nI should be like: Now that we have made a bad decision (if it is), we\nhave to improve it to make life better before we can find a better\nsolution.\n\n>\n> What was the motivation for this fallback mechanism?\n>\n> In any way, it is preferable to always use the correct URL for submodules.\n> Thus, when the URL ever changes in the projects livetime (covered by\n> git history), you want to have the correct URL in your .git/config\n> (not to accidently use the wrong URL when checking out an old commit).\n> But then, the fallback mechanism does not trigger anyway.\n\nI havn't found yet how an incorrect URL can hurt us. The worst case i\ncan imagine is the failure of \"git submodule update\".\n\nTwo of the most common cases which can result in an incorrect/stale url is\n\n * the repository has been moved to another machine\n * the directory structure of upstream repositories has changed\n\nHowever, there are also cases that the old version of url in\n.gitmodules is correct.\n\nThink about the case that the reposotory maintainer has decided to\nreplace current submodule with a totoally different one. In this case,\nwhen back to the old HEAD, the url in .gitmodules is correct while url\nin $GIT_DIR/config is incorrect.\n\nSo, when error happens, we can't judge which url is correct. So just\nlet the user make the decision by refering the change history of\n.gitmodules or asking the repository maintainer.\n\n\n-- \nPing Yin\n"},{"id":"75028","messageId":"46dff0320804221903u6d5a3b51q171a89e8b920183a@mail.gmail.com","threadId":"12603","inReplyTo":"46dff0320804221827g6579919fid69d581256de90e1@mail.gmail.com","subject":"Re: What's cooking in git.git (topics)","fromName":"Ping Yin","fromEmail":"pkufranky@gmail.com","sentAt":"2008-04-23T02:03:16Z","receivedAt":"2008-04-23T02:03:16Z","isPatch":false,"sender":{"key":"pkufranky@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5346?v=4"},"body":"On Wed, Apr 23, 2008 at 9:27 AM, Ping Yin wrote:\n>\n> On Wed, Apr 23, 2008 at 1:28 AM, Johannes Schindelin\n> wrote:\n> > Hi,\n> >\n> >\n> > On Wed, 23 Apr 2008, Ping Yin wrote:\n> >\n> > > If we go back to a old HEAD or switch to another branch with changed\n> > > path for a submodule, what should 'git submodule update' do? I think\n> > > entries in .gitmodules should take precedence.\n> >\n> > Literally the most common reason for a _different_ .gitmodules in an older\n> > revision is that the repository was moved to another machine.\n> >\n> > In this case, your suggestion is actively wrong.\n> >\n> Another common reason is the adjustment of repository directory in the\n> central environment\n\nI'm wrong, this is the case that *url* changes.\n\n> so i said *path*, not *url*. I agree what Josef said in the the\n> following reply: \"It makes no sense to have submodule path\n> configuration in .git/config, as it has to be in sync with the current\n> commit\". So it should be bettter to store path info only in\n> .gitmodules instead of $GIT_DIR/config\n>\n\nThe case that *path* changes is the submodule is moved to a new path\nin some commit. But it is a very rare case.\n\n\n-- \nPing Yin\n"},{"id":"75039","messageId":"200804230936.55539.barra_cuda@katamail.com","threadId":"12603","inReplyTo":"7vd4ohwhcj.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2008-04-23T07:36:55Z","receivedAt":"2008-04-23T07:36:55Z","isPatch":false,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"On Wednesday 23 April 2008, Junio C Hamano wrote:\n> In the thread, addition of an extra hook to \"gc --auto\" wasdiscussed.  It\n> was judged conditionally Ok as long as nobody assumes \"gc --auto\" is\n> ultra-cheap.  We used to have a \"gc --auto\" at the end of git-commit which\n> violated that condition, but we do not have that anymore.\n> \n> The patch resurrects the behaviour that makes the extra hook possibly\n> unacceptable again, dosn't it?\n\nYes. I thought there was an unwanted change in behavior in git-commit.\nSorry for the noise.\n"},{"id":"75040","messageId":"alpine.WNT.1.10.0804231124270.2728@theodor","threadId":"12603","inReplyTo":"46dff0320804221859x7641144fua34df89fcc686aa2@mail.gmail.com","subject":"Re: What's cooking in git.git (topics)","fromName":"Fedor Sergeev","fromEmail":"fedor.sergeev@sun.com","sentAt":"2008-04-23T07:47:57Z","receivedAt":"2008-04-23T07:47:57Z","isPatch":false,"sender":{"key":"fedor.sergeev@sun.com","avatar":null},"body":"On Wed, 23 Apr 2008, Ping Yin wrote:\n> On Wed, Apr 23, 2008 at 2:07 AM, Josef Weidendorfer\n>> Hmm... At least, it can be very annoying when git fetches data from repositories\n>> you did not expect, only because submodule URLs change via this\n>> fallback mechanism. Perhaps it is a little far reached, but suppose a project\n>> changes its URL, and the old one becomes occupied by a malicious person.\n>> The problem is that the URL with the now malicious repository is bound in the\n>> history of the project.\n>\n> It is always bound now without the fallback patch :)\n>\n>> For sure, you do not want to fetch from that old repository\n>> by accident, after you did a checkout of an old commit. And there would be no\n>> way to protect other people from this malicious repository other than rewriting\n>> the whole history.\n>\n> I wonder how the *malicious* repository can hurt us since only the\n> commit recorded in commit of the super project will be checked out.\n\nIf one manages to hack on repository one can modify it enormous amount of \nways, including spoofing on SHA (providing wrong contents for it - does \ngit verify that when getting a pack?), utilizing bugs in git etc...\n\nI doubt somebody would spend that much of an effort but you know,\nyou can not be paranoid *enough* :)\n\nregards,\n Fedor.\n"},{"id":"75044","messageId":"46dff0320804230132u5ae94fd0x310bad0b8a145f42@mail.gmail.com","threadId":"12603","inReplyTo":"alpine.WNT.1.10.0804231124270.2728@theodor","subject":"Re: What's cooking in git.git (topics)","fromName":"Ping Yin","fromEmail":"pkufranky@gmail.com","sentAt":"2008-04-23T08:32:26Z","receivedAt":"2008-04-23T08:32:26Z","isPatch":false,"sender":{"key":"pkufranky@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5346?v=4"},"body":"On Wed, Apr 23, 2008 at 3:47 PM, Fedor Sergeev wrote:\n> On Wed, 23 Apr 2008, Ping Yin wrote:\n>\n> >\n> > On Wed, Apr 23, 2008 at 2:07 AM, Josef Weidendorfer\n> >\n> >\n> > > Hmm... At least, it can be very annoying when git fetches data from\n> repositories\n> > > you did not expect, only because submodule URLs change via this\n> > > fallback mechanism. Perhaps it is a little far reached, but suppose a\n> project\n> > > changes its URL, and the old one becomes occupied by a malicious\n> person.\n> > > The problem is that the URL with the now malicious repository is bound\n> in the\n> > > history of the project.\n> > >\n> >\n> > It is always bound now without the fallback patch :)\n> >\n> >\n> > > For sure, you do not want to fetch from that old repository\n> > > by accident, after you did a checkout of an old commit. And there would\n> be no\n> > > way to protect other people from this malicious repository other than\n> rewriting\n> > > the whole history.\n> > >\n> >\n> > I wonder how the *malicious* repository can hurt us since only the\n> > commit recorded in commit of the super project will be checked out.\n> >\n>\n> If one manages to hack on repository one can modify it enormous amount of\n> ways, including spoofing on SHA (providing wrong contents for it - does git\n> verify that when getting a pack?), utilizing bugs in git etc...\n\nDoable? I dunno.\n\n\n\n-- \nPing Yin\n"},{"id":"75045","messageId":"200804231047.41315.robin.rosenberg.lists@dewire.com","threadId":"12603","inReplyTo":"alpine.WNT.1.10.0804231124270.2728@theodor","subject":"Re: What's cooking in git.git (topics)","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2008-04-23T08:47:41Z","receivedAt":"2008-04-23T08:47:41Z","isPatch":false,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"onsdagen den 23 april 2008 09.47.57 skrev Fedor Sergeev:\n> If one manages to hack on repository one can modify it enormous amount of\n> ways, including spoofing on SHA (providing wrong contents for it - does\n> git verify that when getting a pack?), utilizing bugs in git etc...\n\nThe pack transfer protocol does not transfer the SHA of objects, only the \ncontents is transferred. The SHA-1 is (has to be since it is not sent) \nreconstructed on the receiving end.\n\n-- robin\n"},{"id":"75048","messageId":"alpine.WNT.1.10.0804231313550.2728@theodor","threadId":"12603","inReplyTo":"200804231047.41315.robin.rosenberg.lists@dewire.com","subject":"Re: What's cooking in git.git (topics)","fromName":"Fedor Sergeev","fromEmail":"fedor.sergeev@sun.com","sentAt":"2008-04-23T09:16:23Z","receivedAt":"2008-04-23T09:16:23Z","isPatch":false,"sender":{"key":"fedor.sergeev@sun.com","avatar":null},"body":"On Wed, 23 Apr 2008, Robin Rosenberg wrote:\n\n> onsdagen den 23 april 2008 09.47.57 skrev Fedor Sergeev:\n>> If one manages to hack on repository one can modify it enormous amount of\n>> ways, including spoofing on SHA (providing wrong contents for it - does\n>> git verify that when getting a pack?), utilizing bugs in git etc...\n>\n> The pack transfer protocol does not transfer the SHA of objects, only the\n> contents is transferred. The SHA-1 is (has to be since it is not sent)\n> reconstructed on the receiving end.\n\nThats nice. Then I agree its difficult to spoil superproject out of \nsubmodule other than it just does not checkout.\n\nregards,\n Fedor.\n"},{"id":"75258","messageId":"7vr6crj0jk.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vabjm1a0q.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-04-27T06:04:47Z","receivedAt":"2008-04-27T06:04:47Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nA rough timeline from now on.\n\n * Discussion and review on new feature and enhancement patch series\n begins. Please resubmit things that you were cooking in your head\n during 1.5.5-rc period after cleaning up and retesting.\n\n * 1.5.6 merge window closes (2008-05-14).\n\n * Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).\n\n * 1.5.6 Final (2008-06-08).\n\n----------------------------------------------------------------\n[New Topics]\n\n* db/learn-HEAD (Sat Apr 26 15:53:12 2008 -0400) 2 commits\n - Make ls-remote http://... list HEAD, like for git://...\n - Make walker.fetch_ref() take a struct ref.\n\n* cc/help (Fri Apr 25 08:25:41 2008 +0200) 5 commits\n - documentation: web--browse: add a note about konqueror\n - documentation: help: add info about \"man..cmd\" config var\n - help: use \"man..cmd\" as custom man viewer command\n - documentation: help: add \"man..path\" config variable\n - help: use man viewer path from \"man..path\" config var\n\n* jn/webfeed (Sun Apr 20 22:09:48 2008 +0200) 1 commit\n + gitweb: Use feed link according to current view\n\n* ar/batch-cat (Wed Apr 23 15:17:53 2008 -0400) 11 commits\n - git-svn: Speed up fetch\n - Git.pm: Add hash_and_insert_object and cat_blob\n - Git.pm: Add command_bidi_pipe and command_close_bidi_pipe\n - git-hash-object: Add --stdin-paths option\n - Add more tests for git hash-object\n - Move git-hash-object tests from t5303 to t1007\n - git-cat-file: Add --batch option\n - git-cat-file: Add --batch-check option\n - git-cat-file: Make option parsing a little more flexible\n - git-cat-file: Small refactor of cmd_cat_file\n - <> Add tests for git cat-file\n\n* lt/dirmatch-optim (Sat Apr 19 14:22:38 2008 -0700) 1 commit\n + Optimize match_pathspec() to avoid fnmatch()\n\n* dm/cherry-pick-s (Sat Apr 26 15:14:28 2008 -0500) 1 commit\n + Allow cherry-pick (and revert) to add signoff line\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n* ho/shared (Wed Apr 16 11:34:24 2008 +0300) 1 commit\n + Make core.sharedRepository more generic\n\n----------------------------------------------------------------\n[Will merge to \"master\" soonish]\n\n* pb/remote-mirror-config (Thu Apr 17 13:17:20 2008 +0200) 1 commit\n + Add a remote.*.mirror configuration option\n\n* lh/branch-merged (Fri Apr 18 18:30:15 2008 +0200) 3 commits\n + Add tests for `branch --[no-]merged`\n + git-branch.txt: compare --contains, --merged and --no-merged\n + git-branch: add support for --merged and --no-merged\n\n* jk/fetch-status (Wed Apr 9 20:11:52 2008 -0400) 1 commit\n + git-fetch: always show status of non-tracking-ref fetches\n\nThis changes reporting behaviour of one-shot \"git pull $url $branch\",\nwhich would affect long-time users in integrator role (that's you, Linus\n;-). Let's see if we hear anybody screaming.\n\n* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits\n + Teach GIT-VERSION-GEN about the .git file\n + Teach git-submodule.sh about the .git file\n + Teach resolve_gitlink_ref() about the .git file\n + Add platform-independent .git \"symlink\"\n\nThere was a GSoC project idea to enhance \"git submodule\" to take advantage\nof this facility to preserve the subrepository while switching between a\nrevision with a submodule and another before the submodule was bound to\nthe superproject, but it appears nobody took it.\n\n* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit\n + filter-branch.sh: support nearly proper tag name filtering\n\nInstead of discarding annotated and/or signed tags, this keeps them and\ndemotes the signed ones to simply annotated. It issues warning when it\ndoes this demotion. I think the behaviour is sensible.\n\n* jc/lstat (Sun Mar 30 12:39:25 2008 -0700) 2 commits\n + diff-files: mark an index entry we know is up-to-date as such\n + write_index(): optimize ce_smudge_racily_clean_entry() calls with\n CE_UPTODATE\n\nFurther reduce redundant lstat(2) calls during \"git status\" and other\ncommon operations.\n\n----------------------------------------------------------------\n[Actively Cooking]\n\n* js/rebase-i-sequencer (Fri Apr 25 22:50:53 2008 -0700) 14 commits\n + rebase -i: update the implementation of 'mark' command\n + Add option --preserve-tags\n + Teach rebase interactive the tag command\n + Add option --first-parent\n + Do rebase with preserve merges with advanced TODO list\n + Select all lines with fake-editor\n + Unify the length of $SHORT* and the commits in the TODO list\n + Teach rebase interactive the merge command\n + Move redo merge code in a function\n + Teach rebase interactive the reset command\n + Teach rebase interactive the mark command\n + Move cleanup code into it's own function\n + Don't append default merge message to -m message\n + fake-editor: output TODO list if unchanged\n\nThis may complement the proposed \"sequencer\" GSoC project.\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 6 commits\n - merge: remove deprecated summary and diffstat options and config\n variables\n + merge, pull: add '--(no-)log' command line option\n + fmt-merge-msg: add '--(no-)log' options and 'merge.log' config\n variable\n + add 'merge.stat' config variable\n + merge, pull: introduce '--(no-)stat' option\n + doc: moved merge.* config variables into separate merge-config.txt\n\nThe last one needs to be held back, as it actually removes the support for\nfeatures that the main part of the series deprecates, until 1.6.0 or\nlater.\n\n* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to.\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n + \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this. There recently was a problem report that had a scent of this\nissue which turned out to be a false alarm (it was about http-push which\ndoes not do the native pack protocol optimization and the reporter was\npushing into an empty repository which needs full transfer anyway).\n\n* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits\n + Make git-add behave more sensibly in a case-insensitive\n environment\n + When adding files to the index, add support for case-independent\n matches\n + Make unpack-tree update removed files before any updated files\n + Make branch merging aware of underlying case-insensitive\n filsystems\n + Add 'core.ignorecase' option\n + Make hash_name_lookup able to do case-independent lookups\n + Make \"index_name_exists()\" return the cache_entry it found\n + Move name hashing functions into a file of its own\n + Make unpack_trees_options bit flags actual bitfields\n\nThe beginning of case insensitive filesystem support, currently\nASCII-only.\n\n----------------------------------------------------------------\n[Dropped]\n\n\n----------------------------------------------------------------\n[On Hold]\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* db/clone-in-c (Thu Apr 17 19:32:43 2008 -0400) 8 commits\n - [mess] Build in clone\n - [strdup() and other clean-ups needed] Provide API access to\n init_db()\n - [waiting for response] Add a function to set a non-default work\n tree\n - Allow for having for_each_ref() list extra refs\n - Have a constant extern refspec for \"--tags\"\n - Add a library function to add an alternate to the alternates file\n - Add a lockfile function to append to a file\n - Mark the list of refs to fetch as const\n\nThere were a few comments and suggestions to the ones near the tip that\nneed to be addressed. Earlier ones look Ok.\n\n* ap/svn (Tue Apr 15 21:04:18 2008 -0400) 3 commits\n - git-svn: add documentation for --add-author-from option.\n - git-svn: Add --add-author-from option.\n - git-svn: add documentation for --use-log-author option.\n\nEric requested a new set of tests for this series.\n\n* py/submodule-2 (Wed Apr 16 22:19:31 2008 +0800) 1 commit\n - git-submodule: Extract functions module_info and module_url\n\nNot going well.\n\n* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits\n - tests: convert \"cmp\" and \"cmp -s\" to test_cmp\n - tests: test_cmp helper function\n\nThis one may be more elaborate, but Jeff's patch is much simpler.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour by not using\nmerge-recursive, but unfortunately has stalled for some time now.\n\n* jc/lstat-debug (Thu Mar 27 16:56:53 2008 -0700) 1 commit\n - lstat: introduce a wrapper xlstat\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"75268","messageId":"46dff0320804262344h5c8651ednb11e913a2b800eb4@mail.gmail.com","threadId":"12603","inReplyTo":"7vr6crj0jk.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Ping Yin","fromEmail":"pkufranky@gmail.com","sentAt":"2008-04-27T06:44:32Z","receivedAt":"2008-04-27T06:44:32Z","isPatch":false,"sender":{"key":"pkufranky@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5346?v=4"},"body":"On Sun, Apr 27, 2008 at 2:04 PM, Junio C Hamano wrote:\n>\n> * py/submodule-2 (Wed Apr 16 22:19:31 2008 +0800) 1 commit\n> - git-submodule: Extract functions module_info and module_url\n>\n> Not going well.\n>\n\nHmm, i wonder how this series can go well. Or this series is totoally\nbad and should be discarded.\n\n\nPing Yin\n"},{"id":"76179","messageId":"7vmyn4hr8f.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vr6crj0jk.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-06T06:38:24Z","receivedAt":"2008-05-06T06:38:24Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nIt's been a while since the last issue of this series. I've been\nswamped, and haven't had a chance to spend enough time on reviewing and\naccepting patches.\n\nA good news is that the tip of 'pu' tonight passes all the test --- it has\nbeen broken for some time.\n\nA rough timeline from now on.\n\n * Discussion and review on new feature and enhancement patch series\n begins. Please resubmit things that you were cooking in your head\n during 1.5.5-rc period after cleaning up and retesting.\n\n * 1.5.6 merge window closes (2008-05-14).\n\n * Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).\n\n * 1.5.6 Final (2008-06-08).\n\n----------------------------------------------------------------\n[New Topics]\n\n* bd/tests (Sun May 4 01:38:00 2008 -0400) 10 commits\n + Rename the test trash directory to contain spaces.\n + Fix tests breaking when checkout path contains shell\n metacharacters\n + Don't use the 'export NAME=value' in the test scripts.\n + lib-git-svn.sh: Fix quoting issues with paths containing shell\n metacharacters\n + test-lib.sh: Fix some missing path quoting\n + Use test_set_editor in t9001-send-email.sh\n + test-lib.sh: Add a test_set_editor function to safely set $VISUAL\n + git-send-email.perl: Handle shell metacharacters in $EDITOR\n properly\n + config.c: Escape backslashes in section names properly\n + git-rebase.sh: Fix --merge --abort failures when path contains\n whitespace\n\nMaking sure the tools quote paths correctly and work inside a directory\nwhose pathname contains whitespace. Thanks Bryan, and thanks J6t for\nreviewing and testing.\n\n* np/pack (Fri May 2 15:11:51 2008 -0400) 7 commits\n + pack-objects: fix early eviction for max depth delta objects\n + pack-objects: allow for early delta deflating\n + pack-objects: move compression code in a separate function\n + pack-objects: clean up write_object() a bit\n + pack-objects: simplify the condition associated with --all-\n progress\n + pack-objects: remove some double negative logic\n + pack-objects: small cleanup\n\nEvery time Nico tweaks pack generation, something good comes out ;-).\n\n* py/diff-submodule (Sat May 3 17:24:28 2008 -0700) 5 commits\n + is_racy_timestamp(): do not check timestamp for gitlinks\n + diff-lib.c: rename check_work_tree_entity()\n + diff: a submodule not checked out is not modified\n + Add t7506 to test submodule related functions for git-status\n + t4027: test diff for submodule with empty directory\n\nA submodule that is not checked out is not modified, but was mistaken as\nbeing removed. Thanks Ping for tests and fixes.\n\n* cc/hooks-doc (Fri May 2 05:30:47 2008 +0200) 1 commit\n - Documentation: rename \"hooks.txt\" to \"githooks.txt\" and make it a\n man page\n\nI've looked at but not applied most of the patches in the series that\nbuilt on top of this. I think it probably is a good goal to make\neverything _accessible_ as manual pages, but at the same time I do not\nexactly like the HTML rendered results of material that are not really\nmanual pages. E.g. \"Everyday\" looks much worse to me.\n\nAt least, the categorization of sections 1/5/7 should be straightened\nout. diffcore is not about \"file format\" at all and do not belong to\nsection 5, for example.\n\n* pb/push (Mon Apr 28 11:32:12 2008 -0400) 1 commit\n - add special \"matching refs\" refspec\n\nThis first patch is a good enhancement without hurting any existing users.\nWe need a staged introduction of the second and later patches, and many\npeople including me did not agree the later ones in the series are\ndesirable.\n\n* mv/format-cc (Tue Apr 29 12:56:47 2008 +0200) 3 commits\n + Add tests for sendemail.cc configuration variable\n + git-send-email: add a new sendemail.cc configuration variable\n + git-format-patch: add a new format.cc configuration variable\n\n* as/graph (Mon May 5 00:57:03 2008 -0700) 4 commits\n - graph API: eliminate unnecessary indentation\n - log and rev-list: add --graph option\n - Add history graph API\n - revision API: split parent rewriting and parent printing options\n\nDraw \"tig 'g'\" graph without tig ;-)\n\n* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 4 commits\n - diff: enable \"too large a rename\" warning when -M/-C is explicitly\n asked for\n + diff: make \"too many files\" rename warning optional\n + bump rename limit defaults\n + add merge.renamelimit config option\n\nThe documentation part of this series partly depends on another series,\nbut I am expecting both to graduate smoothly to 'master' reasonably soon.\n\n* sv/first-parent (Sun Apr 27 19:32:46 2008 +0200) 1 commit\n + Simplify and fix --first-parent implementation\n\n* gp/bisect-fix (Mon May 5 07:43:00 2008 +0000) 1 commit\n + git-bisect.sh: don't accidentally override existing branch\n \"bisect\"\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n* pb/remote-mirror-config (Thu Apr 17 13:17:20 2008 +0200) 1 commit\n + Add a remote.*.mirror configuration option\n\n* lh/branch-merged (Fri Apr 18 18:30:15 2008 +0200) 3 commits\n + Add tests for `branch --[no-]merged`\n + git-branch.txt: compare --contains, --merged and --no-merged\n + git-branch: add support for --merged and --no-merged\n\n* jk/fetch-status (Wed Apr 9 20:11:52 2008 -0400) 1 commit\n + git-fetch: always show status of non-tracking-ref fetches\n\nThis changes reporting behaviour of one-shot \"git pull $url $branch\",\nwhich would affect long-time users in integrator role (that's you, Linus\n;-). Let's see if we hear anybody screaming.\n\n* lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits\n + Teach GIT-VERSION-GEN about the .git file\n + Teach git-submodule.sh about the .git file\n + Teach resolve_gitlink_ref() about the .git file\n + Add platform-independent .git \"symlink\"\n\nThere was a GSoC project idea to enhance \"git submodule\" to take advantage\nof this facility to preserve the subrepository while switching between a\nrevision with a submodule and another before the submodule was bound to\nthe superproject, but it appears nobody took it.\n\n* bc/filter-branch (Wed Mar 26 10:47:09 2008 -0500) 1 commit\n + filter-branch.sh: support nearly proper tag name filtering\n\nInstead of discarding annotated and/or signed tags, this keeps them and\ndemotes the signed ones to simply annotated. It issues warning when it\ndoes this demotion. I think the behaviour is sensible.\n\n* jc/lstat (Sun Mar 30 12:39:25 2008 -0700) 2 commits\n + diff-files: mark an index entry we know is up-to-date as such\n + write_index(): optimize ce_smudge_racily_clean_entry() calls with\n CE_UPTODATE\n\nFurther reduce redundant lstat(2) calls during \"git status\" and other\ncommon operations.\n\n----------------------------------------------------------------\n[Will merge to \"master\" soonish]\n\n* lt/dirmatch-optim (Sat Apr 19 14:22:38 2008 -0700) 1 commit\n + Optimize match_pathspec() to avoid fnmatch()\n\n* dm/cherry-pick-s (Sat Apr 26 15:14:28 2008 -0500) 1 commit\n + Allow cherry-pick (and revert) to add signoff line\n\n* cc/help (Fri Apr 25 08:25:41 2008 +0200) 5 commits\n + documentation: web--browse: add a note about konqueror\n + documentation: help: add info about \"man..cmd\" config var\n + help: use \"man..cmd\" as custom man viewer command\n + documentation: help: add \"man..path\" config variable\n + help: use man viewer path from \"man..path\" config var\n\n* jn/webfeed (Sun Apr 20 22:09:48 2008 +0200) 1 commit\n + gitweb: Use feed link according to current view\n\n----------------------------------------------------------------\n[Actively Cooking]\n\n* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits\n + Use perl instead of tac\n + Fix t3404 assumption that `wc -l` does not use whitespace.\n + rebase -i: Use : in expr command instead of match.\n + rebase -i: update the implementation of 'mark' command\n + Add option --preserve-tags\n + Teach rebase interactive the tag command\n + Add option --first-parent\n + Do rebase with preserve merges with advanced TODO list\n + Select all lines with fake-editor\n + Unify the length of $SHORT* and the commits in the TODO list\n + Teach rebase interactive the merge command\n + Move redo merge code in a function\n + Teach rebase interactive the reset command\n + Teach rebase interactive the mark command\n + Move cleanup code into it's own function\n + Don't append default merge message to -m message\n + fake-editor: output TODO list if unchanged\n\nThis may complement the proposed \"sequencer\" GSoC project. Dscho seems to\nhave quite a strong objection to the 'mark' syntax and mechanism being\nunnecessarily complex. Let's wait and see if a less complex but equally\nexpressive alternative materializes...\n\n* db/learn-HEAD (Sat Apr 26 15:53:12 2008 -0400) 2 commits\n + Make ls-remote http://... list HEAD, like for git://...\n + Make walker.fetch_ref() take a struct ref.\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 6 commits\n - merge: remove deprecated summary and diffstat options and config\n variables\n + merge, pull: add '--(no-)log' command line option\n + fmt-merge-msg: add '--(no-)log' options and 'merge.log' config\n variable\n + add 'merge.stat' config variable\n + merge, pull: introduce '--(no-)stat' option\n + doc: moved merge.* config variables into separate merge-config.txt\n\nThe last one needs to be held back, as it actually removes the support for\nfeatures that the main part of the series deprecates, until 1.6.0 or\nlater.\n\n* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to.\nThis may help a GSoC project that wants to gather statistical overview of\nthe history.\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n + \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this. There recently was a problem report that had a scent of this\nissue which turned out to be a false alarm (it was about http-push which\ndoes not do the native pack protocol optimization and the reporter was\npushing into an empty repository which needs full transfer anyway).\n\n* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits\n + Make git-add behave more sensibly in a case-insensitive\n environment\n + When adding files to the index, add support for case-independent\n matches\n + Make unpack-tree update removed files before any updated files\n + Make branch merging aware of underlying case-insensitive\n filsystems\n + Add 'core.ignorecase' option\n + Make hash_name_lookup able to do case-independent lookups\n + Make \"index_name_exists()\" return the cache_entry it found\n + Move name hashing functions into a file of its own\n + Make unpack_trees_options bit flags actual bitfields\n\nThe beginning of case insensitive filesystem support, currently\nASCII-only.\n\n----------------------------------------------------------------\n[Dropped]\n\n* ap/svn (Tue Apr 15 21:04:18 2008 -0400) 3 commits\n . git-svn: add documentation for --add-author-from option.\n . git-svn: Add --add-author-from option.\n . git-svn: add documentation for --use-log-author option.\n\nEric requested a new set of tests for this series which never came. I am\nstill holding onto the tip of the topic in case we can resurrect it, but\nit is not merged to 'pu'.\n\n----------------------------------------------------------------\n[On Hold]\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* db/clone-in-c (Sun Apr 27 13:39:30 2008 -0400) 8 commits\n - Build in clone\n - Provide API access to init_db()\n - Add a function to set a non-default work tree\n - Allow for having for_each_ref() list extra refs\n - Have a constant extern refspec for \"--tags\"\n - Add a library function to add an alternate to the alternates file\n - Add a lockfile function to append to a file\n - Mark the list of refs to fetch as const\n\nI'd really want this in 1.5.6; will merge to 'next' after giving a final\npass sometime this week.\n\n* ar/batch-cat (Wed Apr 23 15:17:47 2008 -0400) 5 commits\n - git-cat-file: Add --batch option\n - git-cat-file: Add --batch-check option\n - git-cat-file: Make option parsing a little more flexible\n - git-cat-file: Small refactor of cmd_cat_file\n - Add tests for git cat-file\n\nI fixed up the problematic shell script in the first patch in the series\nbut later one introduced the same problematic constructs in another file,\nat which point I gave up and discarded the rest. At least it now passes\nits own testsuite without breaking others.\n\n* jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits\n - tests: convert \"cmp\" and \"cmp -s\" to test_cmp\n - tests: test_cmp helper function\n\nThis one may be more elaborate, but Jeff's patch is much simpler.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour by not using\nmerge-recursive, but unfortunately has stalled for some time now.\n\n* jc/lstat-debug (Thu Mar 27 16:56:53 2008 -0700) 1 commit\n - lstat: introduce a wrapper xlstat\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"76800","messageId":"7vr6c7xjqw.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vmyn4hr8f.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-12T22:03:51Z","receivedAt":"2008-05-12T22:03:51Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> [Dropped]\n>\n> * ap/svn (Tue Apr 15 21:04:18 2008 -0400) 3 commits\n> . git-svn: add documentation for --add-author-from option.\n> . git-svn: Add --add-author-from option.\n> . git-svn: add documentation for --use-log-author option.\n>\n> Eric requested a new set of tests for this series which never came. I am\n> still holding onto the tip of the topic in case we can resurrect it, but\n> it is not merged to 'pu'.\n\nI usually try hard not to do this kind of thing as it would encourage a\nmisconception that I'll tie any and all loose ends (which I obviously do\nnot have infinite amount of time and energy that is necessary), but I've\ndecided to add a skeleton for necessary tests to get the ball rolling.\n\nHere is a sample output from the test sequence (the log message from the\nlast one):\n\n commit 0bc699cbd72810f85a0200c7197022b50e8298ed\n Author: A U Thor \n Date: Mon May 12 21:28:26 2008 +0000\n\n fourth\n\n From: A U Thor \n\n\n git-svn-id: file:///git.git/t/trash directory/svnrepo@4 23bf1e2a-19bf-478a-b023-e66a9e40421e\n\nI am not sure if adding the \"From: \" line as a trailer, with two blank\nline after it before the git-svn-id line, is the intended format for the\nfinal log message. Maybe it is meant to go before the commit log message\nwith a blank line after it. Maybe it is meant to be a trailer, one blank\nline before and after it and then git-svn-id line (in whcih case we have\none blank after it too many). I genuinely do not know what is intended.\n\nIf this is the intended output, please say so. Otherwise please fix it as\nneeded, and add tests for the final format specification as well, so that\nlater changes will not break it.\n\nThanks.\n\n-- >8 --\nFrom: Junio C Hamano \nDate: Mon, 12 May 2008 14:53:40 -0700\nSubject: [PATCH] git-svn: add test for --add-author-from and --use-log-author\n\nSigned-off-by: Junio C Hamano \n---\n t/t9122-git-svn-author.sh | 73 +++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 73 insertions(+), 0 deletions(-)\n create mode 100755 t/t9122-git-svn-author.sh\n\ndiff --git a/t/t9122-git-svn-author.sh b/t/t9122-git-svn-author.sh\nnew file mode 100755\nindex 0000000..d9a784b\n--- /dev/null\n+++ b/t/t9122-git-svn-author.sh\n@@ -0,0 +1,73 @@\n+#!/bin/sh\n+\n+test_description='git svn authorship'\n+. ./lib-git-svn.sh\n+\n+test_expect_success 'setup svn repository' '\n+\tsvn checkout \"$svnrepo\" work.svn &&\n+\t(\n+\t\tcd work.svn &&\n+\t\techo >file\n+\t\tsvn add file\n+\t\tsvn commit -m \"first commit\" file\n+\t)\n+\n+'\n+\n+test_expect_success 'interact with it via git-svn' '\n+\n+\tmkdir work.git &&\n+\t(\n+\t\tcd work.git &&\n+\t\tgit svn init \"$svnrepo\"\n+\t\tgit svn fetch &&\n+\n+\t\techo modification >file &&\n+\t\ttest_tick &&\n+\t\tgit commit -a -m second &&\n+\n+\t\ttest_tick &&\n+\t\tgit svn dcommit &&\n+\n+\t\techo \"further modification\" >file &&\n+\t\ttest_tick &&\n+\t\tgit commit -a -m third &&\n+\n+\t\ttest_tick &&\n+\t\tgit svn --add-author-from dcommit &&\n+\n+\t\techo \"yet further modification\" >file &&\n+\t\ttest_tick &&\n+\t\tgit commit -a -m fourth &&\n+\n+\t\ttest_tick &&\n+\t\tgit svn --add-author-from --use-log-author dcommit &&\n+\n+\t\tgit log &&\n+\n+\t\tgit show -s HEAD^^ >../actual.2 &&\n+\t\tgit show -s HEAD^ >../actual.3 &&\n+\t\tgit show -s HEAD >../actual.4\n+\n+\t) &&\n+\n+\t# Make sure that --add-author-from without --use-log-author\n+\t# did not affect the authorship information\n+\tmyself=$(grep \"^Author: \" actual.2) &&\n+\tunaffected=$(grep \"^Author: \" actual.3) &&\n+\ttest \"z$myself\" = \"z$unaffected\" &&\n+\n+\t# Make sure lack of --add-author-from did not add cruft\n+\t! grep \"^ From: A U Thor \" actual.2 &&\n+\n+\t# Make sure --add-author-from added cruft\n+\tgrep \"^ From: A U Thor \" actual.3 &&\n+\tgrep \"^ From: A U Thor \" actual.4 &&\n+\n+\t# Make sure --add-author-from with --use-log-author affected\n+\t# the authorship information\n+\tgrep \"^Author: A U Thor \" actual.4\n+\n+'\n+\n+test_done\n-- \n1.5.5.1.328.g8abfd\n"},{"id":"76813","messageId":"7vk5hzvzp6.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vr6c7xjqw.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-13T00:02:13Z","receivedAt":"2008-05-13T00:02:13Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Adam, I am very sorry, but the message was misdirected.\n\nI'm resending it now to ask for comments from Avery.\n"},{"id":"76997","messageId":"7vmymsjz6x.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vmyn4hr8f.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-14T22:30:46Z","receivedAt":"2008-05-14T22:30:46Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nIt's been a while since the last issue of this series. I've been\nswamped, and haven't had a chance to spend enough time on reviewing and\naccepting patches.\n\nA rough timeline from now on.\n\n * Will merge the remaining topics already on 'next', and perhaps accept a\n handful minor topics that are not yet in.\n\n * Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).\n\n * 1.5.6 Final (2008-06-08).\n\n----------------------------------------------------------------\n[New Topics]\n\n* bc/tag (Fri May 9 00:03:35 2008 -0500) 3 commits\n - ident.c: New function valid_ident for checking ident string\n formatting\n - Make mktag a builtin\n - mktag.c: adjust verify_tag parameters\n\nI stopped looking at this after hitting an unappliable patch --- will need\nto take a look at it again.\n\n* js/config-cb (Wed May 14 18:46:53 2008 +0100) 1 commit\n - Provide git_config with a callback-data parameter\n\nThis needs to wait until most of the other things graduate for 1.5.6;\nluckily, unlike the other \"path-list\" changes, misconversions is much\neasier to catch for this change and I am not worried about it.\n\n* ds/branch-auto-rebase (Sat May 10 15:36:29 2008 -0700) 1 commit\n + Allow tracking branches to set up rebase by default.\n\nFor 1.5.6.\n\n* bc/repack (Wed May 14 01:33:53 2008 -0400) 5 commits\n + let pack-objects do the writing of unreachable objects as loose\n objects\n + add a force_object_loose() function\n + builtin-gc.c: deprecate --prune, it now really has no effect\n + git-gc: always use -A when manually repacking\n + repack: modify behavior of -A option to leave unreferenced objects\n unpacked\n\nFor 1.5.6.\n\n* sp/ignorecase (Sun May 11 18:16:42 2008 +0200) 4 commits\n - t0050: Add test for case insensitive add\n - t0050: Set core.ignorecase case to activate case insensitivity\n - t0050: Test autodetect core.ignorecase\n - git-init: autodetect core.ignorecase\n\nThis unfortunately seems to break on natively case sensitive filesystems.\n\n* ar/add-unreadable (Mon May 12 19:59:23 2008 +0200) 5 commits\n + Add a config option to ignore errors for git-add\n + Add a test for git-add --ignore-errors\n + Add --ignore-errors to git-add to allow it to skip files with read\n errors\n + Extend interface of add_files_to_cache to allow ignore indexing\n errors\n + Make the exit code of add_file_to_index actually useful\n\n* jc/diff-words (Sun May 11 12:33:48 2008 -0700) 2 commits\n - diff --color-words: a bit of tweak\n - diff --color-words reimplementation\n\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n* lt/case-insensitive (Sat Mar 22 14:22:44 2008 -0700) 9 commits\n + Make git-add behave more sensibly in a case-insensitive\n environment\n + When adding files to the index, add support for case-independent\n matches\n + Make unpack-tree update removed files before any updated files\n + Make branch merging aware of underlying case-insensitive\n filsystems\n + Add 'core.ignorecase' option\n + Make hash_name_lookup able to do case-independent lookups\n + Make \"index_name_exists()\" return the cache_entry it found\n + Move name hashing functions into a file of its own\n + Make unpack_trees_options bit flags actual bitfields\n\nThe beginning of case insensitive filesystem support, currently\nASCII-only.\n\n* db/learn-HEAD (Sat Apr 26 15:53:12 2008 -0400) 2 commits\n + Make ls-remote http://... list HEAD, like for git://...\n + Make walker.fetch_ref() take a struct ref.\n\n* cc/help (Fri Apr 25 08:25:41 2008 +0200) 5 commits\n + documentation: web--browse: add a note about konqueror\n + documentation: help: add info about \"man..cmd\" config var\n + help: use \"man..cmd\" as custom man viewer command\n + documentation: help: add \"man..path\" config variable\n + help: use man viewer path from \"man..path\" config var\n\n* dm/cherry-pick-s (Sat Apr 26 15:14:28 2008 -0500) 1 commit\n + Allow cherry-pick (and revert) to add signoff line\n\n* lt/dirmatch-optim (Sat Apr 19 14:22:38 2008 -0700) 1 commit\n + Optimize match_pathspec() to avoid fnmatch()\n\n* jn/webfeed (Sun Apr 20 22:09:48 2008 +0200) 1 commit\n + gitweb: Use feed link according to current view\n\n* gp/bisect-fix (Mon May 5 07:43:00 2008 +0000) 1 commit\n + git-bisect.sh: don't accidentally override existing branch\n \"bisect\"\n\n* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 3 commits\n + diff: make \"too many files\" rename warning optional\n + bump rename limit defaults\n + add merge.renamelimit config option\n\n* py/diff-submodule (Sat May 3 17:24:28 2008 -0700) 5 commits\n + is_racy_timestamp(): do not check timestamp for gitlinks\n + diff-lib.c: rename check_work_tree_entity()\n + diff: a submodule not checked out is not modified\n + Add t7506 to test submodule related functions for git-status\n + t4027: test diff for submodule with empty directory\n\nA submodule that is not checked out is not modified, but was mistaken as\nbeing removed. Thanks Ping for tests and fixes.\n\n* cc/hooks-doc (Fri May 2 05:30:47 2008 +0200) 1 commit\n + Documentation: rename \"hooks.txt\" to \"githooks.txt\" and make it a\n man page\n\n* mv/format-cc (Tue Apr 29 12:56:47 2008 +0200) 3 commits\n + Add tests for sendemail.cc configuration variable\n + git-send-email: add a new sendemail.cc configuration variable\n + git-format-patch: add a new format.cc configuration variable\n\n* bd/tests (Sun May 4 01:38:00 2008 -0400) 10 commits\n + Rename the test trash directory to contain spaces.\n + Fix tests breaking when checkout path contains shell\n metacharacters\n + Don't use the 'export NAME=value' in the test scripts.\n + lib-git-svn.sh: Fix quoting issues with paths containing shell\n metacharacters\n + test-lib.sh: Fix some missing path quoting\n + Use test_set_editor in t9001-send-email.sh\n + test-lib.sh: Add a test_set_editor function to safely set $VISUAL\n + git-send-email.perl: Handle shell metacharacters in $EDITOR\n properly\n + config.c: Escape backslashes in section names properly\n + git-rebase.sh: Fix --merge --abort failures when path contains\n whitespace\n\nMaking sure the tools quote paths correctly and work inside a directory\nwhose pathname contains whitespace. Thanks Bryan, and thanks J6t for\nreviewing and testing.\n\n* sb/committer (Sun May 4 18:04:51 2008 +0200) 3 commits\n + commit: Show committer if automatic\n + commit: Show author if different from committer\n + Preparation to call determine_author_info from prepare_to_commit\n\n----------------------------------------------------------------\n[Will merge to \"master\" soonish]\n\n* as/graph (Mon May 5 00:57:03 2008 -0700) 4 commits\n + graph API: eliminate unnecessary indentation\n + log and rev-list: add --graph option\n + Add history graph API\n + revision API: split parent rewriting and parent printing options\n\nDraw \"tig 'g'\" graph without tig ;-)\n\n* np/pack (Fri May 2 15:11:51 2008 -0400) 7 commits\n + pack-objects: fix early eviction for max depth delta objects\n + pack-objects: allow for early delta deflating\n + pack-objects: move compression code in a separate function\n + pack-objects: clean up write_object() a bit\n + pack-objects: simplify the condition associated with --all-\n progress\n + pack-objects: remove some double negative logic\n + pack-objects: small cleanup\n\nEvery time Nico tweaks pack generation, something good comes out ;-).\n\n* db/clone-in-c (Sun Apr 27 13:39:30 2008 -0400) 8 commits\n + Build in clone\n + Provide API access to init_db()\n + Add a function to set a non-default work tree\n + Allow for having for_each_ref() list extra refs\n + Have a constant extern refspec for \"--tags\"\n + Add a library function to add an alternate to the alternates file\n + Add a lockfile function to append to a file\n + Mark the list of refs to fetch as const\n\nFor 1.5.6; please give it a good beating.\n\n----------------------------------------------------------------\n[Actively Cooking]\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n + \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this.\n\nThis needs debugging.\n\n* ap/svn (Mon May 12 17:09:49 2008 -0700) 4 commits\n + git-svn: add test for --add-author-from and --use-log-author\n + git-svn: add documentation for --add-author-from option.\n + git-svn: Add --add-author-from option.\n + git-svn: add documentation for --use-log-author option.\n\nSome tweak for output might be needed, I dunno.\n\n* sv/first-parent (Mon May 12 17:12:36 2008 +0200) 2 commits\n + revision.c: really honor --first-parent\n + Simplify and fix --first-parent implementation\n\n----------------------------------------------------------------\n[Stalled]\n\n* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to. This\nmay help a GSoC project that wants to gather statistical overview of the\nhistory. The final presentation may need tweaking (see the log message of\nthe tip commit on the series).\n\n* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits\n + Use perl instead of tac\n + Fix t3404 assumption that `wc -l` does not use whitespace.\n + rebase -i: Use : in expr command instead of match.\n + rebase -i: update the implementation of 'mark' command\n + Add option --preserve-tags\n + Teach rebase interactive the tag command\n + Add option --first-parent\n + Do rebase with preserve merges with advanced TODO list\n + Select all lines with fake-editor\n + Unify the length of $SHORT* and the commits in the TODO list\n + Teach rebase interactive the merge command\n + Move redo merge code in a function\n + Teach rebase interactive the reset command\n + Teach rebase interactive the mark command\n + Move cleanup code into it's own function\n + Don't append default merge message to -m message\n + fake-editor: output TODO list if unchanged\n\nThis may complement the proposed \"sequencer\" GSoC project. Dscho seems to\nhave quite a strong objection to the 'mark' syntax and mechanism being\nunnecessarily complex. Let's wait and see if a less complex but equally\nexpressive alternative materializes...\n\n* ar/batch-cat (Wed Apr 23 15:17:47 2008 -0400) 5 commits\n - git-cat-file: Add --batch option\n - git-cat-file: Add --batch-check option\n - git-cat-file: Make option parsing a little more flexible\n - git-cat-file: Small refactor of cmd_cat_file\n - Add tests for git cat-file\n\nI fixed up the problematic shell script in the first patch in the series\nbut later one introduced the same problematic constructs in another file,\nat which point I gave up and discarded the rest. At least it now passes\nits own testsuite without breaking others.\n\n----------------------------------------------------------------\n[On Hold]\n\n* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit\n - diff: enable \"too large a rename\" warning when -M/-C is explicitly\n asked for\n\nThis would be the right thing to do for command line use, but gitk will be\nhit due to tcl/tk's limitation, so I am holding this back for now.\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit\n - merge: remove deprecated summary and diffstat options and config\n variables\n\nThis needs to be held back, as it actually removes the support for\nfeatures that the main part of the series deprecates, until 1.6.0 or\nlater.\n\n* pb/push (Mon Apr 28 11:32:12 2008 -0400) 1 commit\n + add special \"matching refs\" refspec\n\nThis first patch is a good enhancement without hurting any existing users.\nWe need a staged introduction of the second and later patches, and many\npeople including me did not agree the later ones in the series are\ndesirable.\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour when renames are\ninvolved, by not using merge-recursive (whose d/f conflict resolution is\nquite broken), but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"76999","messageId":"alpine.LNX.1.00.0805141844500.19665@iabervon.org","threadId":"12603","inReplyTo":"7vmymsjz6x.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2008-05-14T22:55:11Z","receivedAt":"2008-05-14T22:55:11Z","isPatch":false,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"On Wed, 14 May 2008, Junio C Hamano wrote:\n\n> * db/clone-in-c (Sun Apr 27 13:39:30 2008 -0400) 8 commits\n> + Build in clone\n> + Provide API access to init_db()\n> + Add a function to set a non-default work tree\n> + Allow for having for_each_ref() list extra refs\n> + Have a constant extern refspec for \"--tags\"\n> + Add a library function to add an alternate to the alternates file\n> + Add a lockfile function to append to a file\n> + Mark the list of refs to fetch as const\n> \n> For 1.5.6; please give it a good beating.\n\nLast time, you said you were going to review this again; did you review it \nand find nothing to comment on, decide to just make sure it gets a \nbeating, or are you still planning to review it more? (Just wondering so I \ncan try to arrange to have time to respond to comments if there's going to \nbe a bunch)\n"},{"id":"77015","messageId":"7vfxski3z9.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"alpine.LNX.1.00.0805141844500.19665@iabervon.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-15T04:30:18Z","receivedAt":"2008-05-15T04:30:18Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Daniel Barkalow writes:\n\n> Last time, you said you were going to review this again; did you review it \n> and find nothing to comment on, decide to just make sure it gets a \n> beating, or are you still planning to review it more? (Just wondering so I \n> can try to arrange to have time to respond to comments if there's going to \n> be a bunch)\n\nI did not have any further nitpicks on either design nor code in particular.\n\nBut keep in mind that I won't be the single source of review comments ;-).\n.\n"},{"id":"77024","messageId":"alpine.OSX.1.10.0805150748590.2650@cougar","threadId":"12603","inReplyTo":"7vmymsjz6x.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Steffen Prohaska","fromEmail":"prohaska@zib.de","sentAt":"2008-05-15T05:51:59Z","receivedAt":"2008-05-15T05:51:59Z","isPatch":false,"sender":{"key":"prohaska@zib.de","avatar":"https://avatars.githubusercontent.com/u/217580?v=4"},"body":"On Wed, 14 May 2008, Junio C Hamano wrote:\n\n> \n> For 1.5.6.\n> \n> * sp/ignorecase (Sun May 11 18:16:42 2008 +0200) 4 commits\n> - t0050: Add test for case insensitive add\n> - t0050: Set core.ignorecase case to activate case insensitivity\n> - t0050: Test autodetect core.ignorecase\n> - git-init: autodetect core.ignorecase\n> \n> This unfortunately seems to break on natively case sensitive filesystems.\n\n\n>From 92ec8c8a12cdc45a69f6612af340a8ce50976ab1 Mon Sep 17 00:00:00 2001\nFrom: Steffen Prohaska \nDate: Thu, 15 May 2008 07:19:54 +0200\nSubject: [PATCH] t0050: Fix merge test on case sensitive file systems\n\nOn a case sensitive filesystem, \"git reset --hard\" might refuse to\noverwrite a file whose name differs only by case, even if\ncore.ignorecase is set. It is not clear which circumstances cause this\nbehavior. This commit simply works around the problem by removing\nthe case changing file before running \"git reset --hard\".\n\nSigned-off-by: Steffen Prohaska \n---\n t/t0050-filesystem.sh | 2 ++\n 1 files changed, 2 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh\nindex 0e33c4b..c5360e2 100755\n--- a/t/t0050-filesystem.sh\n+++ b/t/t0050-filesystem.sh\n@@ -72,6 +72,8 @@ $test_case 'rename (case change)' '\n \n $test_case 'merge (case change)' '\n \n+\trm -f CamelCase &&\n+\trm -f camelcase &&\n \tgit reset --hard initial &&\n \tgit merge topic\n \n-- \n1.5.5.1.349.g99d0\n"},{"id":"77440","messageId":"7vabijxhk4.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vmymsjz6x.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-22T01:18:19Z","receivedAt":"2008-05-22T01:18:19Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nIt's been a while since the last issue of this series. I've been\nswamped, and haven't had a chance to spend enough time on reviewing and\naccepting patches.\n\nA rough timeline from now on.\n\n * Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21 -- need\n to slip til the weekend).\n\n * 1.5.6 Final (2008-06-08).\n\nThere are a few known breakages I want to see addressed that are not in\nhere before 1.5.6 (no not any new features but pure bugfixes).\n\n----------------------------------------------------------------\n[New Topics]\n\n* js/config-cb (Wed May 14 18:46:53 2008 +0100) 1 commit\n - Provide git_config with a callback-data parameter\n\nThis needs to wait until most of the other things graduate for 1.5.6;\nluckily, unlike the other \"path-list\" changes, misconversions is much\neasier to catch for this change and I am not worried about it.\n\n* jc/apply-whitespace (Sat May 17 02:02:44 2008 -0700) 3 commits\n + builtin-apply: do not declare patch is creation when we do not\n know it\n + builtin-apply: accept patch to an empty file\n + builtin-apply: typofix\n\nWe were loose when parsing a patch that adds contents to an empty file.\nThis fix would be nice to have in 1.5.6.\n\n* js/mailinfo (Fri May 16 14:03:30 2008 +0100) 1 commit\n - <> mailsplit and mailinfo:\n gracefully handle NUL characters\n\nWhen \"am\" processes a patch that modifies a line with NUL, we used to\nchomp the patch line there, resulting in rejects. This patch fixes the\nissue partially, only when the message is not encoded in BASE64 nor\nQuoted-Printable.\n\n* mo/cvsserver (Wed May 14 22:35:48 2008 -0600) 3 commits\n + git-cvsserver: add ability to guess -kb from contents\n + implement gitcvs.usecrlfattr\n + git-cvsserver: add mechanism for managing working tree and current\n directory\n\nCVS interoperability improvements, for 1.5.6\n\n* js/cvsexportcommit (Wed May 14 15:29:49 2008 +0100) 2 commits\n + cvsexportcommit: introduce -W for shared working trees (between\n Git and CVS)\n + cvsexportcommit: chomp only removes trailing whitespace\n\nCVS interoperability improvements, for 1.5.6\n\n* ar/t6031 (Sun May 18 16:57:27 2008 +0200) 1 commit\n + Fix t6031 on filesystems without working exec bit\n\n* jc/unpack-trees-reword (Sat May 17 12:03:49 2008 -0700) 1 commit\n + unpack-trees: allow Porcelain to give different error messages\n\n* jc/add-n-u (Wed May 21 12:04:34 2008 -0700) 1 commit\n + \"git-add -n -u\" should not add but just report\n\n* js/ignore-submodule (Wed May 14 18:03:59 2008 +0100) 3 commits\n + Ignore dirty submodule states during rebase and stash\n + Teach update-index about --ignore-submodules\n + diff options: Introduce --ignore-submodules\n\nThe above are all fixes, meant for 1.5.6.\n\n* dr/ceiling (Fri May 16 00:27:28 2008 +0100) 1 commit\n - Add support for GIT_CEILING_DIRECTORIES\n\nI haven't had a chance to take a look at the updated series myself.\n\n* jc/diff-words (Sun May 11 12:33:48 2008 -0700) 2 commits\n - diff --color-words: a bit of tweak\n - diff --color-words reimplementation\n\nThis series did not pan out well. I briefly thought that perhaps I should\ndiscard them and replace with the \"not just whitespace\" one from Ping Yin\nfirst, hoping that we can clean the overall logic up later, but perhaps\nthe whole thing can get a fresh restart after 1.5.6.\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n* ar/add-unreadable (Mon May 12 19:59:23 2008 +0200) 5 commits\n + Add a config option to ignore errors for git-add\n + Add a test for git-add --ignore-errors\n + Add --ignore-errors to git-add to allow it to skip files with read\n errors\n + Extend interface of add_files_to_cache to allow ignore indexing\n errors\n + Make the exit code of add_file_to_index actually useful\n\nWhen you sometimes have unreadable path in your own work tree, this allows\nyou to ignore failures to index such path with \"git add\". Philosophically\nthat whole notion is wrong (\"why should you be adding such a file to begin\nwith\"), but this has practical value of working around insane systems that\nlocks out the access by the user to a file when the file is in use by\nsomebody else.\n\nI am somewhat skeptical about the last one that enables such a workaround\non a permanent basis, though.\n\n* ds/branch-auto-rebase (Sat May 10 15:36:29 2008 -0700) 1 commit\n + Allow tracking branches to set up rebase by default.\n\nFor 1.5.6.\n\n* as/graph (Mon May 5 00:57:03 2008 -0700) 4 commits\n + graph API: eliminate unnecessary indentation\n + log and rev-list: add --graph option\n + Add history graph API\n + revision API: split parent rewriting and parent printing options\n\nDraw \"tig 'g'\" graph without tig ;-)\n\n* np/pack (Fri May 2 15:11:51 2008 -0400) 7 commits\n + pack-objects: fix early eviction for max depth delta objects\n + pack-objects: allow for early delta deflating\n + pack-objects: move compression code in a separate function\n + pack-objects: clean up write_object() a bit\n + pack-objects: simplify the condition associated with --all-\n progress\n + pack-objects: remove some double negative logic\n + pack-objects: small cleanup\n\nEvery time Nico tweaks pack generation, something good comes out ;-).\n\n* sv/first-parent (Mon May 12 17:12:36 2008 +0200) 2 commits\n + revision.c: really honor --first-parent\n + Simplify and fix --first-parent implementation\n\n\n----------------------------------------------------------------\n[Will merge to \"master\" soonish]\n\n* sp/ignorecase (Thu May 15 07:19:54 2008 +0200) 5 commits\n + t0050: Fix merge test on case sensitive file systems\n + t0050: Add test for case insensitive add\n + t0050: Set core.ignorecase case to activate case insensitivity\n + t0050: Test autodetect core.ignorecase\n + git-init: autodetect core.ignorecase\n\nFor 1.5.6.\n\n* bc/repack (Thu May 15 22:37:31 2008 -0400) 6 commits\n + Documentation/git-repack.txt: document new -A behaviour\n + let pack-objects do the writing of unreachable objects as loose\n objects\n + add a force_object_loose() function\n + builtin-gc.c: deprecate --prune, it now really has no effect\n + git-gc: always use -A when manually repacking\n + repack: modify behavior of -A option to leave unreferenced objects\n unpacked\n\nFor 1.5.6.\n\n* db/clone-in-c (Tue May 20 14:15:14 2008 -0400) 11 commits\n + clone: fall back to copying if hardlinking fails\n + builtin-clone.c: Need to closedir() in copy_or_link_directory()\n + builtin-clone: fix initial checkout\n + Build in clone\n + Provide API access to init_db()\n + Add a function to set a non-default work tree\n + Allow for having for_each_ref() list extra refs\n + Have a constant extern refspec for \"--tags\"\n + Add a library function to add an alternate to the alternates file\n + Add a lockfile function to append to a file\n + Mark the list of refs to fetch as const\n\nFor 1.5.6.\n\n* pb/push (Mon Apr 28 11:32:12 2008 -0400) 1 commit\n + add special \"matching refs\" refspec\n\nThis first patch is a good enhancement without hurting any existing users.\nWe need a staged introduction of the second and later patches, and many\npeople including me did not agree the later ones in the series are\ndesirable.\n\n----------------------------------------------------------------\n[Stalled]\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n + \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this.\n\nThis needs debugging.\n\n* ap/svn (Mon May 12 17:09:49 2008 -0700) 4 commits\n + git-svn: add test for --add-author-from and --use-log-author\n + git-svn: add documentation for --add-author-from option.\n + git-svn: Add --add-author-from option.\n + git-svn: add documentation for --use-log-author option.\n\nSome tweak for output might be needed, I dunno.\n\n* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to. This\nmay help a GSoC project that wants to gather statistical overview of the\nhistory. The final presentation may need tweaking (see the log message of\nthe tip commit on the series).\n\n* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits\n + Use perl instead of tac\n + Fix t3404 assumption that `wc -l` does not use whitespace.\n + rebase -i: Use : in expr command instead of match.\n + rebase -i: update the implementation of 'mark' command\n + Add option --preserve-tags\n + Teach rebase interactive the tag command\n + Add option --first-parent\n + Do rebase with preserve merges with advanced TODO list\n + Select all lines with fake-editor\n + Unify the length of $SHORT* and the commits in the TODO list\n + Teach rebase interactive the merge command\n + Move redo merge code in a function\n + Teach rebase interactive the reset command\n + Teach rebase interactive the mark command\n + Move cleanup code into it's own function\n + Don't append default merge message to -m message\n + fake-editor: output TODO list if unchanged\n\nThis may complement the proposed \"sequencer\" GSoC project. Dscho seems to\nhave quite a strong objection to the 'mark' syntax and mechanism being\nunnecessarily complex. Let's wait and see if a less complex but equally\nexpressive alternative materializes...\n\n* ar/batch-cat (Wed Apr 23 15:17:47 2008 -0400) 5 commits\n - git-cat-file: Add --batch option\n - git-cat-file: Add --batch-check option\n - git-cat-file: Make option parsing a little more flexible\n - git-cat-file: Small refactor of cmd_cat_file\n - Add tests for git cat-file\n\nThe series was meant to speed up git-svn by avoiding many individual\ninvocations of git-cat-file.\n\nI fixed up the problematic shell script in the first patch in the series\nbut later one introduced the same problematic constructs in another file,\nat which point I gave up and discarded the rest. At least it now passes\nits own testsuite without breaking others. The remainder needs to be\nresubmit for the entire series to be usable for git-svn.\n\n----------------------------------------------------------------\n[On Hold]\n\n* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit\n - diff: enable \"too large a rename\" warning when -M/-C is explicitly\n asked for\n\nThis would be the right thing to do for command line use, but gitk will be\nhit due to tcl/tk's limitation, so I am holding this back for now.\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit\n - merge: remove deprecated summary and diffstat options and config\n variables\n\nThis needs to be held back, as it actually removes the support for\nfeatures that the main part of the series deprecates, until 1.6.0 or\nlater.\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour when renames are\ninvolved, by not using merge-recursive (whose d/f conflict resolution is\nquite broken), but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n\n----------------------------------------------------------------\n[Dropped]\n\n* bc/tag (Fri May 9 00:03:35 2008 -0500) 3 commits\n - ident.c: New function valid_ident for checking ident string\n formatting\n - Make mktag a builtin\n - mktag.c: adjust verify_tag parameters\n\nThe goal of the series was to unify the internal implementation of\ngit-mktag and git-tag but the patches did not quite apply. Needs\nrebase/resubmit.\n"},{"id":"77455","messageId":"alpine.DEB.1.00.0805221212200.30431@racer","threadId":"12603","inReplyTo":"7vabijxhk4.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-05-22T11:35:01Z","receivedAt":"2008-05-22T11:35:01Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 21 May 2008, Junio C Hamano wrote:\n\n> * js/config-cb (Wed May 14 18:46:53 2008 +0100) 1 commit\n> - Provide git_config with a callback-data parameter\n> \n> This needs to wait until most of the other things graduate for 1.5.6; \n> luckily, unlike the other \"path-list\" changes, misconversions is much \n> easier to catch for this change and I am not worried about it.\n\nJust let me know when to resubmit, and against what branch(es).\n\n> * js/mailinfo (Fri May 16 14:03:30 2008 +0100) 1 commit\n> - <> mailsplit and mailinfo:\n> gracefully handle NUL characters\n> \n> When \"am\" processes a patch that modifies a line with NUL, we used to\n> chomp the patch line there, resulting in rejects. This patch fixes the\n> issue partially, only when the message is not encoded in BASE64 nor\n> Quoted-Printable.\n\nLike I said, I would be happy if Tommy took care of that patch.\n\n> * js/ignore-submodule (Wed May 14 18:03:59 2008 +0100) 3 commits\n> + Ignore dirty submodule states during rebase and stash\n> + Teach update-index about --ignore-submodules\n> + diff options: Introduce --ignore-submodules\n\nI haven't heard back from you about renaming that option. I think I \nsuggested --non-gitlinks or something equally discouraging for \nporcelain users.\n\n> * as/graph (Mon May 5 00:57:03 2008 -0700) 4 commits\n> + graph API: eliminate unnecessary indentation\n> + log and rev-list: add --graph option\n> + Add history graph API\n> + revision API: split parent rewriting and parent printing options\n> \n> Draw \"tig 'g'\" graph without tig ;-)\n\nI am a big fan of this feature.\n\n> * db/clone-in-c (Tue May 20 14:15:14 2008 -0400) 11 commits\n> + clone: fall back to copying if hardlinking fails\n> + builtin-clone.c: Need to closedir() in copy_or_link_directory()\n> + builtin-clone: fix initial checkout\n> + Build in clone\n> + Provide API access to init_db()\n> + Add a function to set a non-default work tree\n> + Allow for having for_each_ref() list extra refs\n> + Have a constant extern refspec for \"--tags\"\n> + Add a library function to add an alternate to the alternates file\n> + Add a lockfile function to append to a file\n> + Mark the list of refs to fetch as const\n\nFingers crossed.\n\n> * js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits\n> + Use perl instead of tac\n> + Fix t3404 assumption that `wc -l` does not use whitespace.\n> + rebase -i: Use : in expr command instead of match.\n> + rebase -i: update the implementation of 'mark' command\n> + Add option --preserve-tags\n> + Teach rebase interactive the tag command\n> + Add option --first-parent\n> + Do rebase with preserve merges with advanced TODO list\n> + Select all lines with fake-editor\n> + Unify the length of $SHORT* and the commits in the TODO list\n> + Teach rebase interactive the merge command\n> + Move redo merge code in a function\n> + Teach rebase interactive the reset command\n> + Teach rebase interactive the mark command\n> + Move cleanup code into it's own function\n> + Don't append default merge message to -m message\n> + fake-editor: output TODO list if unchanged\n> \n> This may complement the proposed \"sequencer\" GSoC project. Dscho seems \n> to have quite a strong objection to the 'mark' syntax and mechanism \n> being unnecessarily complex. Let's wait and see if a less complex but \n> equally expressive alternative materializes...\n\nYeah, I know. My backlog is growing and growing.\n\nCiao,\nDscho\n"},{"id":"77488","messageId":"7vlk22urtt.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"alpine.DEB.1.00.0805221212200.30431@racer","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-22T18:17:02Z","receivedAt":"2008-05-22T18:17:02Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n>> * js/config-cb (Wed May 14 18:46:53 2008 +0100) 1 commit\n>> - Provide git_config with a callback-data parameter\n>> \n>> This needs to wait until most of the other things graduate for 1.5.6; \n>> luckily, unlike the other \"path-list\" changes, misconversions is much \n>> easier to catch for this change and I am not worried about it.\n>\n> Just let me know when to resubmit, and against what branch(es).\n\nIt is probably easier for me to munge the original submission from you\nwhen I decide to tag -rc0, adjusting any potential new callers (I do not\nthink of any offhand in diff between master and next). We will need a\nquiescent time for this kind of change, and that way we will get such a\nquiescent window by definition.\n\n>> * js/mailinfo (Fri May 16 14:03:30 2008 +0100) 1 commit\n>> - <> mailsplit and mailinfo:\n>> gracefully handle NUL characters\n>> \n>> When \"am\" processes a patch that modifies a line with NUL, we used to\n>> chomp the patch line there, resulting in rejects. This patch fixes the\n>> issue partially, only when the message is not encoded in BASE64 nor\n>> Quoted-Printable.\n\n> Like I said, I would be happy if Tommy took care of that patch.\n\nI dunno. Is it likely to happen? I'd take a look at it myself when I\nhave a chance.\n\n>> * js/ignore-submodule (Wed May 14 18:03:59 2008 +0100) 3 commits\n>> + Ignore dirty submodule states during rebase and stash\n>> + Teach update-index about --ignore-submodules\n>> + diff options: Introduce --ignore-submodules\n>\n> I haven't heard back from you about renaming that option. I think I \n> suggested --non-gitlinks or something equally discouraging for \n> porcelain users.\n\nThe name is fine. I had more trouble with what it does, rather, what it\ndoesn't --- it does not ignore typechange that involve a gitlink if I\nrecall correctly.\n\n>> * db/clone-in-c (Tue May 20 14:15:14 2008 -0400) 11 commits\n>> + clone: fall back to copying if hardlinking fails\n>> + builtin-clone.c: Need to closedir() in copy_or_link_directory()\n>> + builtin-clone: fix initial checkout\n>> + Build in clone\n>> + Provide API access to init_db()\n>> + Add a function to set a non-default work tree\n>> + Allow for having for_each_ref() list extra refs\n>> + Have a constant extern refspec for \"--tags\"\n>> + Add a library function to add an alternate to the alternates file\n>> + Add a lockfile function to append to a file\n>> + Mark the list of refs to fetch as const\n>\n> Fingers crossed.\n\nRather, uncross them and type a few more tests ;-)?\n"},{"id":"77499","messageId":"alpine.LNX.1.00.0805221649240.19665@iabervon.org","threadId":"12603","inReplyTo":"7vlk22urtt.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2008-05-22T22:02:55Z","receivedAt":"2008-05-22T22:02:55Z","isPatch":false,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"On Thu, 22 May 2008, Junio C Hamano wrote:\n\n> >> * db/clone-in-c (Tue May 20 14:15:14 2008 -0400) 11 commits\n> >> + clone: fall back to copying if hardlinking fails\n> >> + builtin-clone.c: Need to closedir() in copy_or_link_directory()\n> >> + builtin-clone: fix initial checkout\n> >> + Build in clone\n> >> + Provide API access to init_db()\n> >> + Add a function to set a non-default work tree\n> >> + Allow for having for_each_ref() list extra refs\n> >> + Have a constant extern refspec for \"--tags\"\n> >> + Add a library function to add an alternate to the alternates file\n> >> + Add a lockfile function to append to a file\n> >> + Mark the list of refs to fetch as const\n> >\n> > Fingers crossed.\n> \n> Rather, uncross them and type a few more tests ;-)?\n\nThere are a few tests from Johan that didn't get in, which I'd had in my \ntree but didn't send because I don't have a good process in place for \nsending patches I'm not the author of. I'm pretty sure they pass, but I \nhaven't checked recently. I'll send them in a moment.\n\n\t-Daniel\n*This .sig left intentionally blank*\n"},{"id":"77722","messageId":"20080525212922.GA9564@leksak.fem-net","threadId":"12603","inReplyTo":"alpine.DEB.1.00.0805221212200.30431@racer","subject":"Re: What's cooking in git.git (topics)","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2008-05-25T21:29:22Z","receivedAt":"2008-05-25T21:29:22Z","isPatch":false,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"Hi,\n\n> > * js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits\nesp.\n> > + Teach rebase interactive the merge command\n> > + Teach rebase interactive the reset command\n> > + Teach rebase interactive the mark command\n[...]\n>\n> Yeah, I know. My backlog is growing and growing.\n\nI think, this week we get the git-sequencer \"spec\" ready to be sent\nto the list.\nThen there's a new thread to discuss ;-)\n\nRegards,\n Stephan\n\n-- \nStephan Beyer , PGP 0x6EDDD207FCC5040F\n"},{"id":"77728","messageId":"7vwslhg8qe.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vabijxhk4.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-26T01:22:17Z","receivedAt":"2008-05-26T01:22:17Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nIt's been a while since the last issue of this series. I've been\nswamped, and haven't had a chance to spend enough time on reviewing and\naccepting patches.\n\nA rough timeline from now on.\n\n * 1.5.6-rc0 has been tagged. Expect a few minor breakages ;-)\n\n * Fixes of 'master' continues, with newer -rcX tagged every once in a\n while.\n\n * 1.5.6 Final (2008-06-08).\n\nThere are a few known breakages I want to see addressed that are not in\nhere before 1.5.6 (no not any new features but pure bugfixes).\n\n----------------------------------------------------------------\n[New Topics]\n\n* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits\n - Introduce fast forward option only\n - Head reduction before selecting merge strategy\n - Restructure git-merge.sh\n - Introduce -ff=\n - New merge tests\n - Documentation for joining more than two histories\n\nThis will interfere with Miklos's rewrite of merge to C but it appears\nneither will happen by 1.5.6 anyway.\n\n* jc/diff-no-no-index (Fri May 23 22:28:56 2008 -0700) 3 commits\n + \"git diff\": do not ignore index without --no-index\n + diff-files: do not play --no-index games\n + tests: do not use implicit \"git diff --no-index\"\n\nThis was done in response to recently discovered interaction with stgit;\nwe were too eater to invoke --no-index behaviour without being asked.\nCurrently it even drops the behaviour when you ask to compare two paths\nthat are outside of git work tree if your current directory is inside it,\nwhich I think could safely resurrect, and then the whole thing will be\nready for 1.5.6.\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n* js/config-cb (Wed May 14 18:46:53 2008 +0100) 1 commit\n + Provide git_config with a callback-data parameter\n\n* jc/apply-whitespace (Sat May 17 02:02:44 2008 -0700) 3 commits\n + builtin-apply: do not declare patch is creation when we do not\n know it\n + builtin-apply: accept patch to an empty file\n + builtin-apply: typofix\n\nWe were loose when parsing a patch that adds contents to an empty file.\nThis fix would be nice to have in 1.5.6.\n\n* js/mailinfo (Fri May 16 14:03:30 2008 +0100) 3 commits\n + mailsplit: minor clean-up in read_line_with_nul()\n + mailinfo: apply the same fix not to lose NULs in BASE64 and QP\n codepaths\n + mailsplit and mailinfo: gracefully handle NUL characters\n\nWhen \"am\" processes a patch that modifies a line with NUL, we used to\nchomp the patch line there, resulting in rejects. This patch fixes the\nissue partially, only when the message is not encoded in BASE64 nor\nQuoted-Printable. I suspect its handling of a MIME attachment may still\nwrong, but otherwise this should fix the breakage reported earlier.\n\n* mo/cvsserver (Wed May 14 22:35:48 2008 -0600) 3 commits\n + git-cvsserver: add ability to guess -kb from contents\n + implement gitcvs.usecrlfattr\n + git-cvsserver: add mechanism for managing working tree and current\n directory\n\n* js/cvsexportcommit (Wed May 14 15:29:49 2008 +0100) 2 commits\n + cvsexportcommit: introduce -W for shared working trees (between\n Git and CVS)\n + cvsexportcommit: chomp only removes trailing whitespace\n\nCVS interoperability improvements.\n\n* ar/t6031 (Sun May 18 16:57:27 2008 +0200) 1 commit\n + Fix t6031 on filesystems without working exec bit\n\n* jc/unpack-trees-reword (Sat May 17 12:03:49 2008 -0700) 1 commit\n + unpack-trees: allow Porcelain to give different error messages\n\nMakes safety message from \"git checkout switch-to-this-branch\" a bit\neasier to read, and opens up the possibility to reword messages from other\ncommands that use unpack-trees machinery.\n\n* jc/add-n-u (Wed May 21 12:04:34 2008 -0700) 1 commit\n + \"git-add -n -u\" should not add but just report\n\n* js/ignore-submodule (Wed May 14 18:03:59 2008 +0100) 3 commits\n + Ignore dirty submodule states during rebase and stash\n + Teach update-index about --ignore-submodules\n + diff options: Introduce --ignore-submodules\n\n* sp/ignorecase (Thu May 15 07:19:54 2008 +0200) 5 commits\n + t0050: Fix merge test on case sensitive file systems\n + t0050: Add test for case insensitive add\n + t0050: Set core.ignorecase case to activate case insensitivity\n + t0050: Test autodetect core.ignorecase\n + git-init: autodetect core.ignorecase\n\n* bc/repack (Thu May 15 22:37:31 2008 -0400) 6 commits\n + Documentation/git-repack.txt: document new -A behaviour\n + let pack-objects do the writing of unreachable objects as loose\n objects\n + add a force_object_loose() function\n + builtin-gc.c: deprecate --prune, it now really has no effect\n + git-gc: always use -A when manually repacking\n + repack: modify behavior of -A option to leave unreferenced objects\n unpacked\n\n* db/clone-in-c (Tue May 20 14:15:14 2008 -0400) 11 commits\n + clone: fall back to copying if hardlinking fails\n + builtin-clone.c: Need to closedir() in copy_or_link_directory()\n + builtin-clone: fix initial checkout\n + Build in clone\n + Provide API access to init_db()\n + Add a function to set a non-default work tree\n + Allow for having for_each_ref() list extra refs\n + Have a constant extern refspec for \"--tags\"\n + Add a library function to add an alternate to the alternates file\n + Add a lockfile function to append to a file\n + Mark the list of refs to fetch as const\n\n* pb/push (Mon Apr 28 11:32:12 2008 -0400) 1 commit\n + add special \"matching refs\" refspec\n\nThis first patch is a good enhancement without hurting any existing users.\nWe need a staged introduction of the second and later patches, and many\npeople including me did not agree the later ones in the series are\ndesirable.\n\n* ap/svn (Mon May 12 17:09:49 2008 -0700) 4 commits\n + git-svn: add test for --add-author-from and --use-log-author\n + git-svn: add documentation for --add-author-from option.\n + git-svn: Add --add-author-from option.\n + git-svn: add documentation for --use-log-author option.\n\nSome tweak for output might be needed, but I'll leave that to actual\ngit-svn users.\n\n* ar/batch-cat (Wed Apr 23 15:17:47 2008 -0400) 13 commits\n + change quoting in test t1006-cat-file.sh\n + builtin-cat-file.c: use parse_options()\n + git-svn: Speed up fetch\n + Git.pm: Add hash_and_insert_object and cat_blob\n + Git.pm: Add command_bidi_pipe and command_close_bidi_pipe\n + git-hash-object: Add --stdin-paths option\n + Add more tests for git hash-object\n + Move git-hash-object tests from t5303 to t1007\n + git-cat-file: Add --batch option\n + git-cat-file: Add --batch-check option\n + git-cat-file: Make option parsing a little more flexible\n + git-cat-file: Small refactor of cmd_cat_file\n + Add tests for git cat-file\n\nThe series is meant to speed up git-svn by avoiding many individual\ninvocations of git-cat-file, started by Adam Roben and finished by Michele\nBallabio.\n\n----------------------------------------------------------------\n[Stalled]\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n + \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this.\n\nThis needs debugging.\n\n* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to. This\nmay help a GSoC project that wants to gather statistical overview of the\nhistory. The final presentation may need tweaking (see the log message of\nthe tip commit on the series).\n\n* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits\n + Use perl instead of tac\n + Fix t3404 assumption that `wc -l` does not use whitespace.\n + rebase -i: Use : in expr command instead of match.\n + rebase -i: update the implementation of 'mark' command\n + Add option --preserve-tags\n + Teach rebase interactive the tag command\n + Add option --first-parent\n + Do rebase with preserve merges with advanced TODO list\n + Select all lines with fake-editor\n + Unify the length of $SHORT* and the commits in the TODO list\n + Teach rebase interactive the merge command\n + Move redo merge code in a function\n + Teach rebase interactive the reset command\n + Teach rebase interactive the mark command\n + Move cleanup code into it's own function\n + Don't append default merge message to -m message\n + fake-editor: output TODO list if unchanged\n\nThis may complement the proposed \"sequencer\" GSoC project. Dscho seems to\nhave quite a strong objection to the 'mark' syntax and mechanism being\nunnecessarily complex. Let's wait and see if a less complex but equally\nexpressive alternative materializes...\n\n----------------------------------------------------------------\n[On Hold]\n\n* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits\n - Eliminate an unnecessary chdir(\"..\")\n - Add support for GIT_CEILING_DIRECTORIES\n - Fold test-absolute-path into test-path-utils\n - Implement normalize_absolute_path\n\n* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit\n - diff: enable \"too large a rename\" warning when -M/-C is explicitly\n asked for\n\nThis would be the right thing to do for command line use, but gitk will be\nhit due to tcl/tk's limitation, so I am holding this back for now.\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit\n - merge: remove deprecated summary and diffstat options and config\n variables\n\nThis needs to be held back, as it actually removes the support for\nfeatures that the main part of the series deprecates, until 1.6.0 or\nlater.\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour when renames are\ninvolved, by not using merge-recursive (whose d/f conflict resolution is\nquite broken), but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n\n* jc/diff-words (Sun May 11 12:33:48 2008 -0700) 2 commits\n - diff --color-words: a bit of tweak\n - diff --color-words reimplementation\n\nThis series did not pan out well. I briefly thought that perhaps I should\ndiscard them and replace with the \"not just whitespace\" one from Ping Yin\nfirst, hoping that we can clean the overall logic up later, but perhaps\nthe whole thing can get a fresh restart after 1.5.6. I'll drop this\naltogether the next round.\n"},{"id":"77825","messageId":"7vd4n82tqw.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vwslhg8qe.fsf@gitster.siamese.dyndns.org","subject":"[PATCH] git-diff: allow --no-index semantics a bit more","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-27T05:36:39Z","receivedAt":"2008-05-27T05:36:39Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Even when inside a git work tree, if two paths are given and at least one\nis clearly outside the work tree, it cannot be a request to diff a tracked\npath anyway; allow such an invocation to use --no-index semantics.\n\nSigned-off-by: Junio C Hamano \n---\n > * jc/diff-no-no-index (Fri May 23 22:28:56 2008 -0700) 3 commits\n > + \"git diff\": do not ignore index without --no-index\n > + diff-files: do not play --no-index games\n > + tests: do not use implicit \"git diff --no-index\"\n >\n > This was done in response to recently discovered interaction with stgit;\n > we were too eater to invoke --no-index behaviour without being asked.\n > Currently it even drops the behaviour when you ask to compare two paths\n > that are outside of git work tree if your current directory is inside it,\n > which I think could safely resurrect, and then the whole thing will be\n > ready for 1.5.6.\n\n And this should hopefully be enough.\n\n diff-no-index.c | 39 ++++++++++++++++++++++++++++++++-------\n 1 files changed, 32 insertions(+), 7 deletions(-)\n\ndiff --git a/diff-no-index.c b/diff-no-index.c\nindex 1b57fee..b1ae791 100644\n--- a/diff-no-index.c\n+++ b/diff-no-index.c\n@@ -144,6 +144,25 @@ static int queue_diff(struct diff_options *o,\n \t}\n }\n \n+static int path_outside_repo(const char *path)\n+{\n+\t/*\n+\t * We have already done setup_git_directory_gently() so we\n+\t * know we are inside a git work tree already.\n+\t */\n+\tconst char *work_tree;\n+\tsize_t len;\n+\n+\tif (!is_absolute_path(path))\n+\t\treturn 0;\n+\twork_tree = get_git_work_tree();\n+\tlen = strlen(work_tree);\n+\tif (strncmp(path, work_tree, len) ||\n+\t (path[len] != '\\0' && path[len] != '/'))\n+\t\treturn 1;\n+\treturn 0;\n+}\n+\n void diff_no_index(struct rev_info *revs,\n \t\t int argc, const char **argv,\n \t\t int nongit, const char *prefix)\n@@ -162,13 +181,19 @@ void diff_no_index(struct rev_info *revs,\n \t\t\tbreak;\n \t}\n \n-\t/*\n-\t * No explicit --no-index, but \"git diff --opts A B\" outside\n-\t * a git repository is a cute hack to support.\n-\t */\n-\tif (!no_index && !nongit)\n-\t\treturn;\n-\n+\tif (!no_index && !nongit) {\n+\t\t/*\n+\t\t * Inside a git repository, without --no-index. Only\n+\t\t * when a path outside the repository is given,\n+\t\t * e.g. \"git diff /var/tmp/[12]\", or \"git diff\n+\t\t * Makefile /var/tmp/Makefile\", allow it to be used as\n+\t\t * a colourful \"diff\" replacement.\n+\t\t */\n+\t\tif ((argc != i + 2) ||\n+\t\t (!path_outside_repo(argv[i]) &&\n+\t\t !path_outside_repo(argv[i+1])))\n+\t\t\treturn;\n+\t}\n \tif (argc != i + 2)\n \t\tdie(\"git diff %s takes two paths\",\n \t\t no_index ? \"--no-index\" : \"[--no-index]\");\n-- \n1.5.6.rc0.13.g2d392\n"},{"id":"78175","messageId":"7vhccfiksy.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vwslhg8qe.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-30T20:44:29Z","receivedAt":"2008-05-30T20:44:29Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nIt's been a while since the last issue of this series. I've been\nswamped, and haven't had a chance to spend enough time on reviewing and\naccepting patches.\n\nA rough timeline from now on.\n\n * Fixes of 'master' continues, with newer -rcX tagged every once in a\n while.\n\n * 1.5.6 Final (2008-06-08 -- likely to slip by a week or so, though).\n\nThere are a few known breakages I want to see addressed that are not in\nhere before 1.5.6 (no not any new features but pure bugfixes).\n\n----------------------------------------------------------------\n[New Topics]\n\n* jc/checkout (Wed May 28 16:11:16 2008 -0700) 5 commits\n - PARK: NUL hack to entry\n - checkout: \"best effort\" checkout\n - unpack_trees(): allow callers to differentiate worktree errors\n from merge errors\n - checkout: consolidate reset_{to_new,clean_to_new|()\n - checkout: make reset_clean_to_new() not die by itself\n\n* lr/init-bare (Wed May 28 19:53:57 2008 +0100) 1 commit\n - git-init: accept --bare option\n\nThis makes both \"git --bare init\" and \"git init --bare\" work, which would\nreduce confusion. I am tempted to include it in 1.5.6. Comments?\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n* jc/diff-no-no-index (Mon May 26 22:35:07 2008 -0700) 5 commits\n + git diff --no-index: default to page like other diff frontends\n + git-diff: allow --no-index semantics a bit more\n + \"git diff\": do not ignore index without --no-index\n + diff-files: do not play --no-index games\n + tests: do not use implicit \"git diff --no-index\"\n\nThis was done in response to recently discovered interaction with stgit;\nwe were too eater to invoke --no-index behaviour without being asked.\n\n----------------------------------------------------------------\n[Stalled]\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n + \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this.\n\nThis needs debugging.\n\n* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to. This\nmay help a GSoC project that wants to gather statistical overview of the\nhistory. The final presentation may need tweaking (see the log message of\nthe tip commit on the series).\n\n* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits\n + Use perl instead of tac\n + Fix t3404 assumption that `wc -l` does not use whitespace.\n + rebase -i: Use : in expr command instead of match.\n + rebase -i: update the implementation of 'mark' command\n + Add option --preserve-tags\n + Teach rebase interactive the tag command\n + Add option --first-parent\n + Do rebase with preserve merges with advanced TODO list\n + Select all lines with fake-editor\n + Unify the length of $SHORT* and the commits in the TODO list\n + Teach rebase interactive the merge command\n + Move redo merge code in a function\n + Teach rebase interactive the reset command\n + Teach rebase interactive the mark command\n + Move cleanup code into it's own function\n + Don't append default merge message to -m message\n + fake-editor: output TODO list if unchanged\n\nThis may complement the proposed \"sequencer\" GSoC project. Dscho seems to\nhave quite a strong objection to the 'mark' syntax and mechanism being\nunnecessarily complex. Let's wait and see if a less complex but equally\nexpressive alternative materializes...\n\n* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits\n - Introduce fast forward option only\n - Head reduction before selecting merge strategy\n - Restructure git-merge.sh\n - Introduce -ff=\n - New merge tests\n - Documentation for joining more than two histories\n\nThis will interfere with Miklos's rewrite of merge to C but it appears\nneither will happen by 1.5.6 anyway.\n\n* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits\n - Eliminate an unnecessary chdir(\"..\")\n - Add support for GIT_CEILING_DIRECTORIES\n - Fold test-absolute-path into test-path-utils\n - Implement normalize_absolute_path\n\n----------------------------------------------------------------\n[On Hold]\n\n* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit\n - diff: enable \"too large a rename\" warning when -M/-C is explicitly\n asked for\n\nThis would be the right thing to do for command line use, but gitk will be\nhit due to tcl/tk's limitation, so I am holding this back for now.\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit\n - merge: remove deprecated summary and diffstat options and config\n variables\n\nThis needs to be held back, as it actually removes the support for\nfeatures that the main part of the series deprecates, until 1.6.0 or\nlater.\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour when renames are\ninvolved, by not using merge-recursive (whose d/f conflict resolution is\nquite broken), but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"78177","messageId":"48406D5C.4000703@freescale.com","threadId":"12603","inReplyTo":"7vhccfiksy.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Jon Loeliger","fromEmail":"jdl@freescale.com","sentAt":"2008-05-30T21:10:52Z","receivedAt":"2008-05-30T21:10:52Z","isPatch":false,"sender":{"key":"jdl@jdl.com","avatar":"https://gravatar.com/avatar/75ce9a10b151acd2c28ec4ab2136dba7b2ff1634530bd04b155981a749d08a64?d=mp&s=160"},"body":"Junio C Hamano wrote:\n> Here are the topics that have been cooking. Commits prefixed\n> with '-' are only in 'pu' while commits prefixed with '+' are\n> in 'next'.\n> \n>\n> * js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits\n> + Use perl instead of tac\n> + Fix t3404 assumption that `wc -l` does not use whitespace.\n> + rebase -i: Use : in expr command instead of match.\n> + rebase -i: update the implementation of 'mark' command\n> + Add option --preserve-tags\n> + Teach rebase interactive the tag command\n> + Add option --first-parent\n> + Do rebase with preserve merges with advanced TODO list\n> + Select all lines with fake-editor\n> + Unify the length of $SHORT* and the commits in the TODO list\n> + Teach rebase interactive the merge command\n> + Move redo merge code in a function\n> + Teach rebase interactive the reset command\n> + Teach rebase interactive the mark command\n> + Move cleanup code into it's own function\n> + Don't append default merge message to -m message\n> + fake-editor: output TODO list if unchanged\n> \n> This may complement the proposed \"sequencer\" GSoC project. Dscho seems to\n> have quite a strong objection to the 'mark' syntax and mechanism being\n> unnecessarily complex. Let's wait and see if a less complex but equally\n> expressive alternative materializes...\n\n\nWell, there are the two not-quite facetious suggestions\nI made off list to Junio. Granted, he though they would\nbe overkill (too), but I guess I could make them here for\nthe general record in any case.\n\nOne suggestion was to make a procedural model out of\nthe commit graph and allow something like this:\n\n b :- pick(B)\n x :- merge(pick(A), b)\n y :- merge(pick(C), b)\n z :- merge(x, y)\n\nMy second and semi-equivallent suggestion was to\nallow a lisp-like notation:\n\n (merge (merge (pick A)\n (pick B)\n (merge (pick B)\n (pick C)\n\nAs Junio observed, even that could be beyond what most\ncasual git rebase -i users are willing to do to a sequencer\nedit stream before getting down to business.\n\nAh well. :-)\n\njdl\n"},{"id":"78188","messageId":"E718F523-70B9-4742-B291-CDBE4790A278@midwinter.com","threadId":"12603","inReplyTo":"7vhccfiksy.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Steven Grimm","fromEmail":"koreth@midwinter.com","sentAt":"2008-05-30T22:00:01Z","receivedAt":"2008-05-30T22:00:01Z","isPatch":false,"sender":{"key":"koreth@midwinter.com","avatar":"https://gravatar.com/avatar/71b4d2e8b62f168bdc9e9205341159e3567003b4f9e2127c617c5fa0a1f5bad2?d=mp&s=160"},"body":"On May 30, 2008, at 1:44 PM, Junio C Hamano wrote:\n> [Stalled]\n>\n> * dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits\n> - Eliminate an unnecessary chdir(\"..\")\n> - Add support for GIT_CEILING_DIRECTORIES\n> - Fold test-absolute-path into test-path-utils\n> - Implement normalize_absolute_path\n\n\nThe most recent version of this patch seemed to come and go without \nany commentary one way or the other. What are people's objections to \nit as it stands now?\n\n-Steve\n"},{"id":"78203","messageId":"20080531012511.GA5907@leksak.fem-net","threadId":"12603","inReplyTo":"48406D5C.4000703@freescale.com","subject":"Re: What's cooking in git.git (topics)","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2008-05-31T01:25:11Z","receivedAt":"2008-05-31T01:25:11Z","isPatch":false,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"Hi,\n\n> One suggestion was to make a procedural model out of\n> the commit graph and allow something like this:\n>\n> b :- pick(B)\n> x :- merge(pick(A), b)\n> y :- merge(pick(C), b)\n> z :- merge(x, y)\n\nNice idea. But imho too hard for casual users.\nSomeone who has to learn a new language won't use the tool.\n\n> My second and semi-equivallent suggestion was to\n> allow a lisp-like notation:\n>\n> (merge (merge (pick A)\n> (pick B)\n> (merge (pick B)\n> (pick C)\n\nYou forgot some right parenthesis here ;-)\n...which shows, that it is also not easy enough for users.\n\nOr is it intentional?\n\n:)\nStephan\n\n-- \nStephan Beyer , PGP 0x6EDDD207FCC5040F\n"},{"id":"78340","messageId":"7vod6k6zg4.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vhccfiksy.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-02T07:58:03Z","receivedAt":"2008-06-02T07:58:03Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nIt's been a while since the last issue of this series. I've been\nswamped, and haven't had a chance to spend enough time on reviewing and\naccepting patches.\n\nA rough timeline from now on.\n\n * Fixes of 'master' continues, with newer -rcX tagged every once in a\n while. I'd like to tag -rc1 in a few days.\n\n * 1.5.6 Final (2008-06-08 -- likely to slip by a week or so, though).\n\n----------------------------------------------------------------\n[New Topics]\n\n* lw/gitweb (Sat May 31 16:19:24 2008 +0200) 2 commits\n - gitweb: use Git.pm, and use its parse_rev method for\n git_get_head_hash\n - perl/Git.pm: add parse_rev method\n\nI do not necessarily think it is an improvement to name the operation\ncalled as \"rev-parse\" at the plumbing layer with a different name\n\"get_hash\" as the later round of this series does.\n\nAs I mentioned on the list, I think the \"PERL5LIB fix\" I squashed in was a\nmisguided workaround to a wrong problem; if we are making gitweb.perl to\nuse Git.pm, I think we should do the same GITPERLLIB trick we do to other\nperl scripts for consistency.\n\nI've looked at the Git.pm testsuite that uses Test::More briefly but\nhadn't really reviewed it. Is Test::More commonly used, considered solid\nand widely available?\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n* lw/test-fix (Sat May 31 23:11:21 2008 +0200) 1 commit\n + t/test-lib.sh: resolve symlinks in working directory, for pathname\n comparisons\n\n* sb/am-tests (Sun Jun 1 00:11:43 2008 +0200) 2 commits\n + Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh\n + Add test cases for git-am\n\n* lt/pack-sync (Fri May 30 08:54:46 2008 -0700) 2 commits\n + Remove now unnecessary 'sync()' calls\n + Make pack creation always fsync() the result\n\n* sp/remote (Sun Jun 1 00:28:04 2008 -0400) 3 commits\n + Make \"git-remote rm\" delete refs acccording to fetch specs\n + Make \"git-remote prune\" delete refs according to fetch specs\n + Remove unused remote_prefix member in builtin-remote\n\n\"git-remote\" had an unwarranted assumption that everybody uses\nrefs/remotes/$it namespace to track remote repository called $it. This\nseries is a reasonable fix to it.\n\n* np/pack-check (Thu May 29 17:34:50 2008 -0400) 1 commit\n + make verify-pack a bit more useful with bad packs\n\n* lr/init-bare (Wed May 28 19:53:57 2008 +0100) 1 commit\n + git-init: accept --bare option\n\nThis makes both \"git --bare init\" and \"git init --bare\" work, which would\nreduce confusion.\n\n* jc/checkout (Wed May 28 16:11:16 2008 -0700) 4 commits\n + checkout: \"best effort\" checkout\n + unpack_trees(): allow callers to differentiate worktree errors\n from merge errors\n + checkout: consolidate reset_{to_new,clean_to_new|()\n + checkout: make reset_clean_to_new() not die by itself\n\nThis \"fix\" seems to help real-world users.\n\n* jb/reset-q (Sat May 31 18:10:58 2008 -0700) 1 commit\n + git-reset: honor -q and do not show progress message\n\n----------------------------------------------------------------\n[Stalled]\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n + \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this.\n\nThis needs debugging.\n\n* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to. This\nmay help a GSoC project that wants to gather statistical overview of the\nhistory. The final presentation may need tweaking (see the log message of\nthe tip commit on the series).\n\n* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits\n + Use perl instead of tac\n + Fix t3404 assumption that `wc -l` does not use whitespace.\n + rebase -i: Use : in expr command instead of match.\n + rebase -i: update the implementation of 'mark' command\n + Add option --preserve-tags\n + Teach rebase interactive the tag command\n + Add option --first-parent\n + Do rebase with preserve merges with advanced TODO list\n + Select all lines with fake-editor\n + Unify the length of $SHORT* and the commits in the TODO list\n + Teach rebase interactive the merge command\n + Move redo merge code in a function\n + Teach rebase interactive the reset command\n + Teach rebase interactive the mark command\n + Move cleanup code into it's own function\n + Don't append default merge message to -m message\n + fake-editor: output TODO list if unchanged\n\nThis may complement the proposed \"sequencer\" GSoC project. Dscho seems to\nhave quite a strong objection to the 'mark' syntax and mechanism being\nunnecessarily complex. Let's wait and see if a less complex but equally\nexpressive alternative materializes...\n\n* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits\n - Introduce fast forward option only\n - Head reduction before selecting merge strategy\n - Restructure git-merge.sh\n - Introduce -ff=\n - New merge tests\n - Documentation for joining more than two histories\n\nThis will interfere with Miklos's rewrite of merge to C but it appears\nneither will happen by 1.5.6 anyway.\n\n* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits\n - Eliminate an unnecessary chdir(\"..\")\n - Add support for GIT_CEILING_DIRECTORIES\n - Fold test-absolute-path into test-path-utils\n - Implement normalize_absolute_path\n\n----------------------------------------------------------------\n[On Hold]\n\n* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit\n - diff: enable \"too large a rename\" warning when -M/-C is explicitly\n asked for\n\nThis would be the right thing to do for command line use, but gitk will be\nhit due to tcl/tk's limitation, so I am holding this back for now.\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit\n - merge: remove deprecated summary and diffstat options and config\n variables\n\nThis needs to be held back, as it actually removes the support for\nfeatures that the main part of the series deprecates, until 1.6.0 or\nlater.\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour when renames are\ninvolved, by not using merge-recursive (whose d/f conflict resolution is\nquite broken), but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"78342","messageId":"m3hccc1cm0.fsf@localhost.localdomain","threadId":"12603","inReplyTo":"7vod6k6zg4.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-06-02T08:10:22Z","receivedAt":"2008-06-02T08:10:22Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Junio C Hamano writes:\n\n> I've looked at the Git.pm testsuite that uses Test::More briefly but\n> hadn't really reviewed it. Is Test::More commonly used, considered solid\n> and widely available?\n\nIt is part of perl-5.8.6-24 RPM package in Fedora Core 4.\nIt is mentioned in http://www.perlfoundation.org/perl5/index.cgi?testing\n \n> ----------------------------------------------------------------\n> [Graduated to \"master\"]\n> \n> * lr/init-bare (Wed May 28 19:53:57 2008 +0100) 1 commit\n> + git-init: accept --bare option\n> \n> This makes both \"git --bare init\" and \"git init --bare\" work, which would\n> reduce confusion.\n\nNice.\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"78358","messageId":"20080602115622.GC32553@post.servercare.de","threadId":"12603","inReplyTo":"7vod6k6zg4.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Sebastian Bober","fromEmail":"seb@tix64.net","sentAt":"2008-06-02T11:56:22Z","receivedAt":"2008-06-02T11:56:22Z","isPatch":false,"sender":{"key":"seb@tix64.net","avatar":null},"body":"On Mon, Jun 02, 2008 at 12:58:03AM -0700, Junio C Hamano wrote:\n> \n> I've looked at the Git.pm testsuite that uses Test::More briefly but\n> hadn't really reviewed it. Is Test::More commonly used, considered solid\n> and widely available?\n\nyes it is on all three points. It is the most commonly used test module\nfor Perl, used by thousands of CPAN distributions. Test::More is\ndelivered as core module since 5.8.0 or 5.6.2, so is widely deployed. It\nis actively maintained and is integrated in a test framework that allows\nthe use and development of further \"plug-in\" test modules. With that\nit's conceivable to write a test module specifically for git and its\nusage scenarios.\n\nRegards,\n Sebastian\n"},{"id":"78371","messageId":"alpine.DEB.1.00.0806021545340.13507@racer.site.net","threadId":"12603","inReplyTo":"7vod6k6zg4.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-06-02T15:17:05Z","receivedAt":"2008-06-02T15:17:05Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 2 Jun 2008, Junio C Hamano wrote:\n\n> * sp/remote (Sun Jun 1 00:28:04 2008 -0400) 3 commits\n> + Make \"git-remote rm\" delete refs acccording to fetch specs\n> + Make \"git-remote prune\" delete refs according to fetch specs\n> + Remove unused remote_prefix member in builtin-remote\n> \n> \"git-remote\" had an unwarranted assumption that everybody uses \n> refs/remotes/$it namespace to track remote repository called $it. This \n> series is a reasonable fix to it.\n\nAFAIR this limitation was already in the scripted version, and I tried to \nwrap my head around lifting it. However, I did not end up with the \nbrillian analysis of Shawn, and was almost sending a reply contradicting \nhis logic. However, I agree with Shawn that it is the same issue as \ncontradicting fetches, so if it leads to problems, it is a pilot error.\n\n_However_, I still try to come up with some attic for deleted refs. It is \nnot just a matter of moving the logs to a different namespace because of \nD/F conflicts.\n\nCiao,\nDscho\n"},{"id":"78374","messageId":"20080602154320.GK12896@spearce.org","threadId":"12603","inReplyTo":"alpine.DEB.1.00.0806021545340.13507@racer.site.net","subject":"Re: What's cooking in git.git (topics)","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-06-02T15:43:20Z","receivedAt":"2008-06-02T15:43:20Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Johannes Schindelin wrote:\n> _However_, I still try to come up with some attic for deleted refs. It is \n> not just a matter of moving the logs to a different namespace because of \n> D/F conflicts.\n\nRecord the delete at the end of the reflog so we have a date/time\nrecord and the last SHA-1 value, just in case it doesn't match up\nwith the most recent reflog entry (e.g. user ran some legacy tool\nthat just redirect git-commit-tree output to the branch itself).\n\nTake the SHA-1 hash of the reflog now that the final entry is\nwritten. Rename the file to .git/attic/$sha1 and call it a day.\nI thought about compressing the file too, but its not worth saving\nthe disk space here and it would make tools that inspect the attic\nexpensive to run.\n\nThe attic can be easily cleaned out by looking at the timestamp of\nthe last record of each file. Attic log files older than X days can\nbe removed. This is better than reading the modification time of\nthe file as we don't have to worry about some copy tool not saving\nthe modification time if the user moves/copies the repository.\n\nThat's all the easy stuff.\n\nThe hard stuff is:\n\n- Should the commits listed in attic reflogs be considered reachable\n when we pack, prune or fsck? Commits in a reflog are, even if\n they aren't reachable from a transport perspective.\n\n- What command gets the extra options to see what branches are in\n the attic and when they got there?\n\n- What command gets the extra option to recover a branch from the\n attic?\n\n- When we recover a branch from the attic is it sufficient to recover\n it to the name it had at time of deletion? Should we allow you to\n recover it to a different name?\n\n- Is it sufficient to make you recover the branch from the attic\n before you can access the rest of its reflog with porcelain?\n\n- What do we do if we recover a branch with stale reflog entries\n and the attic is deemed to not be reachable (see above).\n\n-- \nShawn.\n"},{"id":"78381","messageId":"alpine.DEB.1.00.0806021659480.13507@racer.site.net","threadId":"12603","inReplyTo":"20080602154320.GK12896@spearce.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-06-02T16:14:18Z","receivedAt":"2008-06-02T16:14:18Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 2 Jun 2008, Shawn O. Pearce wrote:\n\n> Johannes Schindelin wrote:\n> > _However_, I still try to come up with some attic for deleted refs. \n> > It is not just a matter of moving the logs to a different namespace \n> > because of D/F conflicts.\n> \n> Record the delete at the end of the reflog so we have a date/time record \n> and the last SHA-1 value, just in case it doesn't match up with the most \n> recent reflog entry (e.g. user ran some legacy tool that just redirect \n> git-commit-tree output to the branch itself).\n\nThat's obvious.\n\n> Take the SHA-1 hash of the reflog now that the final entry is written. \n> Rename the file to .git/attic/$sha1 and call it a day. I thought about \n> compressing the file too, but its not worth saving the disk space here \n> and it would make tools that inspect the attic expensive to run.\n> \n> The attic can be easily cleaned out by looking at the timestamp of the \n> last record of each file. Attic log files older than X days can be \n> removed. This is better than reading the modification time of the file \n> as we don't have to worry about some copy tool not saving the \n> modification time if the user moves/copies the repository.\n\nI actually would prefer to have the logs in the .git/logs/ directory, so \nthat I can easily reuse all existing reflog handling.\n\nAfter sending the mail, I actually got an idea:\n\n\t.git/logs/attic//\n\nI think this should work without problems. In that case, git-gc also \nhandles the garbage collection.\n\n> The hard stuff is:\n> \n> - Should the commits listed in attic reflogs be considered reachable \n> when we pack, prune or fsck? Commits in a reflog are, even if they \n> aren't reachable from a transport perspective.\n\nYes, they should. That is the whole purpose of keeping the reflogs: I \nwant to be able to resurrect the branch, if I deleted it by accident.\n\n> - What command gets the extra options to see what branches are in the \n> attic and when they got there?\n\nI'd like to have them listed with the other reflogs.\n\n> - What command gets the extra option to recover a branch from the attic?\n\nNone. It is the user's responsibility to use the information wisely.\n\ngit branch resurrected attic//refs/heads/accidentally-deleted@{1}\n\n> - When we recover a branch from the attic is it sufficient to recover it \n> to the name it had at time of deletion? Should we allow you to \n> recover it to a different name?\n\nSee above. I think resurrecting under the same name would not necessarily \nbe the most frequent operation on deleted refs.\n\n> - Is it sufficient to make you recover the branch from the attic before \n> you can access the rest of its reflog with porcelain?\n> \n> - What do we do if we recover a branch with stale reflog entries\n> and the attic is deemed to not be reachable (see above).\n\nI'll just go with my idea, implement it, and post it here for discussion.\n\nCiao,\nDscho\n"},{"id":"78391","messageId":"7vej7f7lj5.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"alpine.DEB.1.00.0806021659480.13507@racer.site.net","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-02T18:13:18Z","receivedAt":"2008-06-02T18:13:18Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> After sending the mail, I actually got an idea:\n>\n> \t.git/logs/attic//\n>\n> I think this should work without problems. In that case, git-gc also \n> handles the garbage collection.\n\nI do not like that particular color of the bikeshed, but I'd agree that it\ncertainly is the easiest route from both the implementation and the design\npoint of view. All of the \"hard stuff\" Shawn mentions goes away, and you \nare left with only one new \"hard stuff\", which is much easier to solve:\n\n - Should there be a way to really remove the archived reflog?\n\nAnd my answer is \"yes, a new subcommand to 'git-reflog' to list and\nanother subcommand to remove one\".\n\nAs to default behaviour, probably we would by default archive any local\nbranches, and _not_ archive other things like remote trackers and tags. A\nnew configuration variable reflog.archive = {none,heads,all} would be\nhonored and absense of it defaults to reflog.archive = heads.\n"},{"id":"78396","messageId":"alpine.DEB.1.00.0806022012510.13507@racer.site.net","threadId":"12603","inReplyTo":"7vej7f7lj5.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-06-02T19:17:46Z","receivedAt":"2008-06-02T19:17:46Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 2 Jun 2008, Junio C Hamano wrote:\n\n> Johannes Schindelin writes:\n> \n> > After sending the mail, I actually got an idea:\n> >\n> > \t.git/logs/attic//\n> >\n> > I think this should work without problems. In that case, git-gc also \n> > handles the garbage collection.\n> \n> I do not like that particular color of the bikeshed, but I'd agree that \n> it certainly is the easiest route from both the implementation and the \n> design point of view.\n\nOkay, how about \"deleted-%d.%m.%Y-%H:%M:%S\" instead of \"attic/%s\"?\n\n> All of the \"hard stuff\" Shawn mentions goes away, and you are left with \n> only one new \"hard stuff\", which is much easier to solve:\n> \n> - Should there be a way to really remove the archived reflog?\n> \n> And my answer is \"yes, a new subcommand to 'git-reflog' to list and\n> another subcommand to remove one\".\n\nYou mean a subcommand to list just the refs that exist in the deleted-* \nnamespace?\n\nAs to remove one, how about:\n\n\t git reflog --expire=now --expire-unreachable=now \\\n\t\tdeleted-/\n\nHmm?\n\n> As to default behaviour, probably we would by default archive any local \n> branches, and _not_ archive other things like remote trackers and tags. \n\nUnfortunately, this is exactly what I need: remote trackers and tags. \nSince I have to delete branches from repo.or.cz as long as the pruning of \nforked projects' objects does not work correctly.\n\n> A new configuration variable reflog.archive = {none,heads,all} would be \n> honored and absense of it defaults to reflog.archive = heads.\n\nSure, that makes sense. I'd just \"git config --global reflog.archive \nall\".\n\nCiao,\nDscho\n"},{"id":"78399","messageId":"alpine.DEB.1.00.0806022025030.13507@racer.site.net","threadId":"12603","inReplyTo":"alpine.DEB.1.00.0806022012510.13507@racer.site.net","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-06-02T19:25:47Z","receivedAt":"2008-06-02T19:25:47Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 2 Jun 2008, Johannes Schindelin wrote:\n\n> On Mon, 2 Jun 2008, Junio C Hamano wrote:\n> \n> > Johannes Schindelin writes:\n> > \n> > > After sending the mail, I actually got an idea:\n> > >\n> > > \t.git/logs/attic//\n\nJust tried that, and for obvious reasons it fails the testsuite: Git is \njust too darned fast.\n\nCiao,\nDscho\n"},{"id":"79704","messageId":"7v4p7xwsfp.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vod6k6zg4.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-13T10:16:42Z","receivedAt":"2008-06-13T10:16:42Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nIt's been a while since the last issue of this series. I've been\nswamped, and haven't had a chance to spend enough time on reviewing and\naccepting patches.\n\nA rough timeline from now on.\n\n * 1.5.6-rc3 this weekend.\n\n * 1.5.6 Final (2008-06-20).\n\n----------------------------------------------------------------\n[New Topics]\n\n* jn/web (Tue Jun 10 19:21:44 2008 +0200) 2 commits\n - gitweb: Separate generating 'sort by' table header\n - gitweb: Separate filling list of projects info\n\n* rs/archive-ignore (Sun Jun 8 18:42:33 2008 +0200) 1 commit\n + Teach new attribute 'export-ignore' to git-archive\n\n* rg/gitweb (Fri Jun 6 09:53:32 2008 +0200) 1 commit\n + gitweb: remove git_blame and rename git_blame2 to git_blame\n\n* kh/update-ref (Tue Jun 3 01:34:53 2008 +0200) 2 commits\n + Make old sha1 optional with git update-ref -d\n + Clean up builtin-update-ref's option parsing\n\n* mo/status-untracked (Thu Jun 5 14:47:50 2008 +0200) 3 commits\n - Add configuration option for default untracked files mode\n - Add argument 'no' commit/status option -u|--untracked-files\n - Add an optional argument to commit/status -u|--untracked-\n files option\n\n* rs/attr (Sun Jun 8 17:16:11 2008 +0200) 1 commit\n + Ignore .gitattributes in bare repositories\n\n* sr/tests (Sun Jun 8 16:04:35 2008 +0200) 3 commits\n + Hook up the result aggregation in the test makefile.\n + A simple script to parse the results from the testcases\n + Modify test-lib.sh to output stats to t/test-results/*\n\nNone of the above are 1.5.6 material, except for the \"ignore\n.gitattributes file in bare repositories\" from René, which I think we\nshould have.\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\nNothing this week.\n\n----------------------------------------------------------------\n[Stalled]\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n + \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this.\n\nThis needs debugging.\n\n* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits\n - blame: show \"previous\" information in --porcelain/--incremental\n format\n - git-blame: refactor code to emit \"porcelain format\" output\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to. This\nmay help a GSoC project that wants to gather statistical overview of the\nhistory. The final presentation may need tweaking (see the log message of\nthe commit \"\"git-blame --reverse\" on the series).\n\n* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits\n + Use perl instead of tac\n + Fix t3404 assumption that `wc -l` does not use whitespace.\n + rebase -i: Use : in expr command instead of match.\n + rebase -i: update the implementation of 'mark' command\n + Add option --preserve-tags\n + Teach rebase interactive the tag command\n + Add option --first-parent\n + Do rebase with preserve merges with advanced TODO list\n + Select all lines with fake-editor\n + Unify the length of $SHORT* and the commits in the TODO list\n + Teach rebase interactive the merge command\n + Move redo merge code in a function\n + Teach rebase interactive the reset command\n + Teach rebase interactive the mark command\n + Move cleanup code into it's own function\n + Don't append default merge message to -m message\n + fake-editor: output TODO list if unchanged\n\nThis may complement the proposed \"sequencer\" GSoC project. Dscho seems to\nhave quite a strong objection to the 'mark' syntax and mechanism being\nunnecessarily complex. Let's wait and see if a less complex but equally\nexpressive alternative materializes...\n\nIt is very likely that this whole thing will be reverted from 'next' and\nbe replaced with the new sequenser series during 1.6.0 cycle.\n\n* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits\n - Introduce fast forward option only\n - Head reduction before selecting merge strategy\n - Restructure git-merge.sh\n - Introduce -ff=\n - New merge tests\n - Documentation for joining more than two histories\n\nThis will interfere with Miklos's rewrite of merge to C but it appears\nneither will happen by 1.5.6 anyway.\n\n* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits\n - Eliminate an unnecessary chdir(\"..\")\n - Add support for GIT_CEILING_DIRECTORIES\n - Fold test-absolute-path into test-path-utils\n - Implement normalize_absolute_path\n\n----------------------------------------------------------------\n[On Hold]\n\n* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit\n - diff: enable \"too large a rename\" warning when -M/-C is explicitly\n asked for\n\nThis would be the right thing to do for command line use, but gitk will be\nhit due to tcl/tk's limitation, so I am holding this back for now.\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit\n - merge: remove deprecated summary and diffstat options and config\n variables\n\nThis needs to be held back, as it actually removes the support for\nfeatures that the main part of the series deprecates, until 1.6.0 or\nlater.\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour when renames are\ninvolved, by not using merge-recursive (whose d/f conflict resolution is\nquite broken), but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"80207","messageId":"7v3anb19n7.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7v4p7xwsfp.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-18T07:31:56Z","receivedAt":"2008-06-18T07:31:56Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nIt's been a while since the last issue of this series. I've been\nswamped, and haven't had a chance to spend enough time on reviewing and\naccepting patches.\n\nA rough timeline from now on.\n\n * 1.5.6 Final (late this week).\n\n----------------------------------------------------------------\n[New Topics]\n\n* jh/clone-packed-refs (Sun Jun 15 16:06:16 2008 +0200) 4 commits\n - Teach \"git clone\" to pack refs\n - Prepare testsuite for a \"git clone\" that packs refs\n - Move pack_refs() and friends into libgit\n - Incorporate fetched packs in future object traversal\n\nWould be helpful cloning from a repository with insanely large number of\nrefs.\n\n* jc/reflog-expire (Sun Jun 15 23:48:46 2008 -0700) 1 commit\n - Per-ref reflog expiry configuration\n\nPerhaps a good foundation for optionally unexpirable stash.\n\n* lw/perlish (Tue Jun 17 08:59:51 2008 +0200) 2 commits\n - Git.pm: add test suite\n - t/test-lib.sh: add test_external and test_external_without_stderr\n\nIO::String dependency is a bit worrysome, and the error diagnostic could\nhopefully be made more obvious, but I do not have a fundamental objection\nto this series.\n\n* jk/test (Sat Jun 14 03:28:07 2008 -0400) 5 commits\n + enable whitespace checking of test scripts\n + avoid trailing whitespace in zero-change diffstat lines\n + avoid whitespace on empty line in automatic usage message\n + mask necessary whitespace policy violations in test scripts\n + fix whitespace violations in test scripts\n\nTightens whitespace rules for t/*.sh scripts.\n\n* pb/fast-export (Wed Jun 11 13:17:04 2008 +0200) 1 commit\n - builtin-fast-export: Add importing and exporting of revision marks\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n* rs/attr (Sun Jun 8 17:16:11 2008 +0200) 1 commit\n + Ignore .gitattributes in bare repositories\n\n----------------------------------------------------------------\n[On Hold]\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n + \"git push\": tellme-more protocol extension\n\nAllows common ancestor negotiation for git-push to help people with shared\nrepository workflow in certain minority situations. The lack of protocol\nsupport has been bugging me for quite some time, and that was the reason I\ndid this.\n\nThis needs debugging.\n\n* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits\n - blame: show \"previous\" information in --porcelain/--incremental\n format\n - git-blame: refactor code to emit \"porcelain format\" output\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to. This\nmay help a GSoC project that wants to gather statistical overview of the\nhistory. The final presentation may need tweaking (see the log message of\nthe commit \"\"git-blame --reverse\" on the series).\n\n* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits\n + Use perl instead of tac\n + Fix t3404 assumption that `wc -l` does not use whitespace.\n + rebase -i: Use : in expr command instead of match.\n + rebase -i: update the implementation of 'mark' command\n + Add option --preserve-tags\n + Teach rebase interactive the tag command\n + Add option --first-parent\n + Do rebase with preserve merges with advanced TODO list\n + Select all lines with fake-editor\n + Unify the length of $SHORT* and the commits in the TODO list\n + Teach rebase interactive the merge command\n + Move redo merge code in a function\n + Teach rebase interactive the reset command\n + Teach rebase interactive the mark command\n + Move cleanup code into it's own function\n + Don't append default merge message to -m message\n + fake-editor: output TODO list if unchanged\n\nIt is very likely that this whole thing will be reverted from 'next' and\nbe replaced with the new sequenser series during 1.6.0 cycle.\n\n* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits\n - Introduce fast forward option only\n - Head reduction before selecting merge strategy\n - Restructure git-merge.sh\n - Introduce -ff=\n - New merge tests\n - Documentation for joining more than two histories\n\nThis will interfere with Miklos's rewrite of merge to C. There is no\nfundamental reason to favor one over the other, so I'll be torn after\n1.5.6 happens, but not before.\n\n* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits\n - Eliminate an unnecessary chdir(\"..\")\n - Add support for GIT_CEILING_DIRECTORIES\n - Fold test-absolute-path into test-path-utils\n - Implement normalize_absolute_path\n\n* jn/web (Tue Jun 10 19:21:44 2008 +0200) 2 commits\n - gitweb: Separate generating 'sort by' table header\n - gitweb: Separate filling list of projects info\n\n* rs/archive-ignore (Sun Jun 8 18:42:33 2008 +0200) 1 commit\n + Teach new attribute 'export-ignore' to git-archive\n\n* rg/gitweb (Fri Jun 6 09:53:32 2008 +0200) 1 commit\n + gitweb: remove git_blame and rename git_blame2 to git_blame\n\n* kh/update-ref (Tue Jun 3 01:34:53 2008 +0200) 2 commits\n + Make old sha1 optional with git update-ref -d\n + Clean up builtin-update-ref's option parsing\n\n* mo/status-untracked (Thu Jun 5 14:47:50 2008 +0200) 3 commits\n - Add configuration option for default untracked files mode\n - Add argument 'no' commit/status option -u|--untracked-files\n - Add an optional argument to commit/status -u|--untracked-\n files option\n\n* sr/tests (Sun Jun 8 16:04:35 2008 +0200) 3 commits\n + Hook up the result aggregation in the test makefile.\n + A simple script to parse the results from the testcases\n + Modify test-lib.sh to output stats to t/test-results/*\n\n* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit\n - diff: enable \"too large a rename\" warning when -M/-C is explicitly\n asked for\n\nThis would be the right thing to do for command line use, but gitk will be\nhit due to tcl/tk's limitation, so I am holding this back for now.\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit\n - merge: remove deprecated summary and diffstat options and config\n variables\n\nThis needs to be held back, as it actually removes the support for\nfeatures that the main part of the series deprecates, until 1.6.0 or\nlater.\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n - Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour when renames are\ninvolved, by not using merge-recursive (whose d/f conflict resolution is\nquite broken), but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"80300","messageId":"200806191058.58074.johan@herland.net","threadId":"12603","inReplyTo":"7v3anb19n7.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Johan Herland","fromEmail":"johan@herland.net","sentAt":"2008-06-19T08:58:58Z","receivedAt":"2008-06-19T08:58:58Z","isPatch":false,"sender":{"key":"johan@herland.net","avatar":"https://avatars.githubusercontent.com/u/547031?v=4"},"body":"On Wednesday 18 June 2008, Junio C Hamano wrote:\n> [New Topics]\n>\n> * jh/clone-packed-refs (Sun Jun 15 16:06:16 2008 +0200) 4 commits\n> - Teach \"git clone\" to pack refs\n> - Prepare testsuite for a \"git clone\" that packs refs\n> - Move pack_refs() and friends into libgit\n> - Incorporate fetched packs in future object traversal\n>\n> Would be helpful cloning from a repository with insanely large number of\n> refs.\n\nThe first 3 patches (i.e. the bottom 3 in the above list) might be \nconsidered general cleanup patches, and are independent of each other (i.e. \nyou might want to include them on their own merit, independently of patch \n#4).\n\nThe final patch doesn't make any difference for \"regular\" repos (e.g. \ngit.git with ~200 refs) on Linux (see below). But once the number of refs \nincrease, the difference becomes obvious.\n\nHere are some numbers to give some more context:\n\nAll tests done on 64-bit quad-core Linux, cloning locally (hard-linked):\n\n~200 refs (git.git):\ncurrent next: 0.2s\nw/above patches: 0.2s\n\n~1000 refs (test repo):\ncurrent next: 0.16s\nw/above patches: 0.05s\n\n~11000 refs (test repo):\ncurrent next: 1.3s\nw/above patches: 0.3s\n\n~26000 refs (actual repo at $dayjob):\ncurrent next: 3.2s\nw/above patches: 0.8s\n\n\nRegards,\n\n...Johan\n\n-- \nJohan Herland, \nwww.herland.net\n"},{"id":"80535","messageId":"7vwskjazql.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7v3anb19n7.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-21T09:44:50Z","receivedAt":"2008-06-21T09:44:50Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nIt already is beginning to become clear what 1.6.0 will look like. What's\nalready in 'next' all are well intentioned (I do not guarantee they are\nalready bug-free --- that is what cooking them in 'next' is for) and are\ngood set of feature enhancements. But bigger changes will be:\n\n * MinGW will be in.\n\n * /usr/bin/git-cat-file is no more. The bulk of the git commands will\n move to /usr/libexec/git-core/ or somesuch.\n\n * git-merge will be rewritten in C.\n\nCurrently tip of 'pu' is broken and does not pass tests, as j6t/mingw has\ninteraction with dr/ceiling and jc/merge-theirs has interaction with\nmv/merge-in-c.\n\n----------------------------------------------------------------\n[New Topics]\n\n* jc/merge-theirs (Fri Jun 20 00:17:59 2008 -0700) 2 commits\n - git-merge-recursive-{ours,theirs}\n - git-merge-file --ours, --theirs\n\nPunting a merge by discarding your own work in conflicting parts but still\nsalvaging the parts that are cleanly automerged. It is likely that this\nwill result in nonsense mishmash, but somehow often people want this, so\nhere they are. The interface to the backends may need to change, though.\n\n* lt/racy-empty (Tue Jun 10 10:44:43 2008 -0700) 1 commit\n + racy-git: an empty blob has a fixed object name\n\n* ph/mergetool (Mon Jun 16 17:33:41 2008 -0600) 1 commit\n + Remove the use of '--' in merge program invocation\n\n* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits\n - compat/pread.c: Add a forward declaration to fix a warning\n - Windows: Fix ntohl() related warnings about printf formatting\n - Windows: TMP and TEMP environment variables specify a temporary\n directory.\n - Windows: Make 'git help -a' work.\n - Windows: Work around an oddity when a pipe with no reader is\n written to.\n - Windows: Make the pager work.\n - When installing, be prepared that template_dir may be relative.\n - Windows: Use a relative default template_dir and ETC_GITCONFIG\n - Windows: Compute the fallback for exec_path from the program\n invocation.\n - Turn builtin_exec_path into a function.\n - Windows: Use a customized struct stat that also has the st_blocks\n member.\n - Windows: Add a custom implementation for utime().\n - Windows: Add a new lstat and fstat implementation based on Win32\n API.\n - Windows: Implement a custom spawnve().\n - Windows: Implement wrappers for gethostbyname(), socket(), and\n connect().\n - Windows: Work around incompatible sort and find.\n - Windows: Implement asynchronous functions as threads.\n - Windows: Disambiguate DOS style paths from SSH URLs.\n - Windows: A rudimentary poll() emulation.\n - Windows: Change the name of hook scripts to make them not\n executable.\n - Windows: Implement start_command().\n - Windows: A pipe() replacement whose ends are not inherited to\n children.\n - Windows: Wrap execve so that shell scripts can be invoked.\n - Windows: Implement setitimer() and sigaction().\n - Windows: Fix PRIuMAX definition.\n - Windows: Implement gettimeofday().\n - Windows: Handle absolute paths in\n safe_create_leading_directories().\n - Windows: Treat Windows style path names.\n - setup.c: Prepare for Windows directory separators.\n - Windows: Work around misbehaved rename().\n - Windows: always chmod(, 0666) before unlink().\n - Windows: A minimal implemention of getpwuid().\n - Windows: Implement a wrapper of the open() function.\n - Windows: Strip \".exe\" from the program name.\n - Windows: Use the Windows style PATH separator ';'.\n - Add target architecture MinGW.\n - Compile some programs only conditionally.\n - Add compat/regex.[ch] and compat/fnmatch.[ch].\n\nNo explanation is necessary ;-).\n\n* sn/static (Thu Jun 19 08:21:11 2008 +0900) 2 commits\n + config.c: make git_env_bool() static\n + environment.c: remove unused function\n\n* lt/config-fsync (Wed Jun 18 15:18:44 2008 -0700) 4 commits\n + Add config option to enable 'fsync()' of object files\n + Split up default \"i18n\" and \"branch\" config parsing into helper\n routines\n + Split up default \"user\" config parsing into helper routine\n + Split up default \"core\" config parsing into helper routine\n\n* lw/gitweb (Thu Jun 19 22:03:21 2008 +0200) 1 commit\n + gitweb: standarize HTTP status codes\n\n* mv/merge-in-c (Fri Jun 20 01:22:36 2008 +0200) 11 commits\n - Add new test to ensure git-merge handles more than 25 refs.\n - Build in merge\n - Introduce filter_independent() in commit.c\n - Introduce get_octopus_merge_bases() in commit.c\n - git-fmt-merge-msg: make it usable from other builtins\n - Move read_cache_unmerged() to read-cache.c\n - parseopt: add a new PARSE_OPT_ARGV0_IS_AN_OPTION option\n - Add new test to ensure git-merge handles pull.twohead and\n pull.octopus\n - Move parse-options's skip_prefix() to git-compat-util.h\n - Move commit_list_count() to commit.c\n - Move split_cmdline() to alias.c\n\n* jc/maint-combine-diff-pre-context (Wed Jun 18 23:59:41 2008 -0700) 1 commit\n + diff -c/--cc: do not include uninteresting deletion before leading\n context\n\n* lt/maint-gitdir-relative (Thu Jun 19 12:34:06 2008 -0700) 1 commit\n + Make git_dir a path relative to work_tree in setup_work_tree()\n\n----------------------------------------------------------------\n[Actively Cooking]\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n + Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit\n + merge: remove deprecated summary and diffstat options and config\n variables\n\n* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits\n + Eliminate an unnecessary chdir(\"..\")\n + Add support for GIT_CEILING_DIRECTORIES\n + Fold test-absolute-path into test-path-utils\n + Implement normalize_absolute_path\n\n* jn/web (Tue Jun 10 19:21:44 2008 +0200) 2 commits\n + gitweb: Separate generating 'sort by' table header\n + gitweb: Separate filling list of projects info\n\n* rs/archive-ignore (Sun Jun 8 18:42:33 2008 +0200) 1 commit\n + Teach new attribute 'export-ignore' to git-archive\n\n* rg/gitweb (Fri Jun 6 09:53:32 2008 +0200) 1 commit\n + gitweb: remove git_blame and rename git_blame2 to git_blame\n\n* kh/update-ref (Tue Jun 3 01:34:53 2008 +0200) 2 commits\n + Make old sha1 optional with git update-ref -d\n + Clean up builtin-update-ref's option parsing\n\n* mo/status-untracked (Thu Jun 5 14:47:50 2008 +0200) 3 commits\n + Add configuration option for default untracked files mode\n + Add argument 'no' commit/status option -u|--untracked-files\n + Add an optional argument to commit/status -u|--untracked-\n files option\n\n* sr/tests (Sun Jun 8 16:04:35 2008 +0200) 3 commits\n + Hook up the result aggregation in the test makefile.\n + A simple script to parse the results from the testcases\n + Modify test-lib.sh to output stats to t/test-results/*\n\n* jh/clone-packed-refs (Sun Jun 15 16:06:16 2008 +0200) 4 commits\n + Teach \"git clone\" to pack refs\n + Prepare testsuite for a \"git clone\" that packs refs\n + Move pack_refs() and friends into libgit\n + Incorporate fetched packs in future object traversal\n\nThis is useful when cloning from a repository with insanely large number\nof refs.\n\n* jc/reflog-expire (Sun Jun 15 23:48:46 2008 -0700) 1 commit\n - Per-ref reflog expiry configuration\n\nPerhaps a good foundation for optionally unexpirable stash. As 1.6.0 will\nbe a good time to make backward incompatible changes, we might make expiry\nperiod of stash 'never' in new repositories. Needs a concensus.\n\n* lw/perlish (Thu Jun 19 22:32:49 2008 +0200) 2 commits\n + Git.pm: add test suite\n + t/test-lib.sh: add test_external and test_external_without_stderr\n\nBeginning of regression tests for Perl part of the system.\n\n* jk/test (Sat Jun 14 03:28:07 2008 -0400) 5 commits\n + enable whitespace checking of test scripts\n + avoid trailing whitespace in zero-change diffstat lines\n + avoid whitespace on empty line in automatic usage message\n + mask necessary whitespace policy violations in test scripts\n + fix whitespace violations in test scripts\n\nTightens whitespace rules for t/*.sh scripts.\n\n* pb/fast-export (Wed Jun 11 13:17:04 2008 +0200) 1 commit\n + builtin-fast-export: Add importing and exporting of revision marks\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\nNothing today but expect many small ones to come out of 'next' this\nweekend.\n\n----------------------------------------------------------------\n[On Hold]\n\n* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits\n - blame: show \"previous\" information in --porcelain/--incremental\n format\n - git-blame: refactor code to emit \"porcelain format\" output\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to. This\nmay help a GSoC project that wants to gather statistical overview of the\nhistory. The final presentation may need tweaking (see the log message of\nthe commit \"\"git-blame --reverse\" on the series).\n\nThe tip two commits are for peeling to see what's behind the blamed\ncommit, which we should be able to separate out into an independent topic\nfrom the rest.\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n - \"git push\": tellme-more protocol extension\n\nKicked back to 'pu' for now.\n\n* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits\n - Use perl instead of tac\n - Fix t3404 assumption that `wc -l` does not use whitespace.\n - rebase -i: Use : in expr command instead of match.\n - rebase -i: update the implementation of 'mark' command\n - Add option --preserve-tags\n - Teach rebase interactive the tag command\n - Add option --first-parent\n - Do rebase with preserve merges with advanced TODO list\n - Select all lines with fake-editor\n - Unify the length of $SHORT* and the commits in the TODO list\n - Teach rebase interactive the merge command\n - Move redo merge code in a function\n - Teach rebase interactive the reset command\n - Teach rebase interactive the mark command\n - Move cleanup code into it's own function\n - Don't append default merge message to -m message\n - fake-editor: output TODO list if unchanged\n\nIt is very likely that this whole thing will be reverted from 'next' and\nbe replaced with the new sequenser series during 1.6.0 cycle.\n\n* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits\n - Introduce fast forward option only\n - Head reduction before selecting merge strategy\n - Restructure git-merge.sh\n - Introduce -ff=\n - New merge tests\n - Documentation for joining more than two histories\n\nThis will interfere with Miklos's rewrite of merge to C.\n\n* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit\n - diff: enable \"too large a rename\" warning when -M/-C is explicitly\n asked for\n\nThis would be the right thing to do for command line use, but gitk will be\nhit due to tcl/tk's limitation, so I am holding this back for now.\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n - WIP: rethink replay merge\n - Start using replay-tree merge in cherry-pick\n - revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour when renames are\ninvolved, by not using merge-recursive (whose d/f conflict resolution is\nquite broken), but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n - git-am --forge: add Signed-off-by: line for the author\n - git-am: clean-up Signed-off-by: lines\n - stripspace: add --log-clean option to clean up signed-off-by:\n lines\n - stripspace: use parse_options()\n - Add \"git am -s\" test\n - git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n"},{"id":"80545","messageId":"20080621121429.GI29404@genesis.frugalware.org","threadId":"12603","inReplyTo":"7vwskjazql.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-06-21T12:14:29Z","receivedAt":"2008-06-21T12:14:29Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Sat, Jun 21, 2008 at 02:44:50AM -0700, Junio C Hamano wrote:\n> * nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n> + Move all dashed-form commands to libexecdir\n> \n> Scheduled for 1.6.0.\n> \n> * jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n> - Prepare execv_git_cmd() for removal of builtins from the\n> filesystem\n> - git-shell: accept \"git foo\" form\n> \n> We do not plan to remove git-foo form completely from the filesystem at\n> this point, but git-shell may need to be updated.\n\nI may be wrong, but given that git-upload-pack/receive-pack is now not\nin PATH, I think it will be problematic to do a pull/push in case the\nserver runs next, the client is 1.5.6 and the user has git-shell as\nshell, for example.\n\nOr have I missed something?\n\nThanks\n"},{"id":"80681","messageId":"7vk5ggipuw.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vwskjazql.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-23T07:15:35Z","receivedAt":"2008-06-23T07:15:35Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nIt already is beginning to become clear what 1.6.0 will look like. What's\nalready in 'next' all are well intentioned (I do not guarantee they are\nalready bug-free --- that is what cooking them in 'next' is for) and are\ngood set of feature enhancements. But bigger changes will be:\n\n * MinGW will be in.\n\n * /usr/bin/git-cat-file is no more. The bulk of the git commands will\n move to /usr/libexec/git-core/ or somesuch.\n\n * git-merge will be rewritten in C.\n\nCurrently tip of 'pu' is broken and does not pass tests, as j6t/mingw has\ninteraction with dr/ceiling and jc/merge-theirs has interaction with\nmv/merge-in-c.\n\n----------------------------------------------------------------\n[New Topics]\n\n* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits\n - rerere.autoupdate\n - t4200: fix rerere test\n - rerere: remove dubious \"tail_optimization\"\n - git-rerere: detect unparsable conflicts\n - rerere: rerere_created_at() and has_resolution() abstraction\n\n* sb/rebase (Sun Jun 22 01:55:50 2008 +0200) 2 commits\n + t3404: stricter tests for git-rebase--interactive\n + api-builtin.txt: update and fix typo\n\n* sb/maint-rebase (Sun Jun 22 16:07:02 2008 +0200) 1 commit\n + git-rebase.sh: Add check if rebase is in progress\n\n----------------------------------------------------------------\n[Will merge to master soon]\n\n* lw/gitweb (Thu Jun 19 22:03:21 2008 +0200) 1 commit\n + gitweb: standarize HTTP status codes\n\n* lt/config-fsync (Wed Jun 18 15:18:44 2008 -0700) 4 commits\n + Add config option to enable 'fsync()' of object files\n + Split up default \"i18n\" and \"branch\" config parsing into helper\n routines\n + Split up default \"user\" config parsing into helper routine\n + Split up default \"core\" config parsing into helper routine\n\n* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n + Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0.\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit\n + merge: remove deprecated summary and diffstat options and config\n variables\n\n* sr/tests (Sun Jun 8 16:04:35 2008 +0200) 3 commits\n + Hook up the result aggregation in the test makefile.\n + A simple script to parse the results from the testcases\n + Modify test-lib.sh to output stats to t/test-results/*\n\n* jh/clone-packed-refs (Sun Jun 15 16:06:16 2008 +0200) 4 commits\n + Teach \"git clone\" to pack refs\n + Prepare testsuite for a \"git clone\" that packs refs\n + Move pack_refs() and friends into libgit\n + Incorporate fetched packs in future object traversal\n\nThis is useful when cloning from a repository with insanely large number\nof refs.\n\n* lw/perlish (Thu Jun 19 22:32:49 2008 +0200) 2 commits\n + Git.pm: add test suite\n + t/test-lib.sh: add test_external and test_external_without_stderr\n\nBeginning of regression tests for Perl part of the system.\n\n----------------------------------------------------------------\n[Actively Cooking]\n\n* mv/merge-in-c (Sat Jun 21 19:15:35 2008 +0200) 14 commits\n - Add new test case to ensure git-merge reduces octopus parents when\n possible\n - Add new test case to ensure git-merge filters for independent\n parents\n - Build in merge\n - Introduce reduce_heads()\n - Introduce get_merge_bases_many()\n - Add new test to ensure git-merge handles more than 25 refs.\n - Introduce get_octopus_merge_bases() in commit.c\n - git-fmt-merge-msg: make it usable from other builtins\n - Move read_cache_unmerged() to read-cache.c\n - parseopt: add a new PARSE_OPT_ARGV0_IS_AN_OPTION option\n - Add new test to ensure git-merge handles pull.twohead and\n pull.octopus\n - Move parse-options's skip_prefix() to git-compat-util.h\n - Move commit_list_count() to commit.c\n - Move split_cmdline() to alias.c\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n - Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n - git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits\n + Eliminate an unnecessary chdir(\"..\")\n + Add support for GIT_CEILING_DIRECTORIES\n + Fold test-absolute-path into test-path-utils\n + Implement normalize_absolute_path\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n* rs/archive-ignore (Sun Jun 8 18:42:33 2008 +0200) 1 commit\n + Teach new attribute 'export-ignore' to git-archive\n\n* lt/racy-empty (Tue Jun 10 10:44:43 2008 -0700) 1 commit\n + racy-git: an empty blob has a fixed object name\n\n* sn/static (Thu Jun 19 08:21:11 2008 +0900) 2 commits\n + config.c: make git_env_bool() static\n + environment.c: remove unused function\n\n* jc/maint-combine-diff-pre-context (Wed Jun 18 23:59:41 2008 -0700) 1 commit\n + diff -c/--cc: do not include uninteresting deletion before leading\n context\n\n* lt/maint-gitdir-relative (Thu Jun 19 12:34:06 2008 -0700) 1 commit\n + Make git_dir a path relative to work_tree in setup_work_tree()\n\n* jn/web (Tue Jun 10 19:21:44 2008 +0200) 2 commits\n + gitweb: Separate generating 'sort by' table header\n + gitweb: Separate filling list of projects info\n\n* rg/gitweb (Fri Jun 6 09:53:32 2008 +0200) 1 commit\n + gitweb: remove git_blame and rename git_blame2 to git_blame\n\n* kh/update-ref (Tue Jun 3 01:34:53 2008 +0200) 2 commits\n + Make old sha1 optional with git update-ref -d\n + Clean up builtin-update-ref's option parsing\n\n* mo/status-untracked (Thu Jun 5 14:47:50 2008 +0200) 3 commits\n + Add configuration option for default untracked files mode\n + Add argument 'no' commit/status option -u|--untracked-files\n + Add an optional argument to commit/status -u|--untracked-\n files option\n\n* jk/test (Sat Jun 14 03:28:07 2008 -0400) 5 commits\n + enable whitespace checking of test scripts\n + avoid trailing whitespace in zero-change diffstat lines\n + avoid whitespace on empty line in automatic usage message\n + mask necessary whitespace policy violations in test scripts\n + fix whitespace violations in test scripts\n\nTightens whitespace rules for t/*.sh scripts.\n\n* pb/fast-export (Wed Jun 11 13:17:04 2008 +0200) 1 commit\n + builtin-fast-export: Add importing and exporting of revision marks\n\n----------------------------------------------------------------\n[On Hold]\n\n* ph/mergetool (Mon Jun 16 17:33:41 2008 -0600) 1 commit\n + Remove the use of '--' in merge program invocation\n\nWaiting for success reports from people who use various backends.\n\n* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits\n - compat/pread.c: Add a forward declaration to fix a warning\n - Windows: Fix ntohl() related warnings about printf formatting\n - Windows: TMP and TEMP environment variables specify a temporary\n directory.\n - Windows: Make 'git help -a' work.\n - Windows: Work around an oddity when a pipe with no reader is\n written to.\n - Windows: Make the pager work.\n - When installing, be prepared that template_dir may be relative.\n - Windows: Use a relative default template_dir and ETC_GITCONFIG\n - Windows: Compute the fallback for exec_path from the program\n invocation.\n - Turn builtin_exec_path into a function.\n - Windows: Use a customized struct stat that also has the st_blocks\n member.\n - Windows: Add a custom implementation for utime().\n - Windows: Add a new lstat and fstat implementation based on Win32\n API.\n - Windows: Implement a custom spawnve().\n - Windows: Implement wrappers for gethostbyname(), socket(), and\n connect().\n - Windows: Work around incompatible sort and find.\n - Windows: Implement asynchronous functions as threads.\n - Windows: Disambiguate DOS style paths from SSH URLs.\n - Windows: A rudimentary poll() emulation.\n - Windows: Change the name of hook scripts to make them not\n executable.\n - Windows: Implement start_command().\n - Windows: A pipe() replacement whose ends are not inherited to\n children.\n - Windows: Wrap execve so that shell scripts can be invoked.\n - Windows: Implement setitimer() and sigaction().\n - Windows: Fix PRIuMAX definition.\n - Windows: Implement gettimeofday().\n - Windows: Handle absolute paths in\n safe_create_leading_directories().\n - Windows: Treat Windows style path names.\n - setup.c: Prepare for Windows directory separators.\n - Windows: Work around misbehaved rename().\n - Windows: always chmod(, 0666) before unlink().\n - Windows: A minimal implemention of getpwuid().\n - Windows: Implement a wrapper of the open() function.\n - Windows: Strip \".exe\" from the program name.\n - Windows: Use the Windows style PATH separator ';'.\n - Add target architecture MinGW.\n - Compile some programs only conditionally.\n - Add compat/regex.[ch] and compat/fnmatch.[ch].\n\nNo explanation is necessary ;-). The series is probably 'next' worthy\nas-is.\n\n* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit\n - diff: enable \"too large a rename\" warning when -M/-C is explicitly\n asked for\n\nThis would be the right thing to do for command line use, but gitk will be\nhit due to tcl/tk's limitation, so I am holding this back for now.\n\n----------------------------------------------------------------\n[Stalled/Needs more work]\n\n* jc/reflog-expire (Sun Jun 15 23:48:46 2008 -0700) 1 commit\n - Per-ref reflog expiry configuration\n\nPerhaps a good foundation for optionally unexpirable stash. As 1.6.0 will\nbe a good time to make backward incompatible changes, we might make expiry\nperiod of stash 'never' in new repositories. Needs a concensus.\n\n* jc/merge-theirs (Fri Jun 20 00:17:59 2008 -0700) 2 commits\n - git-merge-recursive-{ours,theirs}\n - git-merge-file --ours, --theirs\n\nPunting a merge by discarding your own work in conflicting parts but still\nsalvaging the parts that are cleanly automerged. It is likely that this\nwill result in nonsense mishmash, but somehow often people want this, so\nhere they are. The interface to the backends may need to change, though.\n\n* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits\n - blame: show \"previous\" information in --porcelain/--incremental\n format\n - git-blame: refactor code to emit \"porcelain format\" output\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to. This\nmay help a GSoC project that wants to gather statistical overview of the\nhistory. The final presentation may need tweaking (see the log message of\nthe commit \"\"git-blame --reverse\" on the series).\n\nThe tip two commits are for peeling to see what's behind the blamed\ncommit, which we should be able to separate out into an independent topic\nfrom the rest.\n\n----------------------------------------------------------------\n[Dropped for now]\n\n* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits\n . Introduce fast forward option only\n . Head reduction before selecting merge strategy\n . Restructure git-merge.sh\n . Introduce -ff=\n . New merge tests\n . Documentation for joining more than two histories\n\nThis will interfere with Miklos's rewrite of merge to C.\n\n* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits\n . Use perl instead of tac\n . Fix t3404 assumption that `wc -l` does not use whitespace.\n . rebase -i: Use : in expr command instead of match.\n . rebase -i: update the implementation of 'mark' command\n . Add option --preserve-tags\n . Teach rebase interactive the tag command\n . Add option --first-parent\n . Do rebase with preserve merges with advanced TODO list\n . Select all lines with fake-editor\n . Unify the length of $SHORT* and the commits in the TODO list\n . Teach rebase interactive the merge command\n . Move redo merge code in a function\n . Teach rebase interactive the reset command\n . Teach rebase interactive the mark command\n . Move cleanup code into it's own function\n . Don't append default merge message to -m message\n . fake-editor: output TODO list if unchanged\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n . WIP: rethink replay merge\n . Start using replay-tree merge in cherry-pick\n . revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour when renames are\ninvolved, by not using merge-recursive (whose d/f conflict resolution is\nquite broken), but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n . git-am --forge: add Signed-off-by: line for the author\n . git-am: clean-up Signed-off-by: lines\n . stripspace: add --log-clean option to clean up signed-off-by:\n lines\n . stripspace: use parse_options()\n . Add \"git am -s\" test\n . git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n . \"git push\": tellme-more protocol extension\n"},{"id":"80694","messageId":"20080623121502.GQ29404@genesis.frugalware.org","threadId":"12603","inReplyTo":"7vk5ggipuw.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-06-23T12:15:02Z","receivedAt":"2008-06-23T12:15:02Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Mon, Jun 23, 2008 at 12:15:35AM -0700, Junio C Hamano wrote:\n> * mv/merge-in-c (Sat Jun 21 19:15:35 2008 +0200) 14 commits\n> - Add new test case to ensure git-merge reduces octopus parents when\n> possible\n> - Add new test case to ensure git-merge filters for independent\n> parents\n> - Build in merge\n> - Introduce reduce_heads()\n> - Introduce get_merge_bases_many()\n> - Add new test to ensure git-merge handles more than 25 refs.\n> - Introduce get_octopus_merge_bases() in commit.c\n> - git-fmt-merge-msg: make it usable from other builtins\n> - Move read_cache_unmerged() to read-cache.c\n> - parseopt: add a new PARSE_OPT_ARGV0_IS_AN_OPTION option\n> - Add new test to ensure git-merge handles pull.twohead and\n> pull.octopus\n> - Move parse-options's skip_prefix() to git-compat-util.h\n> - Move commit_list_count() to commit.c\n> - Move split_cmdline() to alias.c\n\n\"Add new test case to ensure git-merge reduces octopus parents when\npossible\" does exactly the same as \"Add new test case to ensure\ngit-merge filters for independent parents\", so I think you should drop\nthe later. Only the name of the test and the commit message differs, and\nI think we want to avoid redundancy in the testsuite. ;-)\n"},{"id":"80845","messageId":"7vwskfclfs.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"20080621121429.GI29404@genesis.frugalware.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-24T07:59:51Z","receivedAt":"2008-06-24T07:59:51Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Miklos Vajna writes:\n\n> On Sat, Jun 21, 2008 at 02:44:50AM -0700, Junio C Hamano wrote:\n>> * nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit\n>> + Move all dashed-form commands to libexecdir\n>> \n>> Scheduled for 1.6.0.\n>> \n>> * jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n>> - Prepare execv_git_cmd() for removal of builtins from the\n>> filesystem\n>> - git-shell: accept \"git foo\" form\n>> \n>> We do not plan to remove git-foo form completely from the filesystem at\n>> this point, but git-shell may need to be updated.\n>\n> I may be wrong, but given that git-upload-pack/receive-pack is now not\n> in PATH, I think it will be problematic to do a pull/push in case the\n> server runs next, the client is 1.5.6 and the user has git-shell as\n> shell, for example.\n\nThe idea of the \"shell: accept 'git foo' form\" patch is that as long as\nthe server end consistently use the same version (i.e. git-shell is from\n'next' and it knows where the rest of git is installed), things should\nwork fine. I've merged them to 'next' and pushed it out so that you can\ntry it.\n\nI do not use git-shell in production setting (I do have one user account\nwhose login shell is git-shell from 'next' I use purely for testing), and\nI do not know how much use it has seen in the real world. My cursory\nsanity-check (\"cvs -d :ext:thatuser@myhost:/path/ co --help\", and \"git\nls-remote ssh://thatuser@myhost/path/\") seems to be Ok with $(bindir)\nthat has only git, gitk and nothing else.\n"},{"id":"80849","messageId":"9B8F0B10-F48D-475B-BF59-CEE94222B6E8@ai.rug.nl","threadId":"12603","inReplyTo":"7vwskfclfs.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Pieter de Bie","fromEmail":"pdebie@ai.rug.nl","sentAt":"2008-06-24T08:12:28Z","receivedAt":"2008-06-24T08:12:28Z","isPatch":false,"sender":{"key":"pdebie@ai.rug.nl","avatar":null},"body":"\nOn 24 jun 2008, at 09:59, Junio C Hamano wrote:\n\n> The idea of the \"shell: accept 'git foo' form\" patch is that as long \n> as\n> the server end consistently use the same version (i.e. git-shell is \n> from\n> 'next' and it knows where the rest of git is installed), things should\n> work fine. I've merged them to 'next' and pushed it out so that you \n> can\n> try it.\n\nAny clone / push operation fails if you use current next:\n\nVienna:bin pieter$ git --version\ngit version 1.5.6.129.g274ea\nVienna:bin pieter$ git clone localhost:project/bonnenteller\nInitialize bonnenteller/.git\nInitialized empty Git repository in /opt/git/bin/bonnenteller/.git/\nPassword:\nbash: git-upload-pack: command not found\nfatal: The remote end hung up unexpectedly\n\nI think that is what Miklos meant. Also, I think the client sends the \ncommand to execute on the remote side. At least for v1.5.5 clients and \nbefore, that is \"git-upload-pack\". As this is not in PATH, that \ncommand will fail on any server that runs v1.5.6 and has the libexec \ndir.\n\n- Pieter\n"},{"id":"80852","messageId":"FCE18242-EE46-4D2E-B916-E1E98568AB60@ai.rug.nl","threadId":"12603","inReplyTo":"9B8F0B10-F48D-475B-BF59-CEE94222B6E8@ai.rug.nl","subject":"Re: What's cooking in git.git (topics)","fromName":"Pieter de Bie","fromEmail":"pdebie@ai.rug.nl","sentAt":"2008-06-24T08:16:15Z","receivedAt":"2008-06-24T08:16:15Z","isPatch":false,"sender":{"key":"pdebie@ai.rug.nl","avatar":null},"body":"\nOn 24 jun 2008, at 10:12, Pieter de Bie wrote:\n\n> I think that is what Miklos meant. Also, I think the client sends \n> the command to execute on the remote side. At least for v1.5.5 \n> clients and before, that is \"git-upload-pack\". As this is not in \n> PATH, that command will fail on any server that runs v1.5.6 and has \n> the libexec dir.\n\nThat is supposed to be \"v1.5.6\" and \"v1.6.0\" respectively.\n"},{"id":"80915","messageId":"20080624160224.GA29404@genesis.frugalware.org","threadId":"12603","inReplyTo":"9B8F0B10-F48D-475B-BF59-CEE94222B6E8@ai.rug.nl","subject":"Re: What's cooking in git.git (topics)","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-06-24T16:02:24Z","receivedAt":"2008-06-24T16:02:24Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Tue, Jun 24, 2008 at 10:12:28AM +0200, Pieter de Bie wrote:\n> Vienna:bin pieter$ git --version\n> git version 1.5.6.129.g274ea\n> Vienna:bin pieter$ git clone localhost:project/bonnenteller\n> Initialize bonnenteller/.git\n> Initialized empty Git repository in /opt/git/bin/bonnenteller/.git/\n> Password:\n> bash: git-upload-pack: command not found\n> fatal: The remote end hung up unexpectedly\n> \n> I think that is what Miklos meant.\n\nExactly. Thanks for the good description.\n"},{"id":"80920","messageId":"alpine.DEB.1.00.0806241709330.9925@racer","threadId":"12603","inReplyTo":"20080624160224.GA29404@genesis.frugalware.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-06-24T16:25:57Z","receivedAt":"2008-06-24T16:25:57Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 24 Jun 2008, Miklos Vajna wrote:\n\n> On Tue, Jun 24, 2008 at 10:12:28AM +0200, Pieter de Bie wrote:\n> > Vienna:bin pieter$ git --version\n> > git version 1.5.6.129.g274ea\n> > Vienna:bin pieter$ git clone localhost:project/bonnenteller\n> > Initialize bonnenteller/.git\n> > Initialized empty Git repository in /opt/git/bin/bonnenteller/.git/\n> > Password:\n> > bash: git-upload-pack: command not found\n> > fatal: The remote end hung up unexpectedly\n> > \n> > I think that is what Miklos meant.\n> \n> Exactly. Thanks for the good description.\n\nAFAICT these are fixed with ed99a225(Merge branch 'jc/dashless' into \nnext).\n\nCiao,\nDscho\n"},{"id":"80942","messageId":"20080624185403.GB29404@genesis.frugalware.org","threadId":"12603","inReplyTo":"alpine.DEB.1.00.0806241709330.9925@racer","subject":"Re: What's cooking in git.git (topics)","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-06-24T18:54:03Z","receivedAt":"2008-06-24T18:54:03Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Tue, Jun 24, 2008 at 05:25:57PM +0100, Johannes Schindelin wrote:\n> > > Vienna:bin pieter$ git --version\n> > > git version 1.5.6.129.g274ea\n> > > Vienna:bin pieter$ git clone localhost:project/bonnenteller\n> > > Initialize bonnenteller/.git\n> > > Initialized empty Git repository in /opt/git/bin/bonnenteller/.git/\n> > > Password:\n> > > bash: git-upload-pack: command not found\n> > > fatal: The remote end hung up unexpectedly\n> > > \n> > > I think that is what Miklos meant.\n> > \n> > Exactly. Thanks for the good description.\n> \n> AFAICT these are fixed with ed99a225(Merge branch 'jc/dashless' into \n> next).\n\nUsing fc48199 (\"Merge branch 'master' into next\", which includes\ned99a225) on the server, v1.5.6 on the client, I get: \n\n$ git clone server:/home/vmiklos/git/test next\nInitialize next/.git\nInitialized empty Git repository in /home/vmiklos/scm/git/next/.git/\nvmiklos@server's password:\nbash: git-upload-pack: command not found\nfatal: The remote end hung up unexpectedly\n"},{"id":"80949","messageId":"alpine.DEB.1.00.0806242007150.9925@racer","threadId":"12603","inReplyTo":"20080624185403.GB29404@genesis.frugalware.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-06-24T19:08:56Z","receivedAt":"2008-06-24T19:08:56Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 24 Jun 2008, Miklos Vajna wrote:\n\n> On Tue, Jun 24, 2008 at 05:25:57PM +0100, Johannes Schindelin wrote:\n> > > > Vienna:bin pieter$ git --version\n> > > > git version 1.5.6.129.g274ea\n> > > > Vienna:bin pieter$ git clone localhost:project/bonnenteller\n> > > > Initialize bonnenteller/.git\n> > > > Initialized empty Git repository in /opt/git/bin/bonnenteller/.git/\n> > > > Password:\n> > > > bash: git-upload-pack: command not found\n> > > > fatal: The remote end hung up unexpectedly\n> > > > \n> > > > I think that is what Miklos meant.\n> > > \n> > > Exactly. Thanks for the good description.\n> > \n> > AFAICT these are fixed with ed99a225(Merge branch 'jc/dashless' into \n> > next).\n> \n> Using fc48199 (\"Merge branch 'master' into next\", which includes\n> ed99a225) on the server, v1.5.6 on the client, I get: \n> \n> $ git clone server:/home/vmiklos/git/test next\n> Initialize next/.git\n> Initialized empty Git repository in /home/vmiklos/scm/git/next/.git/\n> vmiklos@server's password:\n> bash: git-upload-pack: command not found\n> fatal: The remote end hung up unexpectedly\n\nHmm. Probably the client needs to be newer, too. This is going to be \npainful. Junio?\n\nSorry for the noise,\nDscho\n"},{"id":"80962","messageId":"m3wskek4wt.fsf@localhost.localdomain","threadId":"12603","inReplyTo":"alpine.DEB.1.00.0806242007150.9925@racer","subject":"Re: What's cooking in git.git (topics)","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-06-24T19:31:19Z","receivedAt":"2008-06-24T19:31:19Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Johannes Schindelin writes:\n> On Tue, 24 Jun 2008, Miklos Vajna wrote:\n> > \n> > Using fc48199 (\"Merge branch 'master' into next\", which includes\n> > ed99a225) on the server, v1.5.6 on the client, I get: \n> > \n> > $ git clone server:/home/vmiklos/git/test next\n> > Initialize next/.git\n> > Initialized empty Git repository in /home/vmiklos/scm/git/next/.git/\n> > vmiklos@server's password:\n> > bash: git-upload-pack: command not found\n> > fatal: The remote end hung up unexpectedly\n> \n> Hmm. Probably the client needs to be newer, too. This is going to be \n> painful. Junio?\n\nIt looks like git-upload-pack and git-receive-pack would\nhave to be left in $PATH, at least till old clients die\nof old age ;-)\n\ngit-shell hackery won't solve problem, because not everybody is using\ngit-shell.\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"80965","messageId":"alpine.DEB.1.00.0806242033570.9925@racer","threadId":"12603","inReplyTo":"m3wskek4wt.fsf@localhost.localdomain","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-06-24T19:34:54Z","receivedAt":"2008-06-24T19:34:54Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 24 Jun 2008, Jakub Narebski wrote:\n\n> git-shell hackery won't solve problem, because not everybody is using \n> git-shell.\n\nThe problem is not git-shell vs git potty.\n\nThe problem is that not everybody magically updates their clients to ask \nfor dash-less form.\n\nCiao,\nDscho\n"},{"id":"80971","messageId":"200806242206.12291.jnareb@gmail.com","threadId":"12603","inReplyTo":"alpine.DEB.1.00.0806242033570.9925@racer","subject":"Re: What's cooking in git.git (topics)","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-06-24T20:06:11Z","receivedAt":"2008-06-24T20:06:11Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Hello!\n\nJohannes Schindelin wrote:\n> On Tue, 24 Jun 2008, Jakub Narebski wrote:\n> \n> > git-shell hackery won't solve problem, because not everybody is using \n> > git-shell.\n> \n> The problem is not git-shell vs git potty.\n> \n> The problem is that not everybody magically updates their clients to ask \n> for dash-less form.\n\nWhat I meant here by \"git-shell hackery\" was for git-shell to\nautomagically redirect request for \"git-receive-pack\" to \"git receive-pack\"\n(or \"$GIT_EXEC_PATH/git-receive-pack\").\n\nBut, as I said, it isn't complete solution. Leaving git-*-pack in $PATH\nfor the time being (what I said) is.\n-- \nJakub Narebski\nPoland\n"},{"id":"80981","messageId":"7vskv2d0lp.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"alpine.DEB.1.00.0806242007150.9925@racer","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-24T20:44:34Z","receivedAt":"2008-06-24T20:44:34Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n>> Using fc48199 (\"Merge branch 'master' into next\", which includes\n>> ed99a225) on the server, v1.5.6 on the client, I get: \n>> \n>> $ git clone server:/home/vmiklos/git/test next\n>> Initialize next/.git\n>> Initialized empty Git repository in /home/vmiklos/scm/git/next/.git/\n>> vmiklos@server's password:\n>> bash: git-upload-pack: command not found\n>> fatal: The remote end hung up unexpectedly\n>\n> Hmm. Probably the client needs to be newer, too. This is going to be \n> painful. Junio?\n\nEven with maint client accessing an account with next git-shell as its\nlogin shell, I do not get the above failure.\n\nIs git-shell installed and configured correctly at all in Miklos's setup?\nWhy does the other side say \"bash: git-upload-pack\" when login shell is\ngit-shell and not bash?\n"},{"id":"80994","messageId":"20080624221049.GE29404@genesis.frugalware.org","threadId":"12603","inReplyTo":"7vskv2d0lp.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-06-24T22:10:49Z","receivedAt":"2008-06-24T22:10:49Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Tue, Jun 24, 2008 at 01:44:34PM -0700, Junio C Hamano wrote:\n> >> bash: git-upload-pack: command not found\n> >> fatal: The remote end hung up unexpectedly\n> >\n> > Hmm. Probably the client needs to be newer, too. This is going to be \n> > painful. Junio?\n> \n> Even with maint client accessing an account with next git-shell as its\n> login shell, I do not get the above failure.\n> \n> Is git-shell installed and configured correctly at all in Miklos's setup?\n> Why does the other side say \"bash: git-upload-pack\" when login shell is\n> git-shell and not bash?\n\nSorry for the confusion, this is not about git-shell at all. I have\nbash as the shell on the server, obviously.\n\nSo, in case the server runs next, the client runs master, and I try to\nclone via ssh, I get the above error.\n"},{"id":"81016","messageId":"7vk5gea0ff.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"20080624221049.GE29404@genesis.frugalware.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-24T23:16:36Z","receivedAt":"2008-06-24T23:16:36Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Miklos Vajna writes:\n\n> On Tue, Jun 24, 2008 at 01:44:34PM -0700, Junio C Hamano wrote:\n>> >> bash: git-upload-pack: command not found\n>> >> fatal: The remote end hung up unexpectedly\n>> >\n>> > Hmm. Probably the client needs to be newer, too. This is going to be \n>> > painful. Junio?\n>> \n>> Even with maint client accessing an account with next git-shell as its\n>> login shell, I do not get the above failure.\n>> \n>> Is git-shell installed and configured correctly at all in Miklos's setup?\n>> Why does the other side say \"bash: git-upload-pack\" when login shell is\n>> git-shell and not bash?\n>\n> Sorry for the confusion, this is not about git-shell at all. I have\n> bash as the shell on the server, obviously.\n>\n> So, in case the server runs next, the client runs master, and I try to\n> clone via ssh, I get the above error.\n\nAh, there is not much we can do in that case then. git-upload-pack is\nwhat the client asks you to run, and if you do not have it in the path,\nyou can (1) either make sure it is on the path, (2) have the client be\nmore explicit when asking for git-upload-pack (--upload-pack=$where), or\n(3) leave the minimum git-* binaries that can remotely be launched\ndirectly in the usual $PATH.\n\nIt most likely makes sense to do (3) anyway. upload-pack, receive-pack,\nanything else?\n"},{"id":"81020","messageId":"20080624233236.GI29404@genesis.frugalware.org","threadId":"12603","inReplyTo":"7vk5gea0ff.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-06-24T23:32:36Z","receivedAt":"2008-06-24T23:32:36Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Tue, Jun 24, 2008 at 04:16:36PM -0700, Junio C Hamano wrote:\n> It most likely makes sense to do (3) anyway. upload-pack, receive-pack,\n> anything else?\n\nI think that's all.\n"},{"id":"81029","messageId":"m3fxr2jruy.fsf@localhost.localdomain","threadId":"12603","inReplyTo":"7vk5gea0ff.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-06-25T00:11:44Z","receivedAt":"2008-06-25T00:11:44Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Junio C Hamano writes:\n\n> Ah, there is not much we can do in that case then. git-upload-pack is\n> what the client asks you to run, and if you do not have it in the path,\n> you can (1) either make sure it is on the path, (2) have the client be\n> more explicit when asking for git-upload-pack (--upload-pack=$where), or\n> (3) leave the minimum git-* binaries that can remotely be launched\n> directly in the usual $PATH.\n> \n> It most likely makes sense to do (3) anyway. upload-pack, receive-pack,\n> anything else?\n\nWhat does \"git ls-remote server:/home/vmiklos/git/test\" invoke on server? \n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"81038","messageId":"7vk5ge8bm5.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"20080624233236.GI29404@genesis.frugalware.org","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T02:57:54Z","receivedAt":"2008-06-25T02:57:54Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Miklos Vajna writes:\n\n> On Tue, Jun 24, 2008 at 04:16:36PM -0700, Junio C Hamano wrote:\n>> It most likely makes sense to do (3) anyway. upload-pack, receive-pack,\n>> anything else?\n>\n> I think that's all.\n\nThen that would be this patch on top of nd/dashless topic.\n\n Makefile | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 929136b..babf16b 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1268,7 +1268,7 @@ install: all\n \t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'\n \t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'\n \t$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'\n-\t$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'\n+\t$(INSTALL) git$X git-upload-pack$X git-receive-pack$X '$(DESTDIR_SQ)$(bindir_SQ)'\n \t$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install\n \t$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install\n ifndef NO_TCLTK\n"},{"id":"81039","messageId":"20080625120832.6117@nanako3.lavabit.com","threadId":"12603","inReplyTo":"7vk5ge8bm5.fsf@gitster.siamese.dyndns.org","subject":"Re: What's cooking in git.git (topics)","fromName":"しらいしななこ","fromEmail":"nanako3@lavabit.com","sentAt":"2008-06-25T03:08:32Z","receivedAt":"2008-06-25T03:08:32Z","isPatch":false,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Quoting Junio C Hamano :\n\n> Miklos Vajna writes:\n>\n>> On Tue, Jun 24, 2008 at 04:16:36PM -0700, Junio C Hamano wrote:\n>>> It most likely makes sense to do (3) anyway. upload-pack, receive-pack,\n>>> anything else?\n>>\n>> I think that's all.\n>\n> Then that would be this patch on top of nd/dashless topic.\n>\n> Makefile | 2 +-\n> 1 files changed, 1 insertions(+), 1 deletions(-)\n>\n> diff --git a/Makefile b/Makefile\n> index 929136b..babf16b 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -1268,7 +1268,7 @@ install: all\n> \t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'\n> \t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'\n> \t$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'\n> -\t$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'\n> +\t$(INSTALL) git$X git-upload-pack$X git-receive-pack$X '$(DESTDIR_SQ)$(bindir_SQ)'\n> \t$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install\n> \t$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install\n> ifndef NO_TCLTK\n\nDoesn't \"git archive --remote=\" also execute git program on a remote machine?\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"81044","messageId":"7v1w2m8ahi.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"20080625120832.6117@nanako3.lavabit.com","subject":"[PATCH] Keep some git-* programs in $(bindir)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T03:22:17Z","receivedAt":"2008-06-25T03:22:17Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Otherwise remote executions directly over ssh won't find them as they used\nto. --upload-pack and --receive-pack options _could_ be used on the\nclient side, but things should keep working out-of-box for older clients.\n\nLater versions of clients (fetch-pack and send-pack) probably could start\nasking for these programs with dashless form, but that is a different\ntopic.\n\nSigned-off-by: Junio C Hamano \n---\n * しらいしななこ writes:\n > Doesn't \"git archive --remote=\" also execute git program on a remote machine?\n\n Ok, how about this?\n\n Makefile | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 929136b..742e7d3 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1268,7 +1268,7 @@ install: all\n \t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'\n \t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'\n \t$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'\n-\t$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'\n+\t$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-archive$X '$(DESTDIR_SQ)$(bindir_SQ)'\n \t$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install\n \t$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install\n ifndef NO_TCLTK\n-- \n1.5.6.56.g29b0d\n"},{"id":"81047","messageId":"7vprq66vqd.fsf_-_@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7v1w2m8ahi.fsf@gitster.siamese.dyndns.org","subject":"[PATCH] Ask for \"git program\" when asking for \"git-program\" over SSH connection","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T03:26:18Z","receivedAt":"2008-06-25T03:26:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"The daemon expects to see the dashed form and we cannot change older\nservers. But when invoking programs on the remote end over SSH, the\ncommand line the client side build is under client's control.\n\nSigned-off-by: Junio C Hamano \n---\n * This I haven't even compile tested at all, but it feels right. We\n probably should do this before bindir=>libexecdir move; as long as this\n is in place on the client side the version running on the server end\n should not matter.\n\n connect.c | 4 ++++\n 1 files changed, 4 insertions(+), 0 deletions(-)\n\ndiff --git a/connect.c b/connect.c\nindex e92af29..fd1da26 100644\n--- a/connect.c\n+++ b/connect.c\n@@ -589,6 +589,10 @@ struct child_process *git_connect(int fd[2], const char *url_orig,\n \tconn = xcalloc(1, sizeof(*conn));\n \n \tstrbuf_init(&cmd, MAX_CMD_LEN);\n+\tif (protocol != PROTO_GIT && !strncmp(prog, \"git-\", 4)) {\n+\t\tstrbuf_addstr(&cmd, \"git \");\n+\t\tprog += 4;\n+\t}\n \tstrbuf_addstr(&cmd, prog);\n \tstrbuf_addch(&cmd, ' ');\n \tsq_quote_buf(&cmd, path);\n-- \n1.5.6.56.g29b0d\n"},{"id":"81048","messageId":"20080625032636.GS11793@spearce.org","threadId":"12603","inReplyTo":"20080625120832.6117@nanako3.lavabit.com","subject":"Re: What's cooking in git.git (topics)","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-06-25T03:26:37Z","receivedAt":"2008-06-25T03:26:37Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":" wrote:\n> Quoting Junio C Hamano :\n> > Miklos Vajna writes:\n> >> On Tue, Jun 24, 2008 at 04:16:36PM -0700, Junio C Hamano wrote:\n> >>> It most likely makes sense to do (3) anyway. upload-pack, receive-pack,\n> >>> anything else?\n> >>\n> >> I think that's all.\n> >\n> > Then that would be this patch on top of nd/dashless topic.\n> >\n> > Makefile | 2 +-\n> > 1 files changed, 1 insertions(+), 1 deletions(-)\n> >\n> > diff --git a/Makefile b/Makefile\n> > index 929136b..babf16b 100644\n> > --- a/Makefile\n> > +++ b/Makefile\n> > @@ -1268,7 +1268,7 @@ install: all\n> > \t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'\n> > \t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'\n> > \t$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'\n> > -\t$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'\n> > +\t$(INSTALL) git$X git-upload-pack$X git-receive-pack$X '$(DESTDIR_SQ)$(bindir_SQ)'\n> > \t$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install\n> > \t$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install\n> > ifndef NO_TCLTK\n> \n> Doesn't \"git archive --remote=\" also execute git program on a remote machine?\n\nYes, it runs git-upload-archive on the remote side. The three\nprimary services for the remote side are documented in daemon.c:\n\n 403 static struct daemon_service daemon_service[] = {\n 404 { \"upload-archive\", \"uploadarch\", upload_archive, 0, 1 },\n 405 { \"upload-pack\", \"uploadpack\", upload_pack, 1, 1 },\n 406 { \"receive-pack\", \"receivepack\", receive_pack, 0, 1 },\n 407 };\n\n(with git- prefixes).\n\nIMHO all three need to be in $PATH, along with git and gitk, through\nat least a major revision release cycle to give clients a chance to\nupgrade to something that uses \"git foo\" rather than \"git-foo\" when\ntalking to the remote.\n\n-- \nShawn.\n"},{"id":"81049","messageId":"20080625033221.GU11793@spearce.org","threadId":"12603","inReplyTo":"m3fxr2jruy.fsf@localhost.localdomain","subject":"Re: What's cooking in git.git (topics)","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-06-25T03:32:21Z","receivedAt":"2008-06-25T03:32:21Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Jakub Narebski wrote:\n> \n> What does \"git ls-remote server:/home/vmiklos/git/test\" invoke on server? \n\nFYI, it actually runs git-upload-pack, gets the list of advertised\nrefs, then closes the connection immediately. The other side sees\nthe client hang up and just terminates silently, since the client\ndidn't \"want\" anything packed and sent.\n\n-- \nShawn.\n"},{"id":"81050","messageId":"20080625034538.GW11793@spearce.org","threadId":"12603","inReplyTo":"7vprq66vqd.fsf_-_@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Ask for \"git program\" when asking for \"git-program\" over SSH connection","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-06-25T03:45:38Z","receivedAt":"2008-06-25T03:45:38Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano wrote:\n> The daemon expects to see the dashed form and we cannot change older\n> servers. But when invoking programs on the remote end over SSH, the\n> command line the client side build is under client's control.\n...\n> diff --git a/connect.c b/connect.c\n> index e92af29..fd1da26 100644\n> --- a/connect.c\n> +++ b/connect.c\n> @@ -589,6 +589,10 @@ struct child_process *git_connect(int fd[2], const char *url_orig,\n> \tconn = xcalloc(1, sizeof(*conn));\n> \n> \tstrbuf_init(&cmd, MAX_CMD_LEN);\n> +\tif (protocol != PROTO_GIT && !strncmp(prog, \"git-\", 4)) {\n> +\t\tstrbuf_addstr(&cmd, \"git \");\n> +\t\tprog += 4;\n> +\t}\n\nNack on that implementation.\n\nI think this is a problem for systems based on say gitosis,\nor some pattern like it. Day-job doesn't use gitosis, but\nhas switched to a Perl based forced ssh tool that smells a\nlot like gitosis. Gitosis is popular.\n\ngithub probably uses something similar. But nobody knows (or\nprobably cares) since they don't release their source.\n\ngitosis is likely looking for \"$git-upload-pack '(.*)'$\" to be\nin the $SSH_ORIGINAL_COMMAND environment variable, if you send\n\"git upload-pack 'path.git'\" I think its going to reject.\n\nWhat's really bad about your patch is you cannot work around it as a\nuser by setting --upload-pack on the command line, or in the config,\nbecause down at the very deepest level you are switching the \"git-\"\nto \"git \" and ignoring what the user has supplied you.\n\nSorry, but I think this change needs to go higher up, to the default\nvalues that --upload-pack and remote.$name.uploadpack override,\nso the user can at least work around it when we break her ability\nto use github, gitosis, or anything like it.\n\n-- \nShawn.\n"},{"id":"81054","messageId":"20080625041747.GC11793@spearce.org","threadId":"12603","inReplyTo":"7v1w2m8ahi.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Keep some git-* programs in $(bindir)","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-06-25T04:17:47Z","receivedAt":"2008-06-25T04:17:47Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano wrote:\n> * しらいしななこ writes:\n> > Doesn't \"git archive --remote=\" also execute git program on a remote machine?\n> \n> diff --git a/Makefile b/Makefile\n> index 929136b..742e7d3 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -1268,7 +1268,7 @@ install: all\n> \t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'\n> \t$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'\n> \t$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'\n> -\t$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'\n> +\t$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-archive$X '$(DESTDIR_SQ)$(bindir_SQ)'\n\nI think you mean git-upload-archive, given what daemon.c says.\nOr line 34 of builtin-archive.c, which calls git-upload-archive\nby way of git_connect().\n\n-- \nShawn.\n"},{"id":"81055","messageId":"alpine.LNX.1.00.0806250015580.19665@iabervon.org","threadId":"12603","inReplyTo":"7v1w2m8ahi.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Keep some git-* programs in $(bindir)","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2008-06-25T04:19:49Z","receivedAt":"2008-06-25T04:19:49Z","isPatch":true,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"On Tue, 24 Jun 2008, Junio C Hamano wrote:\n\n> Otherwise remote executions directly over ssh won't find them as they used\n> to. --upload-pack and --receive-pack options _could_ be used on the\n> client side, but things should keep working out-of-box for older clients.\n> \n> Later versions of clients (fetch-pack and send-pack) probably could start\n> asking for these programs with dashless form, but that is a different\n> topic.\n\nShould they use \"git upload-pack\" or should they look for their helper \nprograms in a libexec dir? I don't think that either of these programs is \nuseful to run independantly, but I don't know if finding a program that \ndoesn't go in $PATH on a remote machine is going to be any fun.\n\n\t-Daniel\n*This .sig lefti ntentionally blank*\n"},{"id":"81060","messageId":"7vk5ge6soc.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"20080625034538.GW11793@spearce.org","subject":"Re: [PATCH] Ask for \"git program\" when asking for \"git-program\" over SSH connection","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T04:32:19Z","receivedAt":"2008-06-25T04:32:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" writes:\n\n> Sorry, but I think this change needs to go higher up, to the default\n> values that --upload-pack and remote.$name.uploadpack override,\n> so the user can at least work around it when we break her ability\n> to use github, gitosis, or anything like it.\n\nWell, the thing is, \"higher up\" would not have enough clue to see if it\nneeds to give dashed form (for git-daemon) or space form (for ssh), so\nthat suggestion won't help much.\n\nI do not care too much about closed source service, but gitosis should be\nable to update the pattern to allow \"git[ -]upload-pack\" reasonably\neasily.\n\nAny other suggestions that is workable?\n"},{"id":"81062","messageId":"20080625043741.GD11793@spearce.org","threadId":"12603","inReplyTo":"alpine.LNX.1.00.0806250015580.19665@iabervon.org","subject":"Re: [PATCH] Keep some git-* programs in $(bindir)","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-06-25T04:37:41Z","receivedAt":"2008-06-25T04:37:41Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Daniel Barkalow wrote:\n> On Tue, 24 Jun 2008, Junio C Hamano wrote:\n> \n> > Otherwise remote executions directly over ssh won't find them as they used\n> > to. --upload-pack and --receive-pack options _could_ be used on the\n> > client side, but things should keep working out-of-box for older clients.\n> > \n> > Later versions of clients (fetch-pack and send-pack) probably could start\n> > asking for these programs with dashless form, but that is a different\n> > topic.\n> \n> Should they use \"git upload-pack\" or should they look for their helper \n> programs in a libexec dir? I don't think that either of these programs is \n> useful to run independantly, but I don't know if finding a program that \n> doesn't go in $PATH on a remote machine is going to be any fun.\n\nIMHO they should in the future use \"git upload-pack\".\n\nBut this may not work with all servers, especially those that\nuse $SSH_ORIGINAL_COMMAND to dispatch to the correct command,\nor abort if the user tries to request something dangerous.\nGitosis comes to mind.\n\nI'm not sure we can get away with doing this in 1.6.0 as it is\neffectively a network protocol breakage. We have thus far never\ncaused a newer client to fail talking to an older server. I'm\nnot sure we should start doing that in 1.6.0.\n\nMy vote is we keep the dashed form of these 3 commands in the\n$PATH during 1.6 and remove them in 1.7, but when we do it we\nmust ensure there is a way to still request dashed form found\nthrough $PATH when passing --upload-pack as an argument.\n\n-- \nShawn.\n"},{"id":"81063","messageId":"20080625044409.GE11793@spearce.org","threadId":"12603","inReplyTo":"7vk5ge6soc.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Ask for \"git program\" when asking for \"git-program\" over SSH connection","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-06-25T04:44:09Z","receivedAt":"2008-06-25T04:44:09Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano wrote:\n> \"Shawn O. Pearce\" writes:\n> \n> > Sorry, but I think this change needs to go higher up, to the default\n> > values that --upload-pack and remote.$name.uploadpack override,\n> > so the user can at least work around it when we break her ability\n> > to use github, gitosis, or anything like it.\n> \n> Well, the thing is, \"higher up\" would not have enough clue to see if it\n> needs to give dashed form (for git-daemon) or space form (for ssh), so\n> that suggestion won't help much.\n\nActually I'd go the other direction. Allow the higher up level\nto supply \"git upload-pack\" and convert it to git- for the git://\nprotocol. Possible patch below.\n\n> I do not care too much about closed source service, but gitosis should be\n> able to update the pattern to allow \"git[ -]upload-pack\" reasonably\n> easily.\n\nPasky also has to update:\n\n$ git ls-remote --upload-pack='git upload-pack' repo.or.cz:/srv/git/egit.git\nfatal: unrecognized command 'git upload-pack '/srv/git/egit.git''\nfatal: The remote end hung up unexpectedly\n\n;-)\n \n> Any other suggestions that is workable?\n\ndiff --git a/builtin-clone.c b/builtin-clone.c\nindex 5c5acb4..98d0f0f 100644\n--- a/builtin-clone.c\n+++ b/builtin-clone.c\n@@ -37,7 +37,7 @@ static int option_quiet, option_no_checkout, option_bare;\n static int option_local, option_no_hardlinks, option_shared;\n static char *option_template, *option_reference, *option_depth;\n static char *option_origin = NULL;\n-static char *option_upload_pack = \"git-upload-pack\";\n+static char *option_upload_pack = \"git upload-pack\";\n \n static struct option builtin_clone_options[] = {\n \tOPT__QUIET(&option_quiet),\n@@ -58,7 +58,7 @@ static struct option builtin_clone_options[] = {\n \tOPT_STRING('o', \"origin\", &option_origin, \"branch\",\n \t\t \"use instead or 'origin' to track upstream\"),\n \tOPT_STRING('u', \"upload-pack\", &option_upload_pack, \"path\",\n-\t\t \"path to git-upload-pack on the remote\"),\n+\t\t \"path to git upload-pack on the remote\"),\n \tOPT_STRING(0, \"depth\", &option_depth, \"depth\",\n \t\t \"create a shallow clone of that depth\"),\n \ndiff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c\nindex f4dbcf0..b0efd01 100644\n--- a/builtin-fetch-pack.c\n+++ b/builtin-fetch-pack.c\n@@ -14,7 +14,7 @@ static int transfer_unpack_limit = -1;\n static int fetch_unpack_limit = -1;\n static int unpack_limit = 100;\n static struct fetch_pack_args args = {\n-\t/* .uploadpack = */ \"git-upload-pack\",\n+\t/* .uploadpack = */ \"git upload-pack\",\n };\n \n static const char fetch_pack_usage[] =\ndiff --git a/connect.c b/connect.c\nindex e92af29..dbabd93 100644\n--- a/connect.c\n+++ b/connect.c\n@@ -576,8 +576,8 @@ struct child_process *git_connect(int fd[2], const char *url_orig,\n \t\t * from extended components with a NUL byte.\n \t\t */\n \t\tpacket_write(fd[1],\n-\t\t\t \"%s %s%chost=%s%c\",\n-\t\t\t prog, path, 0,\n+\t\t\t \"git-%s %s%chost=%s%c\",\n+\t\t\t prog + 4, path, 0,\n \t\t\t target_host, 0);\n \t\tfree(target_host);\n \t\tfree(url);\ndiff --git a/git-parse-remote.sh b/git-parse-remote.sh\nindex 695a409..0f82a93 100755\n--- a/git-parse-remote.sh\n+++ b/git-parse-remote.sh\n@@ -255,10 +255,10 @@ get_uploadpack () {\n \tcase \"$data_source\" in\n \tconfig)\n \t\tuplp=$(git config --get \"remote.$1.uploadpack\")\n-\t\techo ${uplp:-git-upload-pack}\n+\t\techo ${uplp:-git upload-pack}\n \t\t;;\n \t*)\n-\t\techo \"git-upload-pack\"\n+\t\techo \"git upload-pack\"\n \t\t;;\n \tesac\n }\ndiff --git a/transport.c b/transport.c\nindex 3ff8519..351b7f5 100644\n--- a/transport.c\n+++ b/transport.c\n@@ -762,10 +762,10 @@ struct transport *transport_get(struct remote *remote, const char *url)\n \n \t\tdata->thin = 1;\n \t\tdata->conn = NULL;\n-\t\tdata->uploadpack = \"git-upload-pack\";\n+\t\tdata->uploadpack = \"git upload-pack\";\n \t\tif (remote && remote->uploadpack)\n \t\t\tdata->uploadpack = remote->uploadpack;\n-\t\tdata->receivepack = \"git-receive-pack\";\n+\t\tdata->receivepack = \"git receive-pack\";\n \t\tif (remote && remote->receivepack)\n \t\t\tdata->receivepack = remote->receivepack;\n \t}\n\n-- \nShawn.\n"},{"id":"81065","messageId":"7v8wwu6qxr.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"20080625044409.GE11793@spearce.org","subject":"Re: [PATCH] Ask for \"git program\" when asking for \"git-program\" over SSH connection","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T05:09:52Z","receivedAt":"2008-06-25T05:09:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" writes:\n\n>> Any other suggestions that is workable?\n>\n> diff --git a/builtin-clone.c b/builtin-clone.c\n> index 5c5acb4..98d0f0f 100644\n> --- a/builtin-clone.c\n> +++ b/builtin-clone.c\n> @@ -37,7 +37,7 @@ static int option_quiet, option_no_checkout, option_bare;\n\n<< a patch to conditionally change \"git-program\" default to \"git program\"\nsnipped >>\n\nHow would that help client that talk with git-daemon, unlike what I sent\nearlier?\n"},{"id":"81066","messageId":"7v4p7i6qs1.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7v8wwu6qxr.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Ask for \"git program\" when asking for \"git-program\" over SSH connection","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T05:13:18Z","receivedAt":"2008-06-25T05:13:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> \"Shawn O. Pearce\" writes:\n>\n>>> Any other suggestions that is workable?\n>>\n>> diff --git a/builtin-clone.c b/builtin-clone.c\n>> index 5c5acb4..98d0f0f 100644\n>> --- a/builtin-clone.c\n>> +++ b/builtin-clone.c\n>> @@ -37,7 +37,7 @@ static int option_quiet, option_no_checkout, option_bare;\n>\n> << a patch to conditionally change \"git-program\" default to \"git program\"\n> snipped >>\n\nTypofix: s/cond/uncond/;\n\n> How would that help client that talk with git-daemon, unlike what I sent\n> earlier?\n\nIf we force --upload-pack workaround to _everybody_ we are already lost.\n\nAlso I think the previous one still lets you work it around by giving a\nfull path, like \"/usr/local/bin/git-upload-pack\", because \"/usr\" does not\nmatch \"git-\" ;-)\n"},{"id":"81068","messageId":"7vy74u5bkk.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7v4p7i6qs1.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Ask for \"git program\" when asking for \"git-program\" over SSH connection","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T05:27:07Z","receivedAt":"2008-06-25T05:27:07Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> If we force --upload-pack workaround to _everybody_ we are already lost.\n>\n> Also I think the previous one still lets you work it around by giving a\n> full path, like \"/usr/local/bin/git-upload-pack\", because \"/usr\" does not\n> match \"git-\" ;-)\n\nOk, let's map this out seriously.\n\n* 1.6.0 will install the server-side programs in $(bindir) so that \n people coming over ssh will find them on the $PATH\n\n* In 1.6.0 (and 1.5.6.1), we will change \"git daemon\" to accept both\n \"git-program\" and \"git program\" forms. When the spaced form is used, it\n will behave as if the dashed form is requested. This is a prerequisite\n for client side change to start asking for \"git program\".\n\n* In the near future, there will no client-side change. \"git-program\"\n will be asked for.\n\n* 6 months after 1.6.0 ships, hopefully all the deployed server side will\n be running that version or newer. Client side will start asking for\n \"git program\" by default, but we can still override with --upload-pack\n and friends.\n\n* 12 months after client side changes, everybody will be running that\n version or newer. We stop installing the server side programs in\n $(bindir) but people coming over ssh will be asking for \"git program\"\n and \"git\" will be on the $PATH so there is no issue.\n\nThe above 6 and 12 are yanked out of thin air and I am of course open to\ntweaking them, but I think the above order of events would be workable.\n"},{"id":"81070","messageId":"7vr6am5be8.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"20080625044409.GE11793@spearce.org","subject":"Re: [PATCH] Ask for \"git program\" when asking for \"git-program\" over SSH connection","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T05:30:55Z","receivedAt":"2008-06-25T05:30:55Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" writes:\n\n> Pasky also has to update:\n>\n> $ git ls-remote --upload-pack='git upload-pack' repo.or.cz:/srv/git/egit.git\n> fatal: unrecognized command 'git upload-pack '/srv/git/egit.git''\n> fatal: The remote end hung up unexpectedly\n\nOf course. I am assuming that he runs git-shell for user account, and\nthat's what the change in 'next' is about.\n"},{"id":"81072","messageId":"20080625053452.GI11793@spearce.org","threadId":"12603","inReplyTo":"7v4p7i6qs1.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Ask for \"git program\" when asking for \"git-program\" over SSH connection","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-06-25T05:34:52Z","receivedAt":"2008-06-25T05:34:52Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano wrote:\n> Junio C Hamano writes:\n> > \"Shawn O. Pearce\" writes:\n> >\n> >>> Any other suggestions that is workable?\n> >>\n> >> diff --git a/builtin-clone.c b/builtin-clone.c\n> >> index 5c5acb4..98d0f0f 100644\n> >> --- a/builtin-clone.c\n> >> +++ b/builtin-clone.c\n> >> @@ -37,7 +37,7 @@ static int option_quiet, option_no_checkout, option_bare;\n> >\n> > << a patch to conditionally change \"git-program\" default to \"git program\"\n> > snipped >>\n\nShouldn't \"git upload-pack\" work on the server side as far back as\n0.99.9k? That's back really old. And my patch fixed \"git \" to be\n\"git-\" when talking to git-daemon, thus keeping clients compatible\nwith all current git:// servers.\n\nFor SSH servers that can't handle \"git upload-pack\" the user can\nchange it to --upload-pack=git-upload-pack and get back to the\nold behavior, until the server operator can upgrade.\n\nYour patch doesn't offer that work around on the client side.\n \n> Typofix: s/cond/uncond/;\n> \n> > How would that help client that talk with git-daemon, unlike what I sent\n> > earlier?\n\nCheck my change in git_connect again:\n\ndiff --git a/connect.c b/connect.c\nindex e92af29..dbabd93 100644\n--- a/connect.c\n+++ b/connect.c\n@@ -576,8 +576,8 @@ struct child_process *git_connect(int fd[2], const char *url_orig,\n \t\t * from extended components with a NUL byte.\n \t\t */\n \t\tpacket_write(fd[1],\n-\t\t\t \"%s %s%chost=%s%c\",\n-\t\t\t prog, path, 0,\n+\t\t\t \"git-%s %s%chost=%s%c\",\n+\t\t\t prog + 4, path, 0,\n \t\t\t target_host, 0);\n \t\tfree(target_host);\n \t\tfree(url);\n\nIts buggy if the user tried to do \"git ls-remote --upload-pack=crp git://\"\nbut if this is the direction we want to go we can obviously work out a\nbetter method of forcing \"git \" to be \"git-\" when talking to git-daemon.\n\n> If we force --upload-pack workaround to _everybody_ we are already lost.\n> \n> Also I think the previous one still lets you work it around by giving a\n> full path, like \"/usr/local/bin/git-upload-pack\", because \"/usr\" does not\n> match \"git-\" ;-)\n\nPlease tell me, where is git-upload-pack on repo.or.cz?\n\n$ ssh repo.or.cz which git-upload-pack\nfatal: unrecognized command 'which git-upload-pack'\n\nI doubt I can pass it '/usr/local/bin/git-upload-pack' and get it\nto work too. So I don't think this is a good work around.\n\nObviously pasky will fix repo.or.cz to accept both at some point\nin the near future, likely before 1.6.0 releases, because he's cool\nlike that. Not everyone is.\n\nPlease don't make 1.6.0 unavailable to end-users because their\nserver operator can't currently accept \"git upload-pack\" without\ngiving them a workaround to force \"git-upload-pack\" over SSH.\n\n-- \nShawn.\n"},{"id":"81073","messageId":"20080625053848.GJ11793@spearce.org","threadId":"12603","inReplyTo":"7vy74u5bkk.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Ask for \"git program\" when asking for \"git-program\" over SSH connection","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-06-25T05:38:49Z","receivedAt":"2008-06-25T05:38:49Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano wrote:\n> Junio C Hamano writes:\n> \n> > If we force --upload-pack workaround to _everybody_ we are already lost.\n> >\n> > Also I think the previous one still lets you work it around by giving a\n> > full path, like \"/usr/local/bin/git-upload-pack\", because \"/usr\" does not\n> > match \"git-\" ;-)\n> \n> Ok, let's map this out seriously.\n\nThis plan makes a lot of sense to me. I'm behind it. For whatever\nthat means. At least I'll shutup and stop making noise about this\nissue if you take this approach. :-)\n\n \n> * 1.6.0 will install the server-side programs in $(bindir) so that \n> people coming over ssh will find them on the $PATH\n> \n> * In 1.6.0 (and 1.5.6.1), we will change \"git daemon\" to accept both\n> \"git-program\" and \"git program\" forms. When the spaced form is used, it\n> will behave as if the dashed form is requested. This is a prerequisite\n> for client side change to start asking for \"git program\".\n> \n> * In the near future, there will no client-side change. \"git-program\"\n> will be asked for.\n> \n> * 6 months after 1.6.0 ships, hopefully all the deployed server side will\n> be running that version or newer. Client side will start asking for\n> \"git program\" by default, but we can still override with --upload-pack\n> and friends.\n> \n> * 12 months after client side changes, everybody will be running that\n> version or newer. We stop installing the server side programs in\n> $(bindir) but people coming over ssh will be asking for \"git program\"\n> and \"git\" will be on the $PATH so there is no issue.\n> \n> The above 6 and 12 are yanked out of thin air and I am of course open to\n> tweaking them, but I think the above order of events would be workable.\n\nYea, 6 and 12 seem like a good idea. Its a couple of releases and\ngives people time to migrate their server installations.\n\n-- \nShawn.\n"},{"id":"81076","messageId":"7vmyla5ac0.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"20080625053452.GI11793@spearce.org","subject":"Re: [PATCH] Ask for \"git program\" when asking for \"git-program\" over SSH connection","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T05:53:51Z","receivedAt":"2008-06-25T05:53:51Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" writes:\n\n> Junio C Hamano wrote:\n>> Junio C Hamano writes:\n>> > \"Shawn O. Pearce\" writes:\n>> >\n>> >>> Any other suggestions that is workable?\n>> >>\n>> >> diff --git a/builtin-clone.c b/builtin-clone.c\n>> >> index 5c5acb4..98d0f0f 100644\n>> >> --- a/builtin-clone.c\n>> >> +++ b/builtin-clone.c\n>> >> @@ -37,7 +37,7 @@ static int option_quiet, option_no_checkout, option_bare;\n>> >\n>> > << a patch to conditionally change \"git-program\" default to \"git program\"\n>> > snipped >>\n>\n> Shouldn't \"git upload-pack\" work on the server side as far back as\n> 0.99.9k?\n\nYeah, I missed the patch to connect.c that was buried among other changes.\nSorry.\n"},{"id":"81089","messageId":"20080625072909.GJ29404@genesis.frugalware.org","threadId":"12603","inReplyTo":"m3fxr2jruy.fsf@localhost.localdomain","subject":"Re: What's cooking in git.git (topics)","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-06-25T07:29:09Z","receivedAt":"2008-06-25T07:29:09Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Tue, Jun 24, 2008 at 05:11:44PM -0700, Jakub Narebski wrote:\n> What does \"git ls-remote server:/home/vmiklos/git/test\" invoke on server? \n\n$ git ls-remote server:/home/vmiklos/git/test\nbash: git-upload-pack: command not found\nfatal: The remote end hung up unexpectedly\n"},{"id":"81102","messageId":"7vej6l3lp7.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vk5ggipuw.fsf@gitster.siamese.dyndns.org","subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T09:31:16Z","receivedAt":"2008-06-25T09:31:16Z","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\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.\n\nIt already is beginning to become clear what 1.6.0 will look like. What's\nalready in 'next' all are well intentioned (I do not guarantee they are\nalready bug-free --- that is what cooking them in 'next' is for) and are\ngood set of feature enhancements. But bigger changes will be:\n\n * MinGW will be in.\n\n * /usr/bin/git-cat-file is no more. The bulk of the git commands will\n move to /usr/libexec/git-core/ or somesuch.\n\n * git-merge will be rewritten in C.\n\n * default pack and idx versions will be updated as scheduled for some\n time ago.\n\n----------------------------------------------------------------\n[New Topics]\n\n* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits\n - Migrate git-blame to parse-option partially.\n - parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.\n - parse-opt: fake short strings for callers to believe in.\n - parse-opt: do not pring errors on unknown options, return -2\n intead.\n - parse-opt: create parse_options_step.\n - parse-opt: Export a non NORETURN usage dumper.\n - parse-opt: have parse_options_{start,end}.\n\n----------------------------------------------------------------\n[Will merge to master soon]\n\n* lw/gitweb (Thu Jun 19 22:03:21 2008 +0200) 1 commit\n + gitweb: standarize HTTP status codes\n\n* lt/config-fsync (Wed Jun 18 15:18:44 2008 -0700) 4 commits\n + Add config option to enable 'fsync()' of object files\n + Split up default \"i18n\" and \"branch\" config parsing into helper\n routines\n + Split up default \"user\" config parsing into helper routine\n + Split up default \"core\" config parsing into helper routine\n\n* nd/dashless (Tue Jun 24 19:58:11 2008 -0700) 2 commits\n + Keep some git-* programs in $(bindir)\n + Move all dashed-form commands to libexecdir\n\nScheduled for 1.6.0. We'll leave server-side programs in $(bindir) \nso that ssh clients can ask for \"git-program\" and find them on the $PATH.\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit\n + merge: remove deprecated summary and diffstat options and config\n variables\n\n* sr/tests (Sun Jun 8 16:04:35 2008 +0200) 3 commits\n + Hook up the result aggregation in the test makefile.\n + A simple script to parse the results from the testcases\n + Modify test-lib.sh to output stats to t/test-results/*\n\n* jh/clone-packed-refs (Sun Jun 15 16:06:16 2008 +0200) 4 commits\n + Teach \"git clone\" to pack refs\n + Prepare testsuite for a \"git clone\" that packs refs\n + Move pack_refs() and friends into libgit\n + Incorporate fetched packs in future object traversal\n\nThis is useful when cloning from a repository with insanely large number\nof refs.\n\n* lw/perlish (Thu Jun 19 22:32:49 2008 +0200) 2 commits\n + Git.pm: add test suite\n + t/test-lib.sh: add test_external and test_external_without_stderr\n\nBeginning of regression tests for Perl part of the system.\n\n----------------------------------------------------------------\n[Actively Cooking]\n\n* mv/merge-in-c (Sat Jun 21 19:15:35 2008 +0200) 12 commits\n - Add new test case to ensure git-merge reduces octopus parents when\n possible\n - Build in merge\n - Introduce reduce_heads()\n - Introduce get_merge_bases_many()\n - Add new test to ensure git-merge handles more than 25 refs.\n - Introduce get_octopus_merge_bases() in commit.c\n - git-fmt-merge-msg: make it usable from other builtins\n - Move read_cache_unmerged() to read-cache.c\n - Add new test to ensure git-merge handles pull.twohead and\n pull.octopus\n - Move parse-options's skip_prefix() to git-compat-util.h\n - Move commit_list_count() to commit.c\n - Move split_cmdline() to alias.c\n\nI dropped the change to parseopt in this series and fixed up the caller.\n\n* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits\n + Prepare execv_git_cmd() for removal of builtins from the\n filesystem\n + git-shell: accept \"git foo\" form\n\nWe do not plan to remove git-foo form completely from the filesystem at\nthis point, but git-shell may need to be updated.\n\n* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits\n + Eliminate an unnecessary chdir(\"..\")\n + Add support for GIT_CEILING_DIRECTORIES\n + Fold test-absolute-path into test-path-utils\n + Implement normalize_absolute_path\n\n* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits\n - rerere.autoupdate\n - t4200: fix rerere test\n - rerere: remove dubious \"tail_optimization\"\n - git-rerere: detect unparsable conflicts\n - rerere: rerere_created_at() and has_resolution() abstraction\n\n* sb/rebase (Sun Jun 22 01:55:50 2008 +0200) 2 commits\n + t3404: stricter tests for git-rebase--interactive\n + api-builtin.txt: update and fix typo\n\n* sb/maint-rebase (Sun Jun 22 16:07:02 2008 +0200) 1 commit\n + git-rebase.sh: Add check if rebase is in progress\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\n\n\n----------------------------------------------------------------\n[On Hold]\n\n* ph/mergetool (Mon Jun 16 17:33:41 2008 -0600) 1 commit\n + Remove the use of '--' in merge program invocation\n\nWaiting for success reports from people who use various backends.\n\n* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 39 commits\n - compat/pread.c: Add a forward declaration to fix a warning\n - Windows: Fix ntohl() related warnings about printf formatting\n - Windows: TMP and TEMP environment variables specify a temporary\n directory.\n - Windows: Make 'git help -a' work.\n - Windows: Work around an oddity when a pipe with no reader is\n written to.\n - Windows: Make the pager work.\n - When installing, be prepared that template_dir may be relative.\n - Windows: Use a relative default template_dir and ETC_GITCONFIG\n - Windows: Compute the fallback for exec_path from the program\n invocation.\n - Turn builtin_exec_path into a function.\n - Windows: Use a customized struct stat that also has the st_blocks\n member.\n - Windows: Add a custom implementation for utime().\n - Windows: Add a new lstat and fstat implementation based on Win32\n API.\n - Windows: Implement a custom spawnve().\n - Windows: Implement wrappers for gethostbyname(), socket(), and\n connect().\n - Windows: Work around incompatible sort and find.\n - Windows: Implement asynchronous functions as threads.\n - Windows: Disambiguate DOS style paths from SSH URLs.\n - Windows: A rudimentary poll() emulation.\n - Windows: Change the name of hook scripts to make them not\n executable.\n - Windows: Implement start_command().\n - Windows: A pipe() replacement whose ends are not inherited to\n children.\n - Windows: Wrap execve so that shell scripts can be invoked.\n - Windows: Implement setitimer() and sigaction().\n - Windows: Fix PRIuMAX definition.\n - Windows: Implement gettimeofday().\n - Make my_mktime() public and rename it to tm_to_time_t()\n - Windows: Work around misbehaved rename().\n - Windows: always chmod(, 0666) before unlink().\n - Windows: A minimal implemention of getpwuid().\n - Windows: Implement a wrapper of the open() function.\n - Windows: Strip \".exe\" from the program name.\n - Windows: Handle absolute paths in\n safe_create_leading_directories().\n - Windows: Treat Windows style path names.\n - setup.c: Prepare for Windows directory separators.\n - Windows: Use the Windows style PATH separator ';'.\n - Add target architecture MinGW.\n - Compile some programs only conditionally.\n - Add compat/regex.[ch] and compat/fnmatch.[ch].\n\nNo explanation is necessary ;-). The series is probably 'next' worthy\nas-is, except that template renaming hack won't be needed anymore.\n\n* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit\n - diff: enable \"too large a rename\" warning when -M/-C is explicitly\n asked for\n\nThis would be the right thing to do for command line use, but gitk will be\nhit due to tcl/tk's limitation, so I am holding this back for now.\n\n----------------------------------------------------------------\n[Stalled/Needs more work]\n\n* jc/reflog-expire (Sun Jun 15 23:48:46 2008 -0700) 1 commit\n - Per-ref reflog expiry configuration\n\nPerhaps a good foundation for optionally unexpirable stash. As 1.6.0 will\nbe a good time to make backward incompatible changes, we might make expiry\nperiod of stash 'never' in new repositories. Needs a concensus.\n\n* jc/merge-theirs (Fri Jun 20 00:17:59 2008 -0700) 2 commits\n - git-merge-recursive-{ours,theirs}\n - git-merge-file --ours, --theirs\n\nPunting a merge by discarding your own work in conflicting parts but still\nsalvaging the parts that are cleanly automerged. It is likely that this\nwill result in nonsense mishmash, but somehow often people want this, so\nhere they are. The interface to the backends may need to change, though.\n\n* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits\n - blame: show \"previous\" information in --porcelain/--incremental\n format\n - git-blame: refactor code to emit \"porcelain format\" output\n + git-blame --reverse\n + builtin-blame.c: allow more than 16 parents\n + builtin-blame.c: move prepare_final() into a separate function.\n + rev-list --children\n + revision traversal: --children option\n\nThe blame that finds where each line in the original lines moved to. This\nmay help a GSoC project that wants to gather statistical overview of the\nhistory. The final presentation may need tweaking (see the log message of\nthe commit \"\"git-blame --reverse\" on the series).\n\nThe tip two commits are for peeling to see what's behind the blamed\ncommit, which we should be able to separate out into an independent topic\nfrom the rest.\n\n----------------------------------------------------------------\n[Dropped for now]\n\n* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits\n . Introduce fast forward option only\n . Head reduction before selecting merge strategy\n . Restructure git-merge.sh\n . Introduce -ff=\n . New merge tests\n . Documentation for joining more than two histories\n\nThis will interfere with Miklos's rewrite of merge to C.\n\n* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits\n . Use perl instead of tac\n . Fix t3404 assumption that `wc -l` does not use whitespace.\n . rebase -i: Use : in expr command instead of match.\n . rebase -i: update the implementation of 'mark' command\n . Add option --preserve-tags\n . Teach rebase interactive the tag command\n . Add option --first-parent\n . Do rebase with preserve merges with advanced TODO list\n . Select all lines with fake-editor\n . Unify the length of $SHORT* and the commits in the TODO list\n . Teach rebase interactive the merge command\n . Move redo merge code in a function\n . Teach rebase interactive the reset command\n . Teach rebase interactive the mark command\n . Move cleanup code into it's own function\n . Don't append default merge message to -m message\n . fake-editor: output TODO list if unchanged\n\n* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits\n . WIP: rethink replay merge\n . Start using replay-tree merge in cherry-pick\n . revert/cherry-pick: start refactoring call to merge_recursive\n\nThis is meant to improve cherry-pick's behaviour when renames are\ninvolved, by not using merge-recursive (whose d/f conflict resolution is\nquite broken), but unfortunately has stalled for some time now.\n\n* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits\n . git-am --forge: add Signed-off-by: line for the author\n . git-am: clean-up Signed-off-by: lines\n . stripspace: add --log-clean option to clean up signed-off-by:\n lines\n . stripspace: use parse_options()\n . Add \"git am -s\" test\n . git-am: refactor code to add signed-off-by line for the committer\n\nJust my toy at this moment.\n\n* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit\n . \"git push\": tellme-more protocol extension\n"},{"id":"81113","messageId":"20080625130646.GD20361@mit.edu","threadId":"12603","inReplyTo":"7vy74u5bkk.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Ask for \"git program\" when asking for \"git-program\" over SSH connection","fromName":"Theodore Tso","fromEmail":"tytso@mit.edu","sentAt":"2008-06-25T13:06:46Z","receivedAt":"2008-06-25T13:06:46Z","isPatch":true,"sender":{"key":"tytso@mit.edu","avatar":"https://avatars.githubusercontent.com/u/51416?v=4"},"body":"On Tue, Jun 24, 2008 at 10:27:07PM -0700, Junio C Hamano wrote:\n> Ok, let's map this out seriously.\n> \n> * 1.6.0 will install the server-side programs in $(bindir) so that \n> people coming over ssh will find them on the $PATH\n> \n> * In 1.6.0 (and 1.5.6.1), we will change \"git daemon\" to accept both\n> \"git-program\" and \"git program\" forms. When the spaced form is used, it\n> will behave as if the dashed form is requested. This is a prerequisite\n> for client side change to start asking for \"git program\".\n> \n> * In the near future, there will no client-side change. \"git-program\"\n> will be asked for.\n> \n> * 6 months after 1.6.0 ships, hopefully all the deployed server side will\n> be running that version or newer. Client side will start asking for\n> \"git program\" by default, but we can still override with --upload-pack\n> and friends.\n> \n> * 12 months after client side changes, everybody will be running that\n> version or newer. We stop installing the server side programs in\n> $(bindir) but people coming over ssh will be asking for \"git program\"\n> and \"git\" will be on the $PATH so there is no issue.\n> \n> The above 6 and 12 are yanked out of thin air and I am of course open to\n> tweaking them, but I think the above order of events would be workable.\n\nIs that really 6 and 12 months, or \"6/12 months or at the next major\nrelease boundary, whichever is later\". i.e., would make some of these\nchanges as part of a minor dot release, such as having the client side\nchange what it starts asking for in 1.6.3 or some such? Presumably\nthe earliest that change would happen is 1.7, and the earliest to make\nthe server side installation changes is 1.8, right? Or did you really\nmean a hard 6/12 months, regardless of release cycle issues?\n\n \t \t \t \t \t - Ted\n"},{"id":"81148","messageId":"7vlk0t1kdp.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"20080625130646.GD20361@mit.edu","subject":"Re: [PATCH] Ask for \"git program\" when asking for \"git-program\" over SSH connection","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T17:42:42Z","receivedAt":"2008-06-25T17:42:42Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Theodore Tso writes:\n\n> On Tue, Jun 24, 2008 at 10:27:07PM -0700, Junio C Hamano wrote:\n> ...\n>> The above 6 and 12 are yanked out of thin air and I am of course open to\n>> tweaking them, but I think the above order of events would be workable.\n>\n> Is that really 6 and 12 months, or \"6/12 months or at the next major\n> release boundary, whichever is later\".\n\nSigh... I thought you by now knew me better than that...\n\nYes, I didn't say it explicitly because I thought it was too obvious,\nwhich was a mistake. These except for the ones that are preparation (such\nas \"prepare daemon so that future clients can ask with non-dash forms\")\nneed to happen at release boundaries, but these 6/12 months figures set\nthe minimums. E.g. even if we had 6 week release cycles and 1.7.0 were to\nbe done 6 weeks after 1.6.0, that is still too early for the client side\nto switch asking for \"git program\".\n"},{"id":"81200","messageId":"7v4p7hxhbd.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"20080625053848.GJ11793@spearce.org","subject":"[PATCH] daemon: accept \"git program\" as well","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T22:47:50Z","receivedAt":"2008-06-25T22:47:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This is a step to futureproof git-daemon to accept clients that\nask for \"git upload-pack\" and friends, instead of using the more\ntraditional dash-form \"git-upload-pack\". By allowing both, it\nmakes the client side easier to handle, as it makes \"git\" the only\nthing necessary to be on $PATH when invoking the remote command\ndirectly via ssh.\n\nSigned-off-by: Junio C Hamano \n---\n\n \"Shawn O. Pearce\" writes:\n\n > Junio C Hamano wrote:\n >\n >> Ok, let's map this out seriously.\n >\n > This plan makes a lot of sense to me. I'm behind it. For whatever\n > that means. At least I'll shutup and stop making noise about this\n > issue if you take this approach. :-)\n > \n >> * 1.6.0 will install the server-side programs in $(bindir) so that \n >> people coming over ssh will find them on the $PATH\n >> \n >> * In 1.6.0 (and 1.5.6.1), we will change \"git daemon\" to accept both\n >> \"git-program\" and \"git program\" forms. When the spaced form is used, it\n >> will behave as if the dashed form is requested. This is a prerequisite\n >> for client side change to start asking for \"git program\".\n >> \n >> * In the near future, there will no client-side change. \"git-program\"\n >> will be asked for.\n >> \n >> * 6 months after 1.6.0 ships, hopefully all the deployed server side will\n >> be running that version or newer. Client side will start asking for\n >> \"git program\" by default, but we can still override with --upload-pack\n >> and friends.\n >> \n >> * 12 months after client side changes, everybody will be running that\n >> version or newer. We stop installing the server side programs in\n >> $(bindir) but people coming over ssh will be asking for \"git program\"\n >> and \"git\" will be on the $PATH so there is no issue.\n >> \n >> The above 6 and 12 are yanked out of thin air and I am of course open to\n >> tweaking them, but I think the above order of events would be workable.\n >\n > Yea, 6 and 12 seem like a good idea. Its a couple of releases and\n > gives people time to migrate their server installations.\n\n So this obviously needs to be queued to 'maint' to be included in 1.5.6.1\n and 1.6.0.\n\n daemon.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/daemon.c b/daemon.c\nindex 63cd12c..621c567 100644\n--- a/daemon.c\n+++ b/daemon.c\n@@ -586,7 +586,7 @@ static int execute(struct sockaddr *addr)\n \tfor (i = 0; i < ARRAY_SIZE(daemon_service); i++) {\n \t\tstruct daemon_service *s = &(daemon_service[i]);\n \t\tint namelen = strlen(s->name);\n-\t\tif (!prefixcmp(line, \"git-\") &&\n+\t\tif ((!prefixcmp(line, \"git-\") || !prefixcmp(line, \"git \")) &&\n \t\t !strncmp(s->name, line + 4, namelen) &&\n \t\t line[namelen + 4] == ' ') {\n \t\t\t/*\n"},{"id":"81201","messageId":"7vvdzxw2eo.fsf_-_@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7v4p7hxhbd.fsf@gitster.siamese.dyndns.org","subject":"[PATCH] Make clients ask for \"git program\" over ssh and local transport","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T22:55:11Z","receivedAt":"2008-06-25T22:55:11Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This will allow server side programs such as upload-pack to be installed\noutside $PATH. Connections to git-daemon still ask for \"git-program\" to\nretain backward compatibility for daemons before 1.5.6.1 and 1.6.0.\n\nSigned-off-by: Junio C Hamano \n---\n * This is essentially your patch. This can be in 1.6.0 clients and it\n should also be in 1.5.6.1 as people might keep ancient clients to talk\n to new servers that won't have anything but \"git\" on $PATH.\n\n builtin-clone.c | 2 +-\n builtin-fetch-pack.c | 2 +-\n connect.c | 10 ++++++++--\n git-parse-remote.sh | 4 ++--\n transport.c | 4 ++--\n 5 files changed, 14 insertions(+), 8 deletions(-)\n\ndiff --git a/builtin-clone.c b/builtin-clone.c\nindex 7190952..2f3e9c9 100644\n--- a/builtin-clone.c\n+++ b/builtin-clone.c\n@@ -36,7 +36,7 @@ static int option_quiet, option_no_checkout, option_bare;\n static int option_local, option_no_hardlinks, option_shared;\n static char *option_template, *option_reference, *option_depth;\n static char *option_origin = NULL;\n-static char *option_upload_pack = \"git-upload-pack\";\n+static char *option_upload_pack = \"git upload-pack\";\n \n static struct option builtin_clone_options[] = {\n \tOPT__QUIET(&option_quiet),\ndiff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c\nindex de1e8d1..a5f21f9 100644\n--- a/builtin-fetch-pack.c\n+++ b/builtin-fetch-pack.c\n@@ -14,7 +14,7 @@ static int transfer_unpack_limit = -1;\n static int fetch_unpack_limit = -1;\n static int unpack_limit = 100;\n static struct fetch_pack_args args = {\n-\t/* .uploadpack = */ \"git-upload-pack\",\n+\t/* .uploadpack = */ \"git upload-pack\",\n };\n \n static const char fetch_pack_usage[] =\ndiff --git a/connect.c b/connect.c\nindex e92af29..4a32ba4 100644\n--- a/connect.c\n+++ b/connect.c\n@@ -567,6 +567,8 @@ struct child_process *git_connect(int fd[2], const char *url_orig,\n \t\t * cannot connect.\n \t\t */\n \t\tchar *target_host = xstrdup(host);\n+\t\tconst char *program_prefix = \"\";\n+\n \t\tif (git_use_proxy(host))\n \t\t\tgit_proxy_connect(fd, host);\n \t\telse\n@@ -575,9 +577,13 @@ struct child_process *git_connect(int fd[2], const char *url_orig,\n \t\t * Separate original protocol components prog and path\n \t\t * from extended components with a NUL byte.\n \t\t */\n+\t\tif (!prefixcmp(prog, \"git \")) {\n+\t\t\tprogram_prefix = \"git-\";\n+\t\t\tprog += 4;\n+\t\t}\n \t\tpacket_write(fd[1],\n-\t\t\t \"%s %s%chost=%s%c\",\n-\t\t\t prog, path, 0,\n+\t\t\t \"%s%s %s%chost=%s%c\",\n+\t\t\t program_prefix, prog, path, 0,\n \t\t\t target_host, 0);\n \t\tfree(target_host);\n \t\tfree(url);\ndiff --git a/git-parse-remote.sh b/git-parse-remote.sh\nindex 695a409..0f82a93 100755\n--- a/git-parse-remote.sh\n+++ b/git-parse-remote.sh\n@@ -255,10 +255,10 @@ get_uploadpack () {\n \tcase \"$data_source\" in\n \tconfig)\n \t\tuplp=$(git config --get \"remote.$1.uploadpack\")\n-\t\techo ${uplp:-git-upload-pack}\n+\t\techo ${uplp:-git upload-pack}\n \t\t;;\n \t*)\n-\t\techo \"git-upload-pack\"\n+\t\techo \"git upload-pack\"\n \t\t;;\n \tesac\n }\ndiff --git a/transport.c b/transport.c\nindex 3ff8519..351b7f5 100644\n--- a/transport.c\n+++ b/transport.c\n@@ -762,10 +762,10 @@ struct transport *transport_get(struct remote *remote, const char *url)\n \n \t\tdata->thin = 1;\n \t\tdata->conn = NULL;\n-\t\tdata->uploadpack = \"git-upload-pack\";\n+\t\tdata->uploadpack = \"git upload-pack\";\n \t\tif (remote && remote->uploadpack)\n \t\t\tdata->uploadpack = remote->uploadpack;\n-\t\tdata->receivepack = \"git-receive-pack\";\n+\t\tdata->receivepack = \"git receive-pack\";\n \t\tif (remote && remote->receivepack)\n \t\t\tdata->receivepack = remote->receivepack;\n \t}\n-- \n1.5.6.86.ge2da6\n"},{"id":"81202","messageId":"7vr6alw28s.fsf_-_@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vvdzxw2eo.fsf_-_@gitster.siamese.dyndns.org","subject":"[PATCH] Ask for \"git program\" even against git-daemon","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T22:58:43Z","receivedAt":"2008-06-25T22:58:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This drops backward compatibility support to ask for \"git-program\"\nform when talking to git-daemon. Now all git native requests use\n\"git program\" form over ssh, local and git transports.\n\nThis needs to be held back until everybody runs git-daemon from 1.5.6.1 or\n1.6.0 or newer.\n\nSigned-off-by: Junio C Hamano \n---\n * According to the roadmap we exchanged earlier, this should happen in a\n major release (that increments the second dewey-decimal digit from the\n left) that ships at least 6 months after 1.5.6.1 and 1.6.0 (which will\n have the \"git daemon preparation\" patch included) are released.\n\n connect.c | 9 ++-------\n 1 files changed, 2 insertions(+), 7 deletions(-)\n\ndiff --git a/connect.c b/connect.c\nindex 4a32ba4..f2e72c2 100644\n--- a/connect.c\n+++ b/connect.c\n@@ -567,7 +567,6 @@ struct child_process *git_connect(int fd[2], const char *url_orig,\n \t\t * cannot connect.\n \t\t */\n \t\tchar *target_host = xstrdup(host);\n-\t\tconst char *program_prefix = \"\";\n \n \t\tif (git_use_proxy(host))\n \t\t\tgit_proxy_connect(fd, host);\n@@ -577,13 +576,9 @@ struct child_process *git_connect(int fd[2], const char *url_orig,\n \t\t * Separate original protocol components prog and path\n \t\t * from extended components with a NUL byte.\n \t\t */\n-\t\tif (!prefixcmp(prog, \"git \")) {\n-\t\t\tprogram_prefix = \"git-\";\n-\t\t\tprog += 4;\n-\t\t}\n \t\tpacket_write(fd[1],\n-\t\t\t \"%s%s %s%chost=%s%c\",\n-\t\t\t program_prefix, prog, path, 0,\n+\t\t\t \"%s %s%chost=%s%c\",\n+\t\t\t prog, path, 0,\n \t\t\t target_host, 0);\n \t\tfree(target_host);\n \t\tfree(url);\n-- \n1.5.6.86.ge2da6\n"},{"id":"81203","messageId":"20080625230228.GR11793@spearce.org","threadId":"12603","inReplyTo":"7v4p7hxhbd.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] daemon: accept \"git program\" as well","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-06-25T23:02:28Z","receivedAt":"2008-06-25T23:02:28Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano wrote:\n> This is a step to futureproof git-daemon to accept clients that\n> ask for \"git upload-pack\" and friends, instead of using the more\n> traditional dash-form \"git-upload-pack\". By allowing both, it\n> makes the client side easier to handle, as it makes \"git\" the only\n> thing necessary to be on $PATH when invoking the remote command\n> directly via ssh.\n> \n> Signed-off-by: Junio C Hamano \n\nObviously correct. Ack. Thanks Junio.\n\n\n> So this obviously needs to be queued to 'maint' to be included in 1.5.6.1\n> and 1.6.0.\n> \n> daemon.c | 2 +-\n> 1 files changed, 1 insertions(+), 1 deletions(-)\n> \n> diff --git a/daemon.c b/daemon.c\n> index 63cd12c..621c567 100644\n> --- a/daemon.c\n> +++ b/daemon.c\n> @@ -586,7 +586,7 @@ static int execute(struct sockaddr *addr)\n> \tfor (i = 0; i < ARRAY_SIZE(daemon_service); i++) {\n> \t\tstruct daemon_service *s = &(daemon_service[i]);\n> \t\tint namelen = strlen(s->name);\n> -\t\tif (!prefixcmp(line, \"git-\") &&\n> +\t\tif ((!prefixcmp(line, \"git-\") || !prefixcmp(line, \"git \")) &&\n> \t\t !strncmp(s->name, line + 4, namelen) &&\n> \t\t line[namelen + 4] == ' ') {\n> \t\t\t/*\n\n-- \nShawn.\n"},{"id":"81206","messageId":"20080625231343.GS11793@spearce.org","threadId":"12603","inReplyTo":"7vvdzxw2eo.fsf_-_@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Make clients ask for \"git program\" over ssh and local transport","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-06-25T23:13:43Z","receivedAt":"2008-06-25T23:13:43Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano wrote:\n> This will allow server side programs such as upload-pack to be installed\n> outside $PATH. Connections to git-daemon still ask for \"git-program\" to\n> retain backward compatibility for daemons before 1.5.6.1 and 1.6.0.\n> \n> Signed-off-by: Junio C Hamano \n> ---\n> * This is essentially your patch. This can be in 1.6.0 clients and it\n> should also be in 1.5.6.1 as people might keep ancient clients to talk\n> to new servers that won't have anything but \"git\" on $PATH.\n\nAck. Thanks for cleaning up the code in connect.c to not segfault\nor send garbage.\n\nI think you want to squash this in as well:\n\ndiff --git a/builtin-send-pack.c b/builtin-send-pack.c\nindex d76260c..f693a6d 100644\n--- a/builtin-send-pack.c\n+++ b/builtin-send-pack.c\n@@ -12,7 +12,7 @@ static const char send_pack_usage[] =\n \" --all and explicit specification are mutually exclusive.\";\n \n static struct send_pack_args args = {\n-\t/* .receivepack = */ \"git-receive-pack\",\n+\t/* .receivepack = */ \"git receive-pack\",\n };\n \n /*\n \n\n-- \nShawn.\n"},{"id":"81209","messageId":"7vmyl9w0y1.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"20080625230228.GR11793@spearce.org","subject":"Re: [PATCH] daemon: accept \"git program\" as well","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T23:26:46Z","receivedAt":"2008-06-25T23:26:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" writes:\n\n> Junio C Hamano wrote:\n>> This is a step to futureproof git-daemon to accept clients that\n>> ask for \"git upload-pack\" and friends, instead of using the more\n>> traditional dash-form \"git-upload-pack\". By allowing both, it\n>> makes the client side easier to handle, as it makes \"git\" the only\n>> thing necessary to be on $PATH when invoking the remote command\n>> directly via ssh.\n>> \n>> Signed-off-by: Junio C Hamano \n>\n> Obviously correct. Ack. Thanks Junio.\n\nBy the way I looked at gitosis (Tommi CC'ed).\n\n http://repo.or.cz/w/gitosis.git?a=blob;f=gitosis/serve.py;h=c0b7135bf45305ee1079b0dcab3b4ed1ce988aab;hb=38561aa6a51a2ef6cc04aa119481df62d213ffa4\n\nIn gitosis/serve.py, there are COMMANDS_READONLY and COMMANDS_WRITE array\nthat holds 'git-upload-pack' and 'git-receive-pack' commands, and they are\ncompared with user commands after doing:\n\n\tverb, args = command.split(None, 1)\n\n(and \"verb\" is looked up in the set of valid commands). It should not be\ntoo involved to notice verb is 'git' and then re-split the args part to\nsee if they are upload-pack/receive-pack, which would be the equivalent\nchange to this patch. It needs to be done before the clients are\nupdated.\n"},{"id":"81210","messageId":"20080625232727.GU11793@spearce.org","threadId":"12603","inReplyTo":"7vr6alw28s.fsf_-_@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Ask for \"git program\" even against git-daemon","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-06-25T23:27:27Z","receivedAt":"2008-06-25T23:27:27Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano wrote:\n> This drops backward compatibility support to ask for \"git-program\"\n> form when talking to git-daemon. Now all git native requests use\n> \"git program\" form over ssh, local and git transports.\n> \n> This needs to be held back until everybody runs git-daemon from 1.5.6.1 or\n> 1.6.0 or newer.\n> \n> Signed-off-by: Junio C Hamano \n> ---\n> * According to the roadmap we exchanged earlier, this should happen in a\n> major release (that increments the second dewey-decimal digit from the\n> left) that ships at least 6 months after 1.5.6.1 and 1.6.0 (which will\n> have the \"git daemon preparation\" patch included) are released.\n\nAgreed about holding back.\n\nBut I wonder if this patch is even worth it at some later point\nin time. Are we also going to change git-daemon to stop accepting\n\"git-\" form? Is it a worthwhile change?\n\n-- \nShawn.\n"},{"id":"81213","messageId":"7viqvxw0i7.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"20080625232727.GU11793@spearce.org","subject":"Re: [PATCH] Ask for \"git program\" even against git-daemon","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-25T23:36:16Z","receivedAt":"2008-06-25T23:36:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" writes:\n\n> Junio C Hamano wrote:\n> ...\n>> * According to the roadmap we exchanged earlier, this should happen in a\n>> major release (that increments the second dewey-decimal digit from the\n>> left) that ships at least 6 months after 1.5.6.1 and 1.6.0 (which will\n>> have the \"git daemon preparation\" patch included) are released.\n>\n> Agreed about holding back.\n>\n> But I wonder if this patch is even worth it at some later point\n> in time. Are we also going to change git-daemon to stop accepting\n> \"git-\" form? Is it a worthwhile change?\n\nThis was merely responding to...\n\n From: \"Shawn O. Pearce\" \n Subject: Re: [PATCH] Keep some git-* programs in $(bindir)\n Date: Wed, 25 Jun 2008 00:37:41 -0400\n Message-ID: <20080625043741.GD11793@spearce.org>\n\n Daniel Barkalow wrote:\n > ...\n > Should they use \"git upload-pack\" or should they look for their helper \n > programs in a libexec dir? I don't think that either of these programs is \n > useful to run independantly, but I don't know if finding a program that \n > doesn't go in $PATH on a remote machine is going to be any fun.\n\n IMHO they should in the future use \"git upload-pack\".\n\n\nI do not mind not doing this at all. Remember, I am the one with more\ninertia than anybody else here (holding back backward incompatible\ninnovations is what maintainers do).\n\nOh, that inertia does not have much to do with actual body weight, if\nanybody is wondering ;-)\n"},{"id":"81216","messageId":"20080625235724.GV11793@spearce.org","threadId":"12603","inReplyTo":"7viqvxw0i7.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Ask for \"git program\" even against git-daemon","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-06-25T23:57:24Z","receivedAt":"2008-06-25T23:57:24Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano wrote:\n> \"Shawn O. Pearce\" writes:\n> >\n> > But I wonder if this patch is even worth it at some later point\n> > in time. Are we also going to change git-daemon to stop accepting\n> > \"git-\" form? Is it a worthwhile change?\n> \n> This was merely responding to...\n> \n> From: \"Shawn O. Pearce\" \n> Subject: Re: [PATCH] Keep some git-* programs in $(bindir)\n> Date: Wed, 25 Jun 2008 00:37:41 -0400\n> Message-ID: <20080625043741.GD11793@spearce.org>\n> \n> Daniel Barkalow wrote:\n> > ...\n> > Should they use \"git upload-pack\" [...]\n> \n> IMHO they should in the future use \"git upload-pack\".\n\nSorry I wasn't clear. I was talking about the SSH transport only.\nFor git:// we could just always send git-upload-pack, like your\ntransitional patch does. Then we stay compatible with even very\nold git:// servers.\n\n-- \nShawn.\n"},{"id":"81217","messageId":"7vd4m5vz1k.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"20080625235724.GV11793@spearce.org","subject":"Re: [PATCH] Ask for \"git program\" even against git-daemon","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-26T00:07:51Z","receivedAt":"2008-06-26T00:07:51Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" writes:\n\n> Junio C Hamano wrote:\n>> \"Shawn O. Pearce\" writes:\n>> >\n>> > But I wonder if this patch is even worth it at some later point\n>> > in time. Are we also going to change git-daemon to stop accepting\n>> > \"git-\" form? Is it a worthwhile change?\n>> \n>> This was merely responding to...\n>> \n>> From: \"Shawn O. Pearce\" \n>> Subject: Re: [PATCH] Keep some git-* programs in $(bindir)\n>> Date: Wed, 25 Jun 2008 00:37:41 -0400\n>> Message-ID: <20080625043741.GD11793@spearce.org>\n>> \n>> Daniel Barkalow wrote:\n>> > ...\n>> > Should they use \"git upload-pack\" [...]\n>> \n>> IMHO they should in the future use \"git upload-pack\".\n>\n> Sorry I wasn't clear. I was talking about the SSH transport only.\n> For git:// we could just always send git-upload-pack, like your\n> transitional patch does. Then we stay compatible with even very\n> old git:// servers.\n\nOk, if that is the plan, then we wouldn't even need to futureproof\ngit-daemon at all.\n\nNot having to change anything is good ;-).\n"},{"id":"81252","messageId":"20080626082013.GT22344@eagain.net","threadId":"12603","inReplyTo":"7vmyl9w0y1.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] daemon: accept \"git program\" as well","fromName":"Tommi Virtanen","fromEmail":"tv@eagain.net","sentAt":"2008-06-26T08:20:13Z","receivedAt":"2008-06-26T08:20:13Z","isPatch":true,"sender":{"key":"tv@debian.org","avatar":null},"body":"On Wed, Jun 25, 2008 at 04:26:46PM -0700, Junio C Hamano wrote:\n> By the way I looked at gitosis (Tommi CC'ed).\n> \n> http://repo.or.cz/w/gitosis.git?a=blob;f=gitosis/serve.py;h=c0b7135bf45305ee1079b0dcab3b4ed1ce988aab;hb=38561aa6a51a2ef6cc04aa119481df62d213ffa4\n> \n> In gitosis/serve.py, there are COMMANDS_READONLY and COMMANDS_WRITE array\n> that holds 'git-upload-pack' and 'git-receive-pack' commands, and they are\n> compared with user commands after doing:\n\nYeah, that's pretty much a trivial change, doing it now to future-proof\ngitosis.\n\n-- \n:(){ :|:&};:\n"},{"id":"81295","messageId":"200806261741.36187.jnareb@gmail.com","threadId":"12603","inReplyTo":"alpine.DEB.1.00.0806242033570.9925@racer","subject":"Re: What's cooking in git.git (topics)","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-06-26T15:41:33Z","receivedAt":"2008-06-26T15:41:33Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Tue, 24 Jun 2008, Johannes Schindelin wrote:\n> Hi,\n> \n> On Tue, 24 Jun 2008, Jakub Narebski wrote:\n> \n> > git-shell hackery won't solve problem, because not everybody is using \n> > git-shell.\n> \n> The problem is not git-shell vs git potty.\n> \n> The problem is that not everybody magically updates their clients to ask \n> for dash-less form.\n\nWith git-shell even if client uses dashed form it can find git commands\n(\"hackery\" is too strong a word for having git-shell search $GIT_EXEC_PATH).\nBut if one uses only SSH, server must have dashed form in a $PATH\n\n-- \nJakub Narebski\nPoland\n"},{"id":"81341","messageId":"4864286C.80609@free.fr","threadId":"12603","inReplyTo":"20080626082013.GT22344@eagain.net","subject":"Re: [PATCH] daemon: accept \"git program\" as well","fromName":"Olivier Marin","fromEmail":"dkr+ml.git@free.fr","sentAt":"2008-06-26T23:38:20Z","receivedAt":"2008-06-26T23:38:20Z","isPatch":true,"sender":{"key":"dkr+ml.git@free.fr","avatar":null},"body":"Hi,\n\nTommi Virtanen a écrit :\n> On Wed, Jun 25, 2008 at 04:26:46PM -0700, Junio C Hamano wrote:\n>>\n>> In gitosis/serve.py, there are COMMANDS_READONLY and COMMANDS_WRITE array\n>> that holds 'git-upload-pack' and 'git-receive-pack' commands, and they are\n>> compared with user commands after doing:\n> \n> Yeah, that's pretty much a trivial change, doing it now to future-proof\n> gitosis.\n> \n\nThis just happened to me with a dashless client, so I tried your patch but it\ndoes not work. The problem comes from git-shell that do not support dashless\nargument, yet (IOW: git shell -c 'git upload-pack ...' give an error).\n\nThe following patch on top of yours fix the problem. The s/git-shell/git shell/\npart is not really necessary, but why not?\n\ndiff --git a/gitosis/serve.py b/gitosis/serve.py\nindex 9a91fcb..5aac355 100644\n--- a/gitosis/serve.py\n+++ b/gitosis/serve.py\n@@ -21,12 +21,10 @@ ALLOW_RE = re.compile(\"^'/*(?P[a-zA-Z0-9][a-zA-Z0-9@._-]*(/[a-zA-Z0-9][a-z\n \n COMMANDS_READONLY = [\n 'git-upload-pack',\n- 'git upload-pack',\n ]\n \n COMMANDS_WRITE = [\n 'git-receive-pack',\n- 'git receive-pack',\n ]\n \n class ServingError(Exception):\n@@ -75,7 +73,7 @@ def serve(\n # all known \"git foo\" commands take one argument; improve\n # if/when needed\n raise UnknownCommandError()\n- verb = '%s %s' % (verb, subverb)\n+ verb = '%s-%s' % (verb, subverb)\n \n if (verb not in COMMANDS_WRITE\n and verb not in COMMANDS_READONLY):\n@@ -201,6 +199,6 @@ class Main(app.App):\n sys.exit(1)\n \n main_log.debug('Serving %s', newcmd)\n- os.execvp('git-shell', ['git-shell', '-c', newcmd])\n- main_log.error('Cannot execute git-shell.')\n+ os.execvp('git', ['git', 'shell', '-c', newcmd])\n+ main_log.error('Cannot execute git.')\n sys.exit(1)\n\n\nOlivier.\n"},{"id":"81343","messageId":"7vd4m3ojas.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"4864286C.80609@free.fr","subject":"Re: [PATCH] daemon: accept \"git program\" as well","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-26T23:42:03Z","receivedAt":"2008-06-26T23:42:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Olivier Marin writes:\n\n> Hi,\n>\n> Tommi Virtanen a écrit :\n>> On Wed, Jun 25, 2008 at 04:26:46PM -0700, Junio C Hamano wrote:\n>>>\n>>> In gitosis/serve.py, there are COMMANDS_READONLY and COMMANDS_WRITE array\n>>> that holds 'git-upload-pack' and 'git-receive-pack' commands, and they are\n>>> compared with user commands after doing:\n>> \n>> Yeah, that's pretty much a trivial change, doing it now to future-proof\n>> gitosis.\n>> \n>\n> This just happened to me with a dashless client, so I tried your patch but it\n> does not work. The problem comes from git-shell that do not support dashless\n> argument, yet (IOW: git shell -c 'git upload-pack ...' give an error).\n>\n> The following patch on top of yours fix the problem. The s/git-shell/git shell/\n> part is not really necessary, but why not?\n>\n> diff --git a/gitosis/serve.py b/gitosis/serve.py\n> index 9a91fcb..5aac355 100644\n> --- a/gitosis/serve.py\n> +++ b/gitosis/serve.py\n> @@ -21,12 +21,10 @@ ALLOW_RE = re.compile(\"^'/*(?P[a-zA-Z0-9][a-zA-Z0-9@._-]*(/[a-zA-Z0-9][a-z\n> \n> COMMANDS_READONLY = [\n> 'git-upload-pack',\n> - 'git upload-pack',\n> ]\n> \n> COMMANDS_WRITE = [\n> 'git-receive-pack',\n> - 'git receive-pack',\n> ]\n> \n> class ServingError(Exception):\n> @@ -75,7 +73,7 @@ def serve(\n> # all known \"git foo\" commands take one argument; improve\n> # if/when needed\n> raise UnknownCommandError()\n> - verb = '%s %s' % (verb, subverb)\n> + verb = '%s-%s' % (verb, subverb)\n> \n> if (verb not in COMMANDS_WRITE\n> and verb not in COMMANDS_READONLY):\n> @@ -201,6 +199,6 @@ class Main(app.App):\n> sys.exit(1)\n> \n> main_log.debug('Serving %s', newcmd)\n> - os.execvp('git-shell', ['git-shell', '-c', newcmd])\n> - main_log.error('Cannot execute git-shell.')\n> + os.execvp('git', ['git', 'shell', '-c', newcmd])\n> + main_log.error('Cannot execute git.')\n> sys.exit(1)\n\nHmm, Tommi, if you are doing command sanitizing yourself, is there a\nreason to still invoke the command via git-shell?\n"},{"id":"81625","messageId":"7v3amweiaz.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vej6l3lp7.fsf@gitster.siamese.dyndns.org","subject":"[PATCH] Make default expiration period of reflog used for stash infinite","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-29T08:50:28Z","receivedAt":"2008-06-29T08:50:28Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This makes the default expiration period for the reflog that implements\nstash infinite.\n\nThe original behaviour to autoexpire old stashes can be restored by using\nthe gc.refs/stash.{reflogexpire,reflogexpireunreachable} configration\nvariables introduced by the previous commit.\n\nSigned-off-by: Junio C Hamano \n---\n > [Stalled/Needs more work]\n >\n > * jc/reflog-expire (Sun Jun 15 23:48:46 2008 -0700) 1 commit\n > - Per-ref reflog expiry configuration\n >\n > Perhaps a good foundation for optionally unexpirable stash. As 1.6.0 will\n > be a good time to make backward incompatible changes, we might make expiry\n > period of stash 'never' in new repositories. Needs a concensus.\n\n builtin-reflog.c | 11 +++++++++++\n 1 files changed, 11 insertions(+), 0 deletions(-)\n\ndiff --git a/builtin-reflog.c b/builtin-reflog.c\nindex 0711728..125d455 100644\n--- a/builtin-reflog.c\n+++ b/builtin-reflog.c\n@@ -441,6 +441,17 @@ static void set_reflog_expiry_param(struct cmd_reflog_expire_cb *cb, int slot, c\n \t\t}\n \t}\n \n+\t/*\n+\t * If unconfigured, make stash never expire\n+\t */\n+\tif (!strcmp(ref, \"refs/stash\")) {\n+\t\tif (!(slot & EXPIRE_TOTAL))\n+\t\t\tcb->expire_total = 0;\n+\t\tif (!(slot & EXPIRE_UNREACH))\n+\t\t\tcb->expire_unreachable = 0;\n+\t\treturn;\n+\t}\n+\n \t/* Nothing matched -- use the default value */\n \tif (!(slot & EXPIRE_TOTAL))\n \t\tcb->expire_total = default_reflog_expire;\n-- \n1.5.6.1.102.g8e69d\n"},{"id":"81624","messageId":"7vwsk8d3q5.fsf@gitster.siamese.dyndns.org","threadId":"12603","inReplyTo":"7vej6l3lp7.fsf@gitster.siamese.dyndns.org","subject":"[PATCH] Teach git-merge to pass -X