Re: Interesting git-format-patch bug

2012-11-27 Thread Junio C Hamano
per...@pluto.rain.com (Perry Hutchison) writes: Junio C Hamano gits...@pobox.com wrote: Olsen, Alan R alan.r.ol...@intel.com writes: I found an interesting bug in git-format-patch. Say you have a branch A. You create branch B and add a patch to it. You then merge that patch into branch

RE: Interesting git-format-patch bug

2012-11-27 Thread Olsen, Alan R
example of what is happening here. -Original Message- From: Perry Hutchison [mailto:per...@pluto.rain.com] Sent: Monday, November 26, 2012 8:15 PM To: gits...@pobox.com Cc: git@vger.kernel.org; Olsen, Alan R Subject: Re: Interesting git-format-patch bug Junio C Hamano gits...@pobox.com

Interesting git-format-patch bug

2012-11-26 Thread Olsen, Alan R
I found an interesting bug in git-format-patch. Say you have a branch A. You create branch B and add a patch to it. You then merge that patch into branch A. After the merge, some other process (we will call it 'gerrit') uses annotate and changes the comment on the patch that exists on branch

Re: Interesting git-format-patch bug

2012-11-26 Thread Junio C Hamano
Olsen, Alan R alan.r.ol...@intel.com writes: I found an interesting bug in git-format-patch. Say you have a branch A. You create branch B and add a patch to it. You then merge that patch into branch A. After the merge, some other process (we will call it 'gerrit') uses annotate and changes

Re: Interesting git-format-patch bug

2012-11-26 Thread Perry Hutchison
Junio C Hamano gits...@pobox.com wrote: Olsen, Alan R alan.r.ol...@intel.com writes: I found an interesting bug in git-format-patch. Say you have a branch A. You create branch B and add a patch to it. You then merge that patch into branch A. After the merge, some other process (we will