git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* BUG: [Cosmetic] Commiting a gerrit ChangeId before the commit hook was installed
@ 2014-01-17 20:23 Strainu
  2014-01-17 20:41 ` Jonathan Nieder
  0 siblings, 1 reply; 5+ messages in thread
From: Strainu @ 2014-01-17 20:23 UTC (permalink / raw)
  To: git

I was trying to send a new version of a patch to a gerrit server from
a new computer, so I made a change with a ChangeId in the description
and tried to review it:

strainu@emily:~/core> git branch archivebot
strainu@emily:~/core> git checkout archivebot
M       pywikibot/page.py
Switched to branch 'archivebot'
strainu@emily:~/core> git diff
strainu@emily:~/core> git add .
strainu@emily:~/core> git commit
[archivebot 282ad24] Update getFileVersionHistoryTable.
 1 file changed, 3 insertions(+), 4 deletions(-)
strainu@emily:~/core> git review -f
Creating a git remote called "gerrit" that maps to:
        ssh://strainu@gerrit.wikimedia.org:29418/pywikibot/core.git
Your change was committed before the commit hook was installed.
Amending the commit to add a gerrit change id.


At this point I ended the transaction, as I was confused by the last
message: I was afraid the ChangeId would have changed, causing the
patch to be attached to another review.

I think git should not show this message if the change description
already has a change id, or at least add another message that
clarifies the fact that the change id has not changed.

Thanks,
   Strainu

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: BUG: [Cosmetic] Commiting a gerrit ChangeId before the commit hook was installed
  2014-01-17 20:23 BUG: [Cosmetic] Commiting a gerrit ChangeId before the commit hook was installed Strainu
@ 2014-01-17 20:41 ` Jonathan Nieder
  2014-01-17 21:10   ` Strainu
  0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Nieder @ 2014-01-17 20:41 UTC (permalink / raw)
  To: Strainu; +Cc: git, openstack-infra

Hi,

Strainu wrote:

> strainu@emily:~/core> git review -f
> Creating a git remote called "gerrit" that maps to:
>         ssh://strainu@gerrit.wikimedia.org:29418/pywikibot/core.git
> Your change was committed before the commit hook was installed.
> Amending the commit to add a gerrit change id.
>
> At this point I ended the transaction, as I was confused by the last
> message: I was afraid the ChangeId would have changed, causing the
> patch to be attached to another review.
>
> I think git should not show this message if the change description
> already has a change id

This message doesn't come from git.  It comes from the git-review
tool (in git_review/cmd.py), so cc-ing the authors in case they
have thoughts on that.

Thanks,
Jonathan

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: BUG: [Cosmetic] Commiting a gerrit ChangeId before the commit hook was installed
  2014-01-17 20:41 ` Jonathan Nieder
@ 2014-01-17 21:10   ` Strainu
       [not found]     ` <CAC9meR+78_EvoqHNcuPyDKOZDjSsUngziGDa2aV1QDtOb8eOXw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
  0 siblings, 1 reply; 5+ messages in thread
From: Strainu @ 2014-01-17 21:10 UTC (permalink / raw)
  To: Jonathan Nieder; +Cc: git, openstack-infra

2014/1/17 Jonathan Nieder <jrnieder@gmail.com>:
> Hi,
>
> Strainu wrote:
>
>> strainu@emily:~/core> git review -f
>> Creating a git remote called "gerrit" that maps to:
>>         ssh://strainu@gerrit.wikimedia.org:29418/pywikibot/core.git
>> Your change was committed before the commit hook was installed.
>> Amending the commit to add a gerrit change id.
>>
>> At this point I ended the transaction, as I was confused by the last
>> message: I was afraid the ChangeId would have changed, causing the
>> patch to be attached to another review.
>>
>> I think git should not show this message if the change description
>> already has a change id
>
> This message doesn't come from git.  It comes from the git-review
> tool (in git_review/cmd.py), so cc-ing the authors in case they
> have thoughts on that.

Thanks for clarifying that. I'll log a bug on launchpad then.

Strainu

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: BUG: [Cosmetic] Commiting a gerrit ChangeId before the commit hook was installed
       [not found]     ` <CAC9meR+78_EvoqHNcuPyDKOZDjSsUngziGDa2aV1QDtOb8eOXw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2014-01-17 23:24       ` Jerry Xinyu Zhao
  2014-01-17 23:38         ` [OpenStack-Infra] " Strainu
  0 siblings, 1 reply; 5+ messages in thread
From: Jerry Xinyu Zhao @ 2014-01-17 23:24 UTC (permalink / raw)
  To: Strainu
  Cc: Jonathan Nieder,
	openstack-infra-ZwoEplunGu0gQVYkTtqAhEB+6BGkLq7r@public.gmane.org,
	git


[-- Attachment #1.1: Type: text/plain, Size: 1686 bytes --]

I think if you hadn't installed the commit hook for generating change ID,
the commit indeed wouldn't have included a change ID, which is necessary
for referencing the change when you submit a patch over it. There is
nothing wrong with the message.  git review tool will install the hook and
add a change ID for you automatically(a new feature of recent git-review
release).



On Fri, Jan 17, 2014 at 1:10 PM, Strainu <strainu10-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:

> 2014/1/17 Jonathan Nieder <jrnieder-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>:
> > Hi,
> >
> > Strainu wrote:
> >
> >> strainu@emily:~/core> git review -f
> >> Creating a git remote called "gerrit" that maps to:
> >>         ssh://strainu-pdwPRaUiG6tP5deQkEKVHGD2FQJk+8+b@public.gmane.org:29418/pywikibot/core.git
> >> Your change was committed before the commit hook was installed.
> >> Amending the commit to add a gerrit change id.
> >>
> >> At this point I ended the transaction, as I was confused by the last
> >> message: I was afraid the ChangeId would have changed, causing the
> >> patch to be attached to another review.
> >>
> >> I think git should not show this message if the change description
> >> already has a change id
> >
> > This message doesn't come from git.  It comes from the git-review
> > tool (in git_review/cmd.py), so cc-ing the authors in case they
> > have thoughts on that.
>
> Thanks for clarifying that. I'll log a bug on launchpad then.
>
> Strainu
>
> _______________________________________________
> OpenStack-Infra mailing list
> OpenStack-Infra-ZwoEplunGu0gQVYkTtqAhEB+6BGkLq7r@public.gmane.org
> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-infra
>

[-- Attachment #1.2: Type: text/html, Size: 2728 bytes --]

[-- Attachment #2: Type: text/plain, Size: 211 bytes --]

_______________________________________________
OpenStack-Infra mailing list
OpenStack-Infra-ZwoEplunGu0gQVYkTtqAhEB+6BGkLq7r@public.gmane.org
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-infra

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [OpenStack-Infra] BUG: [Cosmetic] Commiting a gerrit ChangeId before the commit hook was installed
  2014-01-17 23:24       ` Jerry Xinyu Zhao
@ 2014-01-17 23:38         ` Strainu
  0 siblings, 0 replies; 5+ messages in thread
From: Strainu @ 2014-01-17 23:38 UTC (permalink / raw)
  To: Jerry Xinyu Zhao
  Cc: Jonathan Nieder, openstack-infra@lists.openstack.org, git

Perhaps I haven't been clear enough: the commit already had a change
ID, added manually, so with or without the hook it would have been
attached to the correct review.

In this case, the hook will actually do nothing, making the current
wording of the message confusing IMO. My suggestion was [1] to change
the mesage to "Amending the commit to add a gerrit change id if none
is available." or something similar.

Strainu

[1] https://bugs.launchpad.net/git-review/+bug/1270301

2014/1/18 Jerry Xinyu Zhao <xyzjerry@gmail.com>:
> I think if you hadn't installed the commit hook for generating change ID,
> the commit indeed wouldn't have included a change ID, which is necessary for
> referencing the change when you submit a patch over it. There is nothing
> wrong with the message.  git review tool will install the hook and add a
> change ID for you automatically(a new feature of recent git-review release).
>
>
>
> On Fri, Jan 17, 2014 at 1:10 PM, Strainu <strainu10@gmail.com> wrote:
>>
>> 2014/1/17 Jonathan Nieder <jrnieder@gmail.com>:
>> > Hi,
>> >
>> > Strainu wrote:
>> >
>> >> strainu@emily:~/core> git review -f
>> >> Creating a git remote called "gerrit" that maps to:
>> >>         ssh://strainu@gerrit.wikimedia.org:29418/pywikibot/core.git
>> >> Your change was committed before the commit hook was installed.
>> >> Amending the commit to add a gerrit change id.
>> >>
>> >> At this point I ended the transaction, as I was confused by the last
>> >> message: I was afraid the ChangeId would have changed, causing the
>> >> patch to be attached to another review.
>> >>
>> >> I think git should not show this message if the change description
>> >> already has a change id
>> >
>> > This message doesn't come from git.  It comes from the git-review
>> > tool (in git_review/cmd.py), so cc-ing the authors in case they
>> > have thoughts on that.
>>
>> Thanks for clarifying that. I'll log a bug on launchpad then.
>>
>> Strainu
>>
>> _______________________________________________
>> OpenStack-Infra mailing list
>> OpenStack-Infra@lists.openstack.org
>> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-infra
>
>

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2014-01-17 23:39 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-17 20:23 BUG: [Cosmetic] Commiting a gerrit ChangeId before the commit hook was installed Strainu
2014-01-17 20:41 ` Jonathan Nieder
2014-01-17 21:10   ` Strainu
     [not found]     ` <CAC9meR+78_EvoqHNcuPyDKOZDjSsUngziGDa2aV1QDtOb8eOXw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-01-17 23:24       ` Jerry Xinyu Zhao
2014-01-17 23:38         ` [OpenStack-Infra] " Strainu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).