{"thread":{"id":"21273","subject":"Unapplied patches reminder","startedAt":"2009-10-18T20:20:30Z","lastAt":"2009-12-07T03:03:59Z","messageCount":15,"participants":["Nanako Shiraishi","Junio C Hamano","Jeff King","Heiko Voigt","Rolf Bjarne Kvinge","Per Strandh","Greg Price"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"125292","messageId":"20091019052030.6117@nanako3.lavabit.com","threadId":"21273","inReplyTo":null,"subject":"Unapplied patches reminder","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2009-10-18T20:20:30Z","receivedAt":"2009-10-18T20:20:30Z","isPatch":false,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Junio, I saw these patches and thought what they try to do were \nsensible, but I don't them in your tree. I didn't see much discussion \non most of them, either.\n\nBecause I don't read C very well, I may have listed some patches \nhere that you may have discarded because the code was no good, and \nif so I apologize for wasting your time, but I thought at least \nsome of them should be salvaged.\n\nHere is the list.\n\nFrom: Geoffrey Thomas \nSubject: [PATCH] diffcore-order: Default the order file to .git/info/order.\nDate: Sat, 12 Sep 2009 19:49:48 -0400\nMessage-ID: <1252799388-16295-1-git-send-email-geofft@mit.edu>\n\n Since order files tend to be useful for all operations in the\n project/repository, add a default location for the order file, so that\n you don't have to specify -O on every diff or similar\n operation.\n\nFrom:\tHeiko Voigt \nSubject: [PATCH] fix testsuite to not use any hooks possibly provided by source\nDate:\tWed, 23 Sep 2009 20:30:28 +0200\nMessage-ID: <20090923183023.GA85456@book.hvoigt.net>\n\n This is useful if you are using the testsuite with local changes that\n include activated default hooks suitable for your teams installation.\n\nFrom:\tJeff King \nSubject: Re: [BUG?] git-cvsimport: path to cvspsfile\nDate:\tWed, 23 Sep 2009 15:14:29 -0400\nMessage-ID: <20090923191428.GA30104@coredump.intra.peff.net>\n\n Bug. The script does a chdir() and then looks at the cvspsfile later. I\n think \"-A\" would have the same problem. Here is a totally untested patch\n to address the issue. Johannes, will this is_absolute_path actually work\n on Windows? I think The Right Way would be to use\n File::Spec::file_name_is_absolute, but I haven't checked whether that is\n part of core perl and if so, which version it appeared in.\n\nFrom: \"Rolf Bjarne Kvinge\" \nSubject: git rev-list --pretty=raw strips empty lines\nDate: Tue, 06 Oct 2009 14:33:37 +0200\nMessage-ID: \n\n It seems like the --pretty=raw format strips off empty newlines from the beginning of log messages, while I'd expect the raw format to not do any transformations (just as the documentation says: \"The 'raw' format shows the entire commit exactly as stored in the commit object\").\n\n The below changes works for me, not sure if I'm right about this though (my first time here ;-)\n\nFrom:\t\"Carlos R. Mafra\" \nSubject: [PATCH] Makefile: clean block-sha1/ directory instead of mozilla-sha1/\nDate:\tSun, 11 Oct 2009 15:32:19 +0200\n\n 'make clean' should remove the object files from block-sha1/\n instead of the non-existent mozilla-sha1/ directory.\n\nFrom: Per Strandh \nSubject: [PATCH] git-p4: Fixed bug that didn't allow spaces in the depot\nDate: Tue, 13 Oct 2009 22:09:12 +0200\nMessage-ID: <65D9329CA2AF94438F542D48F2A42E830F95F51514@GOT-SRV-005.QMATIC.local>\n\n git-p4 clone (and sync) did not work if the specified depot path contained spaces.\n Fixed by quoting the argument to the \"p4 changes\" and \"p4 files\" commands.\n\nFrom: \"Tom G. Christensen\" \nSubject: [PATCH] NO_PERL_MAKEMAKER should behave more like ExtUtils::MakeMaker\nDate: Tue, 13 Oct 2009 13:14:31 +0200\nMessage-ID: <1255432471-14168-1-git-send-email-tgc@statsbiblioteket.dk>\n\n This change makes NO_PERL_MAKEMAKER behave more as ExtUtils::MakeMaker\n by installing the modules into the perl libdir and not $(prefix)/lib.\n It will default to sitelib but will allow the user to choose by setting\n the INSTALLDIRS variable which is also honored by ExtUtils::MakeMaker.\n\nFrom:\tBjörn Gustavsson \nSubject: [PATCH] push: fix usage: --tags is incompatible with --all and --mirror\nDate:\tThu, 15 Oct 2009 18:39:05 +0200\nMessage-ID: <4AD75029.1010109@gmail.com>\n\n Correct the usage text to make it clear that --tags cannot\n be combined with --all or --mirror.\n\nFrom: Vietor Liu \nSubject: [PATCH v4] git-gui: adjust the minimum height of diff pane for\nDate: Fri, 16 Oct 2009 17:41:26 +0800\nMessage-Id: <1255686086-3949-1-git-send-email-vietor@vxwo.org>\n\n When the main window is maximized, if the screen height is shorter (e.g.\n Netbook screen 1024x600), both the partial commit pane and the status bar\n are hidden.\n\nFrom: Junio C Hamano \nSubject: Re: Q: supplying large sets of path to git commands\nDate: Fri, 16 Oct 2009 15:08:07 -0700\nMessage-ID: <7vtyxzrnzs.fsf@alter.siamese.dyndns.org>\n\n Here is how one might implement it for diff/log family of commands that\n use \"setup_revisions()\".\n\n I didn't test it (of course) beyond running \n\n\t./git diff --name-only HEAD | ./git diff --stdin-paths --stat -p\n\nFrom:\tBjörn Gustavsson \nSubject: [PATCH] bash: complete more options for 'git rebase'\nDate:\tSat, 17 Oct 2009 11:33:38 +0200\nMessage-ID: <4AD98F72.1060901@gmail.com>\n\n Complete all long options for 'git rebase' except --no-verify\n (probably used very seldom) and the long options corresponding\n to -v, -q, and -f.\n\nFrom: René Scharfe \nSubject: [PATCH] describe: load refnames before calling describe()\nDate: Sat, 17 Oct 2009 18:30:48 +0200\nMessage-ID: <4AD9F138.3080405@lsrfire.ath.cx>\n\n Get rid of the static variable that was used to prevent loading all\n the refnames multiple times by moving that code out of describe(),\n simply making sure it is only run once that way.\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"125306","messageId":"7vhbtwi8j1.fsf@alter.siamese.dyndns.org","threadId":"21273","inReplyTo":"20091019052030.6117@nanako3.lavabit.com","subject":"Re: Unapplied patches reminder","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-10-18T23:31:30Z","receivedAt":"2009-10-18T23:31:30Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi writes:\n\n> Junio, I saw these patches and thought what they try to do were \n> sensible, but I don't them in your tree. I didn't see much discussion \n> on most of them, either.\n>\n> Because I don't read C very well, I may have listed some patches \n> here that you may have discarded because the code was no good, and \n> if so I apologize for wasting your time, but I thought at least \n> some of them should be salvaged.\n\nThanks; very appreciated, and I wish there were more like you to help us\nkeep track things.\n\nWill comment on individual patches separately.\n"},{"id":"125302","messageId":"7vbpk4i8ii.fsf@alter.siamese.dyndns.org","threadId":"21273","inReplyTo":"20091019052030.6117@nanako3.lavabit.com","subject":"Re: Unapplied patches reminder","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-10-18T23:31:49Z","receivedAt":"2009-10-18T23:31:49Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi writes:\n\n> Junio, I saw these patches and thought what they try to do were \n> sensible, but I don't them in your tree. I didn't see much discussion \n> on most of them, either.\n>\n> Because I don't read C very well, I may have listed some patches \n> here that you may have discarded because the code was no good, and \n> if so I apologize for wasting your time, but I thought at least \n> some of them should be salvaged.\n> ...\n> From:\tHeiko Voigt \n> Subject: [PATCH] fix testsuite to not use any hooks possibly provided by source\n> Date:\tWed, 23 Sep 2009 20:30:28 +0200\n> Message-ID: <20090923183023.GA85456@book.hvoigt.net>\n>\n> This is useful if you are using the testsuite with local changes that\n> include activated default hooks suitable for your teams installation.\n\nThis may be useful when Heiko or somebody actually has changes that needs\nthis fix, but otherwise was an unnecessary code churn during pre-release \ncode freeze. I am reasonably sure that Heiko will include it in a series\nthat requires this one.\n\nIn other words, I am not against it per-se, but I would prefer to see\npatches that actually depends on this change at the same time. Otherwise\nthis \"is supposed to be no-op, and promises it will help in the future\",\nand needs extra mental effort to validate the latter claim.\n"},{"id":"125303","messageId":"7v63aci8id.fsf@alter.siamese.dyndns.org","threadId":"21273","inReplyTo":"20091019052030.6117@nanako3.lavabit.com","subject":"Re: Unapplied patches reminder","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-10-18T23:31:54Z","receivedAt":"2009-10-18T23:31:54Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi writes:\n\n> Junio, I saw these patches and thought what they try to do were \n> sensible, but I don't them in your tree. I didn't see much discussion \n> on most of them, either.\n>\n> Because I don't read C very well, I may have listed some patches \n> here that you may have discarded because the code was no good, and \n> if so I apologize for wasting your time, but I thought at least \n> some of them should be salvaged.\n> ...\n> From:\tJeff King \n> Subject: Re: [BUG?] git-cvsimport: path to cvspsfile\n> Date:\tWed, 23 Sep 2009 15:14:29 -0400\n> Message-ID: <20090923191428.GA30104@coredump.intra.peff.net>\n>\n> Bug. The script does a chdir() and then looks at the cvspsfile later. I\n> think \"-A\" would have the same problem. Here is a totally untested patch\n> to address the issue. Johannes, will this is_absolute_path actually work\n> on Windows? I think The Right Way would be to use\n> File::Spec::file_name_is_absolute, but I haven't checked whether that is\n> part of core perl and if so, which version it appeared in.\n\nMy understanding of this is that it is a typical \"how about this\" that is\nstill waiting for a follow-up discussion that will result in an eventual\nsolution.\n\n> From: Junio C Hamano \n> Subject: Re: Q: supplying large sets of path to git commands\n> Date: Fri, 16 Oct 2009 15:08:07 -0700\n> Message-ID: <7vtyxzrnzs.fsf@alter.siamese.dyndns.org>\n>\n> Here is how one might implement it for diff/log family of commands that\n> use \"setup_revisions()\".\n>\n> I didn't test it (of course) beyond running \n>\n> \t./git diff --name-only HEAD | ./git diff --stdin-paths --stat -p\n\nDitto.\n"},{"id":"125304","messageId":"7vzl7ogtxs.fsf@alter.siamese.dyndns.org","threadId":"21273","inReplyTo":"20091019052030.6117@nanako3.lavabit.com","subject":"Re: Unapplied patches reminder","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-10-18T23:31:59Z","receivedAt":"2009-10-18T23:31:59Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi writes:\n\n> Junio, I saw these patches and thought what they try to do were \n> sensible, but I don't them in your tree. I didn't see much discussion \n> on most of them, either.\n>\n> Because I don't read C very well, I may have listed some patches \n> here that you may have discarded because the code was no good, and \n> if so I apologize for wasting your time, but I thought at least \n> some of them should be salvaged.\n> ...\n> From: \"Rolf Bjarne Kvinge\" \n> Subject: git rev-list --pretty=raw strips empty lines\n> Date: Tue, 06 Oct 2009 14:33:37 +0200\n> Message-ID: \n>\n> It seems like the --pretty=raw format strips off empty newlines from\n> the beginning of log messages, while I'd expect the raw format to\n> not do any transformations (just as the documentation says: \"The\n> 'raw' format shows the entire commit exactly as stored in the commit\n> object\").\n>\n> The below changes works for me, not sure if I'm right about this\n> though (my first time here ;-)\n\nI do not recall seeing this one; most likely it was lost in the noise,\nespecially because it did not look like a patch submission, without having\nanything resembling a commit log message.\n\nI think the change itself is an uncontroversial one, even though this\nreally changes the behaviour.\n\n> From: Per Strandh \n> Subject: [PATCH] git-p4: Fixed bug that didn't allow spaces in the depot\n> Date: Tue, 13 Oct 2009 22:09:12 +0200\n> Message-ID: <65D9329CA2AF94438F542D48F2A42E830F95F51514@GOT-SRV-005.QMATIC.local>\n>\n> git-p4 clone (and sync) did not work if the specified depot path contained spaces.\n> Fixed by quoting the argument to the \"p4 changes\" and \"p4 files\" commands.\n\nI do recall ignoring this one because (1) I never use git-p4 myself and\nalways rely on Acks from people who have been involved in it, and (2) the\nmessage was mangled (perhaps it had two or three copies of patches as\nattachments).\n"},{"id":"125305","messageId":"7vtyxwgtxm.fsf@alter.siamese.dyndns.org","threadId":"21273","inReplyTo":"20091019052030.6117@nanako3.lavabit.com","subject":"Re: Unapplied patches reminder","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-10-18T23:32:05Z","receivedAt":"2009-10-18T23:32:05Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi writes:\n\n> Junio, I saw these patches and thought what they try to do were \n> sensible, but I don't them in your tree. I didn't see much discussion \n> on most of them, either.\n>\n> Because I don't read C very well, I may have listed some patches \n> here that you may have discarded because the code was no good, and \n> if so I apologize for wasting your time, but I thought at least \n> some of them should be salvaged.\n> ...\n> From:\t\"Carlos R. Mafra\" \n> Subject: [PATCH] Makefile: clean block-sha1/ directory instead of mozilla-sha1/\n> Date:\tSun, 11 Oct 2009 15:32:19 +0200\n>\n> 'make clean' should remove the object files from block-sha1/\n> instead of the non-existent mozilla-sha1/ directory.\n\nThis was lost in the noise, and it is an obviously correct patch.\n\nThanks for a reminder.\n\n> From:\tBjörn Gustavsson \n> Subject: [PATCH] push: fix usage: --tags is incompatible with --all and --mirror\n> Date:\tThu, 15 Oct 2009 18:39:05 +0200\n> Message-ID: <4AD75029.1010109@gmail.com>\n>\n> Correct the usage text to make it clear that --tags cannot\n> be combined with --all or --mirror.\n\nDitto.\n\n> From: René Scharfe \n> Subject: [PATCH] describe: load refnames before calling describe()\n> Date: Sat, 17 Oct 2009 18:30:48 +0200\n> Message-ID: <4AD9F138.3080405@lsrfire.ath.cx>\n>\n> Get rid of the static variable that was used to prevent loading all\n> the refnames multiple times by moving that code out of describe(),\n> simply making sure it is only run once that way.\n\nDitto.\n"},{"id":"125307","messageId":"7voco4gtxd.fsf@alter.siamese.dyndns.org","threadId":"21273","inReplyTo":"20091019052030.6117@nanako3.lavabit.com","subject":"Re: Unapplied patches reminder","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-10-18T23:32:14Z","receivedAt":"2009-10-18T23:32:14Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi writes:\n\n> Junio, I saw these patches and thought what they try to do were \n> sensible, but I don't them in your tree. I didn't see much discussion \n> on most of them, either.\n>\n> Because I don't read C very well, I may have listed some patches \n> here that you may have discarded because the code was no good, and \n> if so I apologize for wasting your time, but I thought at least \n> some of them should be salvaged.\n> ...\n> From: Geoffrey Thomas \n> Subject: [PATCH] diffcore-order: Default the order file to .git/info/order.\n> Date: Sat, 12 Sep 2009 19:49:48 -0400\n> Message-ID: <1252799388-16295-1-git-send-email-geofft@mit.edu>\n>\n> Since order files tend to be useful for all operations in the\n> project/repository, add a default location for the order file, so that\n> you don't have to specify -O on every diff or similar\n> operation.\n\nExcept that \"$GIT_DIR/info/order\" is a bit too generic a name (\"eh,\n'order'? Order of what?\"), I do not think this will hurt, as no existing\nrepositories would have such a file that would cause any behaviour change\nto existing users. The reason I did not queue it was because there wasn't\nany discussion on it (not even the filename being too generic) which was\nan indication that not many people are interested in such a feature.\n\nThat of course can be remedied by interested people speaking out.\n"},{"id":"125308","messageId":"7viqecgtx8.fsf@alter.siamese.dyndns.org","threadId":"21273","inReplyTo":"20091019052030.6117@nanako3.lavabit.com","subject":"Re: Unapplied patches reminder","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-10-18T23:32:19Z","receivedAt":"2009-10-18T23:32:19Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi writes:\n\n> Junio, I saw these patches and thought what they try to do were \n> sensible, but I don't them in your tree. I didn't see much discussion \n> on most of them, either.\n>\n> Because I don't read C very well, I may have listed some patches \n> here that you may have discarded because the code was no good, and \n> if so I apologize for wasting your time, but I thought at least \n> some of them should be salvaged.\n> ...\n> From: \"Tom G. Christensen\" \n> Subject: [PATCH] NO_PERL_MAKEMAKER should behave more like ExtUtils::MakeMaker\n> Date: Tue, 13 Oct 2009 13:14:31 +0200\n> Message-ID: <1255432471-14168-1-git-send-email-tgc@statsbiblioteket.dk>\n>\n> This change makes NO_PERL_MAKEMAKER behave more as ExtUtils::MakeMaker\n> by installing the modules into the perl libdir and not $(prefix)/lib.\n> It will default to sitelib but will allow the user to choose by setting\n> the INSTALLDIRS variable which is also honored by ExtUtils::MakeMaker.\n\nI still have this in my inbox, but I tend to wait for Acks to patches that\ntouch perl/ area before acting on them, which hasn't happened.\n\nP.S. Originally I somehow mistook this from tchrist (aka thoth) and\nblindly applied, but then realized it is a different Tom with slightly\ndifferent family name and recategorized the patch to go through the usual\nreview cycle.\n"},{"id":"125309","messageId":"7vd44kgtx3.fsf@alter.siamese.dyndns.org","threadId":"21273","inReplyTo":"20091019052030.6117@nanako3.lavabit.com","subject":"Re: Unapplied patches reminder","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-10-18T23:32:24Z","receivedAt":"2009-10-18T23:32:24Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi writes:\n\n> Junio, I saw these patches and thought what they try to do were \n> sensible, but I don't them in your tree. I didn't see much discussion \n> on most of them, either.\n>\n> Because I don't read C very well, I may have listed some patches \n> here that you may have discarded because the code was no good, and \n> if so I apologize for wasting your time, but I thought at least \n> some of them should be salvaged.\n> ...\n> From: Vietor Liu \n> Subject: [PATCH v4] git-gui: adjust the minimum height of diff pane for\n> Date: Fri, 16 Oct 2009 17:41:26 +0800\n> Message-Id: <1255686086-3949-1-git-send-email-vietor@vxwo.org>\n>\n> When the main window is maximized, if the screen height is shorter (e.g.\n> Netbook screen 1024x600), both the partial commit pane and the status bar\n> are hidden.\n\nI never apply patches to git-gui and gitk myself, but expect to be fed\nthem via respective area experts.\n\n> From:\tBjörn Gustavsson \n> Subject: [PATCH] bash: complete more options for 'git rebase'\n> Date:\tSat, 17 Oct 2009 11:33:38 +0200\n> Message-ID: <4AD98F72.1060901@gmail.com>\n>\n> Complete all long options for 'git rebase' except --no-verify\n> (probably used very seldom) and the long options corresponding\n> to -v, -q, and -f.\n\nLikewise; I was expecting Shawn to Ack/Nak this one.\n"},{"id":"125342","messageId":"20091019064955.GB1457@coredump.intra.peff.net","threadId":"21273","inReplyTo":"7v63aci8id.fsf@alter.siamese.dyndns.org","subject":"Re: Unapplied patches reminder","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-10-19T06:49:55Z","receivedAt":"2009-10-19T06:49:55Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Oct 18, 2009 at 04:31:54PM -0700, Junio C Hamano wrote:\n\n> > From:\tJeff King \n> > Subject: Re: [BUG?] git-cvsimport: path to cvspsfile\n> > Date:\tWed, 23 Sep 2009 15:14:29 -0400\n> > Message-ID: <20090923191428.GA30104@coredump.intra.peff.net>\n> >\n> > Bug. The script does a chdir() and then looks at the cvspsfile later. I\n> > think \"-A\" would have the same problem. Here is a totally untested patch\n> > to address the issue. Johannes, will this is_absolute_path actually work\n> > on Windows? I think The Right Way would be to use\n> > File::Spec::file_name_is_absolute, but I haven't checked whether that is\n> > part of core perl and if so, which version it appeared in.\n> \n> My understanding of this is that it is a typical \"how about this\" that is\n> still waiting for a follow-up discussion that will result in an eventual\n> solution.\n\nYep. I got comments from JSixt, but I never got around to re-rolling.\nHere it is, though still only lightly tested by me (happily, I have not\nhad to touch CVS for a few years).\n\n-- >8 --\nSubject: [PATCH] cvsimport: fix relative argument filenames\n\nOne of the first things that cvsimport does is chdir to the\nnewly created git repo. This means that any filenames given\nto us on the command line will be looked up relative to the\ngit repo directory. This is probably not what the user\nexpects, so let's remember and prepend the original\ndirectory for relative filenames.\n\nSigned-off-by: Jeff King \n---\n git-cvsimport.perl | 17 ++++++++++++++---\n 1 files changed, 14 insertions(+), 3 deletions(-)\n\ndiff --git a/git-cvsimport.perl b/git-cvsimport.perl\nindex 1ad20ac..a7d215c 100755\n--- a/git-cvsimport.perl\n+++ b/git-cvsimport.perl\n@@ -579,10 +579,21 @@ sub get_headref ($) {\n \treturn $r;\n }\n \n+my $user_filename_prepend = '';\n+sub munge_user_filename {\n+\tmy $name = shift;\n+\treturn File::Spec->file_name_is_absolute($name) ?\n+\t\t$name :\n+\t\t$user_filename_prepend . $name;\n+}\n+\n -d $git_tree\n \tor mkdir($git_tree,0777)\n \tor die \"Could not create $git_tree: $!\";\n-chdir($git_tree);\n+if ($git_tree ne '.') {\n+\t$user_filename_prepend = getwd() . '/';\n+\tchdir($git_tree);\n+}\n \n my $last_branch = \"\";\n my $orig_branch = \"\";\n@@ -644,7 +655,7 @@ unless (-d $git_dir) {\n -f \"$git_dir/cvs-authors\" and\n read_author_info(\"$git_dir/cvs-authors\");\n if ($opt_A) {\n-\tread_author_info($opt_A);\n+\tread_author_info(munge_user_filename($opt_A));\n \twrite_author_info(\"$git_dir/cvs-authors\");\n }\n \n@@ -679,7 +690,7 @@ unless ($opt_P) {\n \t$? == 0 or die \"git-cvsimport: fatal: cvsps reported error\\n\";\n \tclose $cvspsfh;\n } else {\n-\t$cvspsfile = $opt_P;\n+\t$cvspsfile = munge_user_filename($opt_P);\n }\n \n open(CVS, \"<$cvspsfile\") or die $!;\n-- \n1.6.5.1.121.g1a4d5\n"},{"id":"125355","messageId":"7vskdf4xlm.fsf@alter.siamese.dyndns.org","threadId":"21273","inReplyTo":"20091019064955.GB1457@coredump.intra.peff.net","subject":"Re: Unapplied patches reminder","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-10-19T08:05:57Z","receivedAt":"2009-10-19T08:05:57Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> Yep. I got comments from JSixt, but I never got around to re-rolling.\n> Here it is, though still only lightly tested by me (happily, I have not\n> had to touch CVS for a few years).\n>\n> -- >8 --\n> Subject: [PATCH] cvsimport: fix relative argument filenames\n\nThanks, applied.\n"},{"id":"125357","messageId":"20091019081050.GB44290@book.hvoigt.net","threadId":"21273","inReplyTo":"7vbpk4i8ii.fsf@alter.siamese.dyndns.org","subject":"Re: Re: Unapplied patches reminder","fromName":"Heiko Voigt","fromEmail":"hvoigt@hvoigt.net","sentAt":"2009-10-19T08:10:50Z","receivedAt":"2009-10-19T08:10:50Z","isPatch":false,"sender":{"key":"hvoigt@hvoigt.net","avatar":"https://avatars.githubusercontent.com/u/184958?v=4"},"body":"On Sun, Oct 18, 2009 at 04:31:49PM -0700, Junio C Hamano wrote:\n> Nanako Shiraishi writes:\n> > ...\n> > From:\tHeiko Voigt \n> > Subject: [PATCH] fix testsuite to not use any hooks possibly provided by source\n> > Date:\tWed, 23 Sep 2009 20:30:28 +0200\n> > Message-ID: <20090923183023.GA85456@book.hvoigt.net>\n> >\n> > This is useful if you are using the testsuite with local changes that\n> > include activated default hooks suitable for your teams installation.\n> \n> This may be useful when Heiko or somebody actually has changes that needs\n> this fix, but otherwise was an unnecessary code churn during pre-release \n> code freeze. I am reasonably sure that Heiko will include it in a series\n> that requires this one.\n> \n> In other words, I am not against it per-se, but I would prefer to see\n> patches that actually depends on this change at the same time. Otherwise\n> this \"is supposed to be no-op, and promises it will help in the future\",\n> and needs extra mental effort to validate the latter claim.\n\nWell, currently we do not have any activated hooks. They are all sample.\nAnd because the use scenarios for git are so diverse we will probably\nnever have any default hook activated.\nBut I imagine that if you are creating a default installation for any\nteam you will activate some. For an example take this patch:\n\nhttp://thread.gmane.org/gmane.comp.version-control.git/110874\n\nit is not in master because it was to specific but I have such a hook\nactivated. It does not allow you to commit on master which breaks the\ntestsuite.\n\nSo in my opinion we should not run the testsuite with hooks even though\nthe current defaults are all deactivated.\n\nI am afraid that I will never be able to persuade everyone on the list\nto not commit on master... ;)\n\ncheers Heiko\n\nP.S.: Just thinking of previous hooks, I might make it an option like\n hooks.doNotCommitOnMaster. But still the hooks would be\n deactivated.\n"},{"id":"125372","messageId":"op.u11p53ryk71drc@linux.home","threadId":"21273","inReplyTo":"7vzl7ogtxs.fsf@alter.siamese.dyndns.org","subject":"Re: Unapplied patches reminder","fromName":"Rolf Bjarne Kvinge","fromEmail":"rkvinge@novell.com","sentAt":"2009-10-19T11:57:29Z","receivedAt":"2009-10-19T11:57:29Z","isPatch":false,"sender":{"key":"rkvinge@novell.com","avatar":null},"body":"On Mon, 19 Oct 2009 01:31:59 +0200, Junio C Hamano wrote:\n\n> Nanako Shiraishi writes:\n>\n>> Junio, I saw these patches and thought what they try to do were\n>> sensible, but I don't them in your tree. I didn't see much discussion\n>> on most of them, either.\n>>\n>> Because I don't read C very well, I may have listed some patches\n>> here that you may have discarded because the code was no good, and\n>> if so I apologize for wasting your time, but I thought at least\n>> some of them should be salvaged.\n>> ...\n>> From: \"Rolf Bjarne Kvinge\" \n>> Subject: git rev-list --pretty=raw strips empty lines\n>> Date: Tue, 06 Oct 2009 14:33:37 +0200\n>> Message-ID: \n>>\n>> It seems like the --pretty=raw format strips off empty newlines from\n>> the beginning of log messages, while I'd expect the raw format to\n>> not do any transformations (just as the documentation says: \"The\n>> 'raw' format shows the entire commit exactly as stored in the commit\n>> object\").\n>>\n>> The below changes works for me, not sure if I'm right about this\n>> though (my first time here ;-)\n>\n> I do not recall seeing this one; most likely it was lost in the noise,\n> especially because it did not look like a patch submission, without having\n> anything resembling a commit log message.\n>\n> I think the change itself is an uncontroversial one, even though this\n> really changes the behaviour.\n\nMy specific need is to be able to get out the exact same log message as I committed, another way of getting the same result would be to implement --pretty=xml (along the lines of subversions 'svn log --xml'). This would prevent behavioural changes. And yes, I'm willing to implement it if you agree it's a good idea.\n\nRegarding the previous patch I just found that it's not complete - git would still print lines with only whitespace as empty lines (i.e. stripping off the whitespace). I'm attaching a revised patch that fixes this issue, but since I found the resulting code slightly ugly, I also found an easier approach: in pretty_print_commit (pretty.c) just print the commit message buffer and return.\n\nRolf\n\n-- \nUsing Opera's revolutionary e-mail client: http://www.opera.com/mail/\n\n\n\nFrom 4fa9e4c1c133fbe3423c979efd5722dd7bd5d530 Mon Sep 17 00:00:00 2001\nFrom: Rolf Bjarne Kvinge \nDate: Mon, 19 Oct 2009 13:31:17 +0200\nSubject: [PATCH] pretty.c: Don't do any transformations when using the 'raw' format.\n\nWhen formatting commits with the 'raw' format, print the commit exactly as\nstored.\n\nSigned-off-by: Rolf Bjarne Kvinge \n---\n pretty.c | 5 +++++\n 1 files changed, 5 insertions(+), 0 deletions(-)\n\ndiff --git a/pretty.c b/pretty.c\nindex f5983f8..96dac9a 100644\n--- a/pretty.c\n+++ b/pretty.c\n@@ -915,6 +915,11 @@ void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,\n \t\treturn;\n \t}\n \n+\tif (fmt == CMIT_FMT_RAW) {\n+\t\tstrbuf_add(sb, msg, strlen (msg));\n+\t\treturn;\n+\t}\n+\n \treencoded = reencode_commit_message(commit, &encoding);\n \tif (reencoded) {\n \t\tmsg = reencoded;\n-- \n1.6.5.rc2.17.gdbc1b.dirty\n\n"},{"id":"125380","messageId":"hbhoeq$ehf$1@ger.gmane.org","threadId":"21273","inReplyTo":"7vzl7ogtxs.fsf@alter.siamese.dyndns.org","subject":"Re: Unapplied patches reminder","fromName":"Per Strandh","fromEmail":"per.strandh@q-matic.se","sentAt":"2009-10-19T13:08:28Z","receivedAt":"2009-10-19T13:08:28Z","isPatch":false,"sender":{"key":"per.strandh@q-matic.se","avatar":null},"body":"\n\"Junio C Hamano\" skrev i meddelandet \nnews:7vzl7ogtxs.fsf@alter.siamese.dyndns.org...\n>> From: Per Strandh \n>> Subject: [PATCH] git-p4: Fixed bug that didn't allow spaces in the depot\n>> Date: Tue, 13 Oct 2009 22:09:12 +0200\n>> Message-ID: \n>> <65D9329CA2AF94438F542D48F2A42E830F95F51514@GOT-SRV-005.QMATIC.local>\n>>\n>> git-p4 clone (and sync) did not work if the specified depot path \n>> contained spaces.\n>> Fixed by quoting the argument to the \"p4 changes\" and \"p4 files\" \n>> commands.\n>\n> I do recall ignoring this one because (1) I never use git-p4 myself and\n> always rely on Acks from people who have been involved in it, and (2) the\n> message was mangled (perhaps it had two or three copies of patches as\n> attachments).\n\n\nSorry for posting a mangled patch.\nPlease let someone involved in the git-p4 code review/approve/apply the \npatch.\n\nRegards\n/Per/\n\n\n\n>From c70682a9c4051f2dc92e2dd92f1710c755df6cfe Mon Sep 17 00:00:00 2001\nFrom: Per Strandh \nDate: Fri, 9 Oct 2009 12:11:14 +0200\nSubject: [PATCH] git-p4: Fixed bug that didn't allow spaces in the depot \npath\n\ngit-p4 clone (and sync) did not work if the specified depot path contained \nspaces.\nFixed by quoting the argument to the \"p4 changes\" and \"p4 files\" commands.\n\nSigned-off-by: Per Strandh \n---\n contrib/fast-import/git-p4 | 8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4\nindex e710219..01b6bbb 100755\n--- a/contrib/fast-import/git-p4\n+++ b/contrib/fast-import/git-p4\n@@ -440,8 +440,8 @@ def originP4BranchesExist():\n\n def p4ChangesForPaths(depotPaths, changeRange):\n assert depotPaths\n- output = p4_read_pipe_lines(\"changes \" + ' '.join ([\"%s...%s\" % (p, \nchangeRange)\n- for p in \ndepotPaths]))\n+ output = p4_read_pipe_lines(\"changes \\\"\" + ' '.join ([\"%s...%s\" % (p, \nchangeRange)\n+ for p in \ndepotPaths]) + \"\\\"\" )\n\n changes = {}\n for line in output:\n@@ -1437,10 +1437,10 @@ class P4Sync(Command):\n newestRevision = 0\n\n fileCnt = 0\n- for info in p4CmdList(\"files \"\n+ for info in p4CmdList(\"files \\\"\"\n + ' '.join([\"%s...%s\"\n % (p, revision)\n- for p in self.depotPaths])):\n+ for p in self.depotPaths]) + \n\"\\\"\"):\n\n if info['code'] == 'error':\n sys.stderr.write(\"p4 returned an error: %s\\n\"\n-- \n1.6.3.msysgit.0\n\n \n"},{"id":"129373","messageId":"20091207030359.GK30538@dr-wily.mit.edu","threadId":"21273","inReplyTo":"7voco4gtxd.fsf@alter.siamese.dyndns.org","subject":"Re: Unapplied patches reminder","fromName":"Greg Price","fromEmail":"price@ksplice.com","sentAt":"2009-12-07T03:03:59Z","receivedAt":"2009-12-07T03:03:59Z","isPatch":false,"sender":{"key":"price@mit.edu","avatar":"https://avatars.githubusercontent.com/u/28173?v=4"},"body":"Junio wrote:\n> > From: Geoffrey Thomas \n> > Subject: [PATCH] diffcore-order: Default the order file to .git/info/order.\n> > Date: Sat, 12 Sep 2009 19:49:48 -0400\n> > Message-ID: <1252799388-16295-1-git-send-email-geofft@mit.edu>\n> >\n> > Since order files tend to be useful for all operations in the\n> > project/repository, add a default location for the order file, so that\n> > you don't have to specify -O on every diff or similar\n> > operation.\n>\n> Except that \"$GIT_DIR/info/order\" is a bit too generic a name (\"eh,\n> 'order'? Order of what?\"), I do not think this will hurt, as no existing\n> repositories would have such a file that would cause any behaviour change\n> to existing users. The reason I did not queue it was because there wasn't\n> any discussion on it (not even the filename being too generic) which was\n> an indication that not many people are interested in such a feature.\n>\n> That of course can be remedied by interested people speaking out.\n\nI never use the -O option, but if this feature were available I think\nI would use it. It would make it possible to configure a helpful\norder once -- for example, putting a changelog file first in order to\ncompare it with the commit message -- and then always use it without\neffort.\n\nA less generic name might be 'difforder'.\n\nGreg\n"}]}