{"thread":{"id":"15401","subject":"What's in git.git (Sep 2008, #01; Sat, 06)","startedAt":"2008-09-07T06:11:15Z","lastAt":"2008-09-07T23:48:48Z","messageCount":8,"participants":["Junio C Hamano","Boyd Lynn Gerber"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"89949","messageId":"7vtzcso58c.fsf@gitster.siamese.dyndns.org","threadId":"15401","inReplyTo":null,"subject":"What's in git.git (Sep 2008, #01; Sat, 06)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-09-07T06:11:15Z","receivedAt":"2008-09-07T06:11:15Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Quite a many minor fixes appeared on 'maint'. 1.6.0.2 needs to happen\nsoon. Any favorite fixes (not feature enhancements) not on the list here?\n\nOn the 'master' front, gitk, git-gui and git-svn subsystems had moderate\namount of updates. Among other things:\n\n - From gitk you can ask git-gui to show blame, and from git-gui's blame\n you can ask gitk to show the commit and history;\n\n - \"log --simplify-merges\";\n\n - \"commit --author=$name\" does not require \"A U Thor \"\n in full; abbreviated request will look for a matching one in the\n existing history;\n\n - \"pack-objects\" is safer against disc corruption;\n\n\n\n* The 'maint' branch has these fixes since the last announcement.\n\nAlex Riesen (1):\n Fix use of hardlinks in \"make install\"\n\nAlexander Gavrilov (1):\n git-gui: Fix string escaping in po2msg.sh\n\nAlexandre Bourget (2):\n git-gui: Update french translation\n git-gui: update all remaining translations to French.\n\nAndreas Färber (1):\n Makefile: always provide a fallback when hardlinks fail\n\nAsk Bjørn Hansen (1):\n Document sendemail.envelopesender configuration\n\nBjörn Steinbrink (1):\n for-each-ref: Allow a trailing slash in the patterns\n\nClemens Buchacher (2):\n git gui: show diffs with a minimum of 1 context line\n clone: fix creation of explicitly named target directory\n\nGustaf Hendeby (1):\n Document clarification: gitmodules, gitattributes\n\nHeikki Orsila (2):\n Start conforming code to \"git subcmd\" style\n Improve documentation for --dirstat diff option\n\nJeff King (2):\n pretty=format: respect date format options\n checkout: fix message when leaving detached HEAD\n\nJohan Herland (1):\n Bring local clone's origin URL in line with that of a remote clone\n\nJonas Fonseca (1):\n Fix passwd(5) ref and reflect that commit doens't use commit-tree\n\nJunio C Hamano (11):\n shell: do not play duplicated definition games to shrink the executable\n Fix example in git-name-rev documentation\n git-apply: Loosen \"match_beginning\" logic\n gitattributes: -crlf is not binary\n 'git foo' program identifies itself without dash in die() messages\n Start 1.6.0.2 maintenance cycle\n diff --cumulative is a sub-option of --dirstat\n \"blame -c\" should be compatible with \"annotate\"\n Mention the fact that 'git annotate' is only for backward compatibility.\n stash: refresh the index before deciding if the work tree is dirty\n Update draft release notes for 1.6.0.2\n\nLinus Torvalds (1):\n Fix '--dirstat' with cross-directory renaming\n\nMiklos Vajna (1):\n Makefile: add merge_recursive.h to LIB_H\n\nNanako Shiraishi (4):\n tests: use \"git xyzzy\" form (t0000 - t3599)\n tests: use \"git xyzzy\" form (t3600 - t6999)\n tests: use \"git xyzzy\" form (t7000 - t7199)\n tests: use \"git xyzzy\" form (t7200 - t9001)\n\nNguyễn Thái Ngọc Duy (5):\n diff*: fix worktree setup\n grep: fix worktree setup\n read-tree: setup worktree if merge is required\n update-index: fix worktree setup\n setup_git_directory(): fix move to worktree toplevel directory\n\nNicolas Pitre (2):\n discard revindex data when pack list changes\n improve handling of sideband message display\n\nPaolo Bonzini (1):\n make git-shell paranoid about closed stdin/stdout/stderr\n\nPaolo Ciarrocchi (1):\n tutorial: gentler illustration of Alice/Bob workflow using gitk\n\nPetr Baudis (1):\n bash completion: Hide more plumbing commands\n\nSZEDER Gábor (3):\n Documentation: fix reference to a for-each-ref option\n Documentation: fix disappeared lines in 'git stash' manpage\n Documentation: minor cleanup in a use case in 'git stash' manual\n\nShawn O. Pearce (2):\n pack-objects: Allow missing base objects when creating thin packs\n git-gui: Fix diff parsing for lines starting with \"--\" or \"++\"\n\nTeemu Likonen (1):\n config.txt: Add missing colons after option name\n\nYann Dirson (1):\n Document gitk --argscmd flag.\n\n\n* The 'master' branch has these since the last announcement\n in addition to the above.\n\nAlex Riesen (5):\n Remove calculation of the longest command name from where it is not used\n Remove useless memset of static command name lists in builtin-merge.c\n Make main_cmds and other_cmds local to builtin-help.c\n Allow git help work without PATH set\n list_commands: only call git_exec_path if it is needed\n\nAlexander Gavrilov (14):\n git-gui: Support starting gitk from Gui Blame\n git-gui: Support passing blame to a parent commit.\n git-gui: Better positioning in Blame Parent Commit\n git-gui: Allow specifying an initial line for git gui blame.\n gitk: Add option to specify the default commit on command line\n gitk: Add menu item for calling git gui blame\n git-gui: Support resolving conflicts via the diff context menu.\n git-gui: Support calling merge tools.\n git-gui: Don't allow staging files with conflicts.\n git-gui: Support more merge tools.\n git-gui: Support conflict states _U & UT.\n git-gui: Reimplement and enhance auto-selection of diffs.\n git-gui: Make F5 reselect a diff, if an untracked file is selected.\n git-gui: Show special diffs for complex conflict cases.\n\nBrandon Casey (1):\n dir.c: Avoid c99 array initialization\n\nChristian Stimming (1):\n git-gui: Mark forgotten strings for translation.\n\nDavid Soria Parra (1):\n cast pid_t's to uintmax_t to improve portability\n\nEric Wong (2):\n git-svn: check error code of send_txstream\n t9124: clean up chdir usage\n\nFlorian Weimer (3):\n git-svn: extract base blob in generate_diff\n git-svn: Introduce SVN::Git::Editor::_chg_file_get_blob\n git-svn: Send deltas during commits\n\nGiuseppe Bilotta (1):\n gitweb: ref markers link to named shortlogs\n\nGustaf Hendeby (1):\n git-gui: Teach git gui about file type changes\n\nJunio C Hamano (11):\n revision.c: whitespace fix\n revision traversal: show full history with merge simplification\n Topo-sort before --simplify-merges\n revision --simplify-merges: use decoration instead of commit->util field\n revision --simplify-merges: do not leave commits unprocessed\n revision --simplify-merges: make it a no-op without pathspec\n daemon.c: minor style fixup\n git commit --author=$name: look $name up in existing commits\n Update draft release notes for 1.6.1\n log --author/--committer: really match only with name part\n Update draft release notes for 1.6.1\n\nMatthias Kestenholz (1):\n bash-completion: Add all submodule subcommands to the completion list\n\nNicolas Pitre (5):\n pack-objects: improve returned information from write_one()\n improve reliability of fixup_pack_header_footer()\n pack-objects: use fixup_pack_header_footer()'s validation mode\n index-pack: use fixup_pack_header_footer()'s validation mode\n fixup_pack_header_footer(): use nicely aligned buffer sizes\n\nPaul Talacko (1):\n git-svn: set auto_props when renaming files\n\nRomain Francoise (1):\n builtin-help: fallback to GIT_MAN_VIEWER before man\n\nStephen R. van den Berg (4):\n git-daemon: call logerror() instead of error()\n git-daemon: use LOG_PID, simplify logging code\n git-daemon: Simplify dead-children reaping logic\n git-daemon: rewrite kindergarden, new option --max-connections\n\nThomas Rast (13):\n filter-branch: Extend test to show rewriting bug\n filter-branch: fix ref rewriting with --subdirectory-filter\n filter-branch: use --simplify-merges\n Documentation: rev-list-options: move --simplify-merges documentation\n git svn: catch lack of upstream info for dcommit earlier\n git svn info: tests: let 'init' test run with SVN 1.5\n git svn info: tests: do not use set -e\n git svn info: tests: use test_cmp instead of git-diff\n git svn info: tests: fix ptouch argument order in setup\n git svn info: make info relative to the current directory\n git svn info: always quote URLs in 'info' output\n git-svn: match SVN 1.5 behaviour of info' on unknown item\n git-svn: fix 'info' tests for unknown items\n\nTor Arvid Lund (1):\n git-p4: Fix checkout bug when using --import-local.\n"},{"id":"89974","messageId":"alpine.LNX.1.10.0809070812350.6003@suse104.zenez.com","threadId":"15401","inReplyTo":"7vtzcso58c.fsf@gitster.siamese.dyndns.org","subject":"Re: What's in git.git (Sep 2008, #01; Sat, 06)","fromName":"Boyd Lynn Gerber","fromEmail":"gerberb@zenez.com","sentAt":"2008-09-07T14:14:52Z","receivedAt":"2008-09-07T14:14:52Z","isPatch":false,"sender":{"key":"gerberb@zenez.com","avatar":null},"body":"On Sat, 6 Sep 2008, Junio C Hamano wrote:\n> Quite a many minor fixes appeared on 'maint'. 1.6.0.2 needs to happen\n> soon. Any favorite fixes (not feature enhancements) not on the list here?\n\nI would really like to see this graduate to master before 1.6.0.2\n\n* jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit\n + daemon.c: avoid setlinebuf()\n\n\n--\nBoyd Gerber \nZENEZ\t1042 East Fort Union #135, Midvale Utah 84047\n"},{"id":"89980","messageId":"7v3akbopzb.fsf@gitster.siamese.dyndns.org","threadId":"15401","inReplyTo":"alpine.LNX.1.10.0809070812350.6003@suse104.zenez.com","subject":"Re: What's in git.git (Sep 2008, #01; Sat, 06)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-09-07T16:55:20Z","receivedAt":"2008-09-07T16:55:20Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Boyd Lynn Gerber writes:\n\n> On Sat, 6 Sep 2008, Junio C Hamano wrote:\n>> Quite a many minor fixes appeared on 'maint'. 1.6.0.2 needs to happen\n>> soon. Any favorite fixes (not feature enhancements) not on the list here?\n>\n> I would really like to see this graduate to master before 1.6.0.2\n>\n> * jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit\n> + daemon.c: avoid setlinebuf()\n\nI do not think the setlinebuf() change affected 'maint' to begin with; it\nwas part of the series to clean-up daemon and to make maximum simultanous\nnumber of connections configurable. Are you having trouble building and/\nor running 1.6.0.1 on your box?\n"},{"id":"89989","messageId":"alpine.LNX.1.10.0809071139060.6003@suse104.zenez.com","threadId":"15401","inReplyTo":"7v3akbopzb.fsf@gitster.siamese.dyndns.org","subject":"Re: What's in git.git (Sep 2008, #01; Sat, 06)","fromName":"Boyd Lynn Gerber","fromEmail":"gerberb@zenez.com","sentAt":"2008-09-07T17:45:20Z","receivedAt":"2008-09-07T17:45:20Z","isPatch":false,"sender":{"key":"gerberb@zenez.com","avatar":null},"body":"On Sun, 7 Sep 2008, Junio C Hamano wrote:\n> Boyd Lynn Gerber writes:\n>> On Sat, 6 Sep 2008, Junio C Hamano wrote:\n>>> Quite a many minor fixes appeared on 'maint'. 1.6.0.2 needs to happen\n>>> soon. Any favorite fixes (not feature enhancements) not on the list here?\n>>\n>> I would really like to see this graduate to master before 1.6.0.2\n>>\n>> * jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit\n>> + daemon.c: avoid setlinebuf()\n>\n> I do not think the setlinebuf() change affected 'maint' to begin with; it\n> was part of the series to clean-up daemon and to make maximum simultanous\n> number of connections configurable. Are you having trouble building and/\n> or running 1.6.0.1 on your box?\n\nNo, it does not work. I have the git-shell problems, that I reported \nearlier with all the missing/undefined symbols. Same problems with 1.6.0 \nrelease. That is why I was hoping to have a master that would be released \nthat is clean and able to build. I am currently running on all my systems \nthe master with this commit. It is the only way for me to run any git \n1.6.x.x on any of the 12 platforms. I have been getting master and then \nadding this to compile. I have it running on 4 platforms daily doing an \npull and rebuilding git. I have testing now working on 2 platforms on \nnext.\n\nThanks,\n\n--\nBoyd Gerber \nZENEZ\t1042 East Fort Union #135, Midvale Utah 84047\n"},{"id":"89993","messageId":"7vd4jfn5hx.fsf@gitster.siamese.dyndns.org","threadId":"15401","inReplyTo":"alpine.LNX.1.10.0809071139060.6003@suse104.zenez.com","subject":"Re: What's in git.git (Sep 2008, #01; Sat, 06)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-09-07T19:03:06Z","receivedAt":"2008-09-07T19:03:06Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Boyd Lynn Gerber writes:\n\n> On Sun, 7 Sep 2008, Junio C Hamano wrote:\n>> Boyd Lynn Gerber writes:\n>>> On Sat, 6 Sep 2008, Junio C Hamano wrote:\n>>>> Quite a many minor fixes appeared on 'maint'. 1.6.0.2 needs to happen\n>>>> soon. Any favorite fixes (not feature enhancements) not on the list here?\n>>>\n>>> I would really like to see this graduate to master before 1.6.0.2\n>>>\n>>> * jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit\n>>> + daemon.c: avoid setlinebuf()\n>>\n>> I do not think the setlinebuf() change affected 'maint' to begin with; it\n>> was part of the series to clean-up daemon and to make maximum simultanous\n>> number of connections configurable. Are you having trouble building and/\n>> or running 1.6.0.1 on your box?\n>\n> No, it does not work. I have the git-shell problems,...\n\nThen it does not have anything to do with the setlinebuf-setvbuf topic at\nall, does it?\n\nI think we already have 6ffaecc (shell: do not play duplicated definition\ngames to shrink the executable, 2008-08-19), which was cherry-picked from\n4cfc24a (shell: do not play duplicated definition games to shrink the\nexecutable, 2008-08-19) on 'master'. Do you still have problem building\n'maint' on your boxes?\n"},{"id":"90022","messageId":"alpine.LNX.1.10.0809071723090.25543@suse104.zenez.com","threadId":"15401","inReplyTo":"7vd4jfn5hx.fsf@gitster.siamese.dyndns.org","subject":"Re: What's in git.git (Sep 2008, #01; Sat, 06)","fromName":"Boyd Lynn Gerber","fromEmail":"gerberb@zenez.com","sentAt":"2008-09-07T23:25:00Z","receivedAt":"2008-09-07T23:25:00Z","isPatch":false,"sender":{"key":"gerberb@zenez.com","avatar":null},"body":"On Sun, 7 Sep 2008, Junio C Hamano wrote:\n> Boyd Lynn Gerber writes:\n>> On Sun, 7 Sep 2008, Junio C Hamano wrote:\n>>> Boyd Lynn Gerber writes:\n>>>> On Sat, 6 Sep 2008, Junio C Hamano wrote:\n>>>>> Quite a many minor fixes appeared on 'maint'. 1.6.0.2 needs to happen\n>>>>> soon. Any favorite fixes (not feature enhancements) not on the list here?\n>>>>\n>>>> I would really like to see this graduate to master before 1.6.0.2\n>>>>\n>>>> * jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit\n>>>> + daemon.c: avoid setlinebuf()\n>>>\n>>> I do not think the setlinebuf() change affected 'maint' to begin with; it\n>>> was part of the series to clean-up daemon and to make maximum simultanous\n>>> number of connections configurable. Are you having trouble building and/\n>>> or running 1.6.0.1 on your box?\n>>\n>> No, it does not work. I have the git-shell problems,...\n>\n> Then it does not have anything to do with the setlinebuf-setvbuf topic at\n> all, does it?\n>\n> I think we already have 6ffaecc (shell: do not play duplicated definition\n> games to shrink the executable, 2008-08-19), which was cherry-picked from\n> 4cfc24a (shell: do not play duplicated definition games to shrink the\n> executable, 2008-08-19) on 'master'. Do you still have problem building\n> 'maint' on your boxes?\n\nNo, maint does build. I just thought your were going to release 1.6.0.2 \nfrom master. I think the next commit for set-linebug-setvbug needs to be \nin it for release.\n\nThanks,\n\n--\nBoyd Gerber \nZENEZ\t1042 East Fort Union #135, Midvale Utah 84047\n"},{"id":"90024","messageId":"7vljy3jzre.fsf@gitster.siamese.dyndns.org","threadId":"15401","inReplyTo":"alpine.LNX.1.10.0809071723090.25543@suse104.zenez.com","subject":"Re: What's in git.git (Sep 2008, #01; Sat, 06)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-09-07T23:35:17Z","receivedAt":"2008-09-07T23:35:17Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Boyd Lynn Gerber writes:\n\n> On Sun, 7 Sep 2008, Junio C Hamano wrote:\n> ...\n>> I think we already have 6ffaecc (shell: do not play duplicated definition\n>> games to shrink the executable, 2008-08-19), which was cherry-picked from\n>> 4cfc24a (shell: do not play duplicated definition games to shrink the\n>> executable, 2008-08-19) on 'master'. Do you still have problem building\n>> 'maint' on your boxes?\n>\n> No, maint does build. I just thought your were going to release\n> 1.6.0.2 from master. I think the next commit for set-linebug-setvbug\n> needs to be in it for release.\n\nThanks for clarifying, so as far as you are concerned, 'maint', which is\nthe only thing that matters for 1.6.0.2, is in a good shape ;-)\n"},{"id":"90027","messageId":"alpine.LNX.1.10.0809071746260.25543@suse104.zenez.com","threadId":"15401","inReplyTo":"7vljy3jzre.fsf@gitster.siamese.dyndns.org","subject":"Re: What's in git.git (Sep 2008, #01; Sat, 06)","fromName":"Boyd Lynn Gerber","fromEmail":"gerberb@zenez.com","sentAt":"2008-09-07T23:48:48Z","receivedAt":"2008-09-07T23:48:48Z","isPatch":false,"sender":{"key":"gerberb@zenez.com","avatar":null},"body":"On Sun, 7 Sep 2008, Junio C Hamano wrote:\n> Boyd Lynn Gerber writes:\n>> On Sun, 7 Sep 2008, Junio C Hamano wrote:\n>> ...\n>>> I think we already have 6ffaecc (shell: do not play duplicated definition\n>>> games to shrink the executable, 2008-08-19), which was cherry-picked from\n>>> 4cfc24a (shell: do not play duplicated definition games to shrink the\n>>> executable, 2008-08-19) on 'master'. Do you still have problem building\n>>> 'maint' on your boxes?\n>>\n>> No, maint does build. I just thought your were going to release\n>> 1.6.0.2 from master. I think the next commit for set-linebug-setvbug\n>> needs to be in it for release.\n>\n> Thanks for clarifying, so as far as you are concerned, 'maint', which is\n> the only thing that matters for 1.6.0.2, is in a good shape ;-)\n\nYes, I guess I miss-understood your maintainer notes. I re-read them \nbefore posting. I thought I read that you branch off master for the point \nreleases. I guess that master would be only for 1.6.1 not 1.6.0.2. Sorry \nfor my miss-understanding.\n\nThanks,\n\n--\nBoyd Gerber \nZENEZ\t1042 East Fort Union #135, Midvale Utah 84047\n"}]}