Re: [PATCH 1/2] git-svn: ignore changeless commits when checking for a cherry-pick

From: Eric Wong <normalperson@yhbt.net>
Date: Jan 6, 2010, 21:43 UTC
Message-ID: <20100106214338.GA5115@dcvr.yhbt.net>
In-Reply-To: <1262808529-1575-1-git-send-email-amyrick@apple.com>

Andrew Myrick <amyrick@apple.com> wrote:

Show 9 quoted lines

> 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.

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.

Show 10 quoted lines

> +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.

Thanks!

-- 
Eric Wong