But in this special case the amended commit you are planning to push to Gerrit is equal to the original commit you have based in to make your previous commit. You do not need to make the same commit again to fix your change, just abandon it on Gerrit.
-- Marcelo Ávila de Oliveira mav...@cpqd.com.br Em 22/10/2013 18:55, "Vicki Kozel" <vickiko...@gmail.com> escreveu: > Hi Marcelo, > I do not want to abandon this change, I want to keep it and the commit > unchanged. I think this is a good practice in Gerrit to keep adding patches > to the same change - to the same commit - which allows for better change > tracking and tighter code gating. > > On Tuesday, October 22, 2013 12:22:07 PM UTC-7, Marcelo Avila wrote: >> >> Hi Vicki, >> >> You're trying to amend your commit (which was previously pushed to >> Gerrit) but your new commit (the amend) would have the exact same tree as >> its parent commit (see "--allow-empty" item in "git help commit"). In this >> case, you do NOT need to amend your commit, you just need to abandon the >> original one by clicking in the "*Abandon Change*" button in Gerrit UI. >> >> -- >> *Marcelo Ávila de Oliveira* >> CPqD - Information Technology Engineer >> Tel.: +55 19 3705-4125 >> mav...@cpqd.com.br >> www.cpqd.com.br >> >> >> 2013/10/22 William Seiti Mizuta <william...@gmail.com> >> >>> Yes, that might be the cause. Then, you can discard the last commit with >>> git reset --hard HEAD^ or create an empty commit with git commit >>> --allow-empty >>> >>> >>> William Seiti Mizuta >>> @williammizuta >>> Caelum | Ensino e Inovação >>> www.caelum.com.br >>> >>> >>> On Tue, Oct 22, 2013 at 2:55 PM, Vicki Kozel <vicki...@gmail.com> wrote: >>> >>>> Also, my file on the branch that I am amending looks exactly like the >>>> file in master. I checked their SHA1 signatures with git hash-object >>>> command - they are identical. Maybe that what is causing the problem? >>>> >>>> >>>> On Tuesday, October 22, 2013 11:53:25 AM UTC-7, Vicki Kozel wrote: >>>>> >>>>> Thank you William, >>>>> I just tried that - same outcome. >>>>> Vicki >>>>> >>>>> On Tuesday, October 22, 2013 11:24:29 AM UTC-7, William Seiti Mizuta >>>>> wrote: >>>>>> >>>>>> >>>>>> On Tue, Oct 22, 2013 at 2:20 PM, Vicki Kozel <vicki...@gmail.com>wrote: >>>>>> >>>>>>> git commit COMMON/pom.xml --amend >>>>>> >>>>>> >>>>>> You don't need to pass the file in commit command. You just need to >>>>>> use "git commit --amend" >>>>>> >>>>>> >>>>>> William Seiti Mizuta >>>>>> @williammizuta >>>>>> Caelum | Ensino e Inovação >>>>>> www.caelum.com.br >>>>>> >>>>> -- >>>> You received this message because you are subscribed to the Google >>>> Groups "Git for human beings" group. >>>> To unsubscribe from this group and stop receiving emails from it, send >>>> an email to git-users+...@**googlegroups.com. >>>> For more options, visit >>>> https://groups.google.com/**groups/opt_out<https://groups.google.com/groups/opt_out> >>>> . >>>> >>> >>> -- >>> You received this message because you are subscribed to the Google >>> Groups "Git for human beings" group. >>> To unsubscribe from this group and stop receiving emails from it, send >>> an email to git-users+...@**googlegroups.com. >>> For more options, visit >>> https://groups.google.com/**groups/opt_out<https://groups.google.com/groups/opt_out> >>> . >>> >> >> -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
