Re: [PATCH 1/2] git-svn: ignore changeless commits when checking for a cherry-pick
On Jan 6, 2010, at 1:43 PM, Eric Wong wrote:
Show 15 quoted lines
> Andrew Myrick <amyrick@apple.com> wrote:
>> diff --git a/git-svn.perl b/git-svn.perl
>> index 650c9e5..8c7c034 100755
>> --- a/git-svn.perl
>> +++ b/git-svn.perl
>> @@ -3052,12 +3052,36 @@ sub check_cherry_pick {
>> for my $range ( @ranges ) {
>> delete @commits{_rev_list($range)};
>> }
>> + for my $commit (keys %commits) {
>
> Hi Andrew,
>
> I'll again defer to Sam for Acks on these. Test cases would be nice to
> have, too.I'll see what I can do. The test cases are conceptually simple (the svn dump I sent out the other day will exercise one of these patches), but it will take me some time to learn git's testing infrastructure, and I have impending deadlines on other work, so I can't promise anything immediate.
Show 20 quoted lines
>
> A few notes:
>
> The prevailing standard for indentation in git is with hard tabs and
> that's certainly the case with the rest of git-svn.perl.
>
>> +sub has_no_changes {
>> + my $commit = shift;
>> +
>> + my @revs = split / /, command_oneline(
>> + qw(rev-list --parents -1 -m), $commit);
>> +
>> + # Commits with no parents, e.g. the start of a partial branch,
>> + # have changes by definition.
>> + return 1 if (@revs < 2);
>> +
>
> I've become very picky about trailing whitespace (from Junio :), too.
> "git diff --check" is helpful for this, especially in the pre-commit
> hook.My apologies for not noticing this. I'll regenerate patches that conform to the style guidelines. Thanks for pointing out `git diff --check`; it's quite helpful.
-Andrew
Andrew Myrick <amyrick@apple.com>