Re: [PATCH] add test case for rebase of empty commit

From: Neil Horman <nhorman@tuxdriver.com>
Date: Jun 28, 2012, 11:30 UTC
Message-ID: <20120628113057.GA29277@hmsreliant.think-freely.org>
In-Reply-To: <7vr4t079jp.fsf@alter.siamese.dyndns.org>

On Wed, Jun 27, 2012 at 02:02:34PM -0700, Junio C Hamano wrote:

Show 9 quoted lines

> Thanks.
> 
> We recently had a topic to add an option to allow rebase to carry
> empty commits forward, but I notice that it only had tests for the
> component cherry-pick to keep empty or redundant commits, so it may
> not be a bad idea to add tests for that series to the same t3401
> after this commit (Neil Horman CC'ed).
> 
>

So if I understand correctly, the desire is to augment t3401 such that it adds a test in which both of the commits in the local branch are empty, and still correctly identifies the one that was cherry-picked and only adds the remaining one during the rebase?

Yes, I think that sounds like a good idea. I'm in the middle of an sctp project at the moment, but I expect to complete it in the next few days. I can look into writing this next week if you like.

Thanks & Regards
Neil