Re: [PATCH] cherry-pick: add --allow-empty-message option

2012-08-06 Thread Neil Horman
On Thu, Aug 02, 2012 at 11:38:51AM +0100, Chris Webb wrote:
 Scripts such as git rebase -i cannot currently cherry-pick commits which
 have an empty commit message, as git cherry-pick calls git commit
 without the --allow-empty-message option.
 
 Add an --allow-empty-message option to git cherry-pick which is passed
 through to git commit, so this behaviour can be overridden.
 
 Signed-off-by: Chris Webb ch...@arachsys.com
Sorry for the late response, but I just pulled back into town.

Having read over this thread, I think this is definately the way to go.  As
discussed having cherry-pick stop and give the user a chance to fix empty
history messages by default, and providing a switch to override that behavior
makes sense to me.  That said, shouldn't there be extra code here in the rebase
scripts to automate commit migration in that path as well?
Neil

 
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] cherry-pick: add --allow-empty-message option

2012-08-06 Thread Chris Webb
Neil Horman nhor...@tuxdriver.com writes:

 Having read over this thread, I think this is definately the way to go.  As
 discussed having cherry-pick stop and give the user a chance to fix empty
 history messages by default, and providing a switch to override that behavior
 makes sense to me.  That said, shouldn't there be extra code here in the 
 rebase
 scripts to automate commit migration in that path as well?

Yes, this patch just adds the support to the low-level git cherry-pick as
you say. I'll follow up with a patch to use the new feature in rebase [-i]
when I get some free time, hopefully later this week.

Cheers,

Chris.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] cherry-pick: add --allow-empty-message option

2012-08-06 Thread Neil Horman
On Mon, Aug 06, 2012 at 12:00:16PM +0100, Chris Webb wrote:
 Neil Horman nhor...@tuxdriver.com writes:
 
  Having read over this thread, I think this is definately the way to go.  As
  discussed having cherry-pick stop and give the user a chance to fix empty
  history messages by default, and providing a switch to override that 
  behavior
  makes sense to me.  That said, shouldn't there be extra code here in the 
  rebase
  scripts to automate commit migration in that path as well?
 
 Yes, this patch just adds the support to the low-level git cherry-pick as
 you say. I'll follow up with a patch to use the new feature in rebase [-i]
 when I get some free time, hopefully later this week.
 
 Cheers,
 
 Chris.
 
Ok, then
Acked-by: Neil Horman nhor...@tuxdriver.com

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html