All of lore.kernel.org
 help / color / mirror / Atom feed
* Errors pushing tags in "next"
@ 2007-03-23  2:03 Luben Tuikov
  2007-03-23  2:48 ` Junio C Hamano
  0 siblings, 1 reply; 12+ messages in thread
From: Luben Tuikov @ 2007-03-23  2:03 UTC (permalink / raw)
  To: git

Is this of any concern?

### Pushing version 'v2.6.21-rc4' to the masses
fatal: ambiguous argument 'v2.6.21-rc3-329..bac6eefe96204d0ad67d144f2511a6fc487aa594': unknown
revision or path not in the working tree.
Use '--' to separate paths from revisions
fatal: ambiguous argument 'v2.6.21-rc3-329..bac6eefe96204d0ad67d144f2511a6fc487aa594': unknown
revision or path not in the working tree.
Use '--' to separate paths from revisions
refs/tags/v2.6.21-rc4: 0000000000000000000000000000000000000000 ->
bac6eefe96204d0ad67d144f2511a6fc487aa594

Thanks,
   Luben

P.S.
git --version
git version 1.5.1.rc1.901.gb7f2

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

* Re: Errors pushing tags in "next"
  2007-03-23  2:03 Errors pushing tags in "next" Luben Tuikov
@ 2007-03-23  2:48 ` Junio C Hamano
  2007-03-23  3:35   ` Luben Tuikov
  0 siblings, 1 reply; 12+ messages in thread
From: Junio C Hamano @ 2007-03-23  2:48 UTC (permalink / raw)
  To: ltuikov; +Cc: git

Luben Tuikov <ltuikov@yahoo.com> writes:

> Is this of any concern?

Sorry, I cannot tell without a command line.

> ### Pushing version 'v2.6.21-rc4' to the masses
> fatal: ambiguous argument 'v2.6.21-rc3-329..bac6eefe96204d0ad67d144f2511a6fc487aa594': unknown
> revision or path not in the working tree.
> Use '--' to separate paths from revisions
> fatal: ambiguous argument 'v2.6.21-rc3-329..bac6eefe96204d0ad67d144f2511a6fc487aa594': unknown
> revision or path not in the working tree.
> Use '--' to separate paths from revisions
> refs/tags/v2.6.21-rc4: 0000000000000000000000000000000000000000 ->
> bac6eefe96204d0ad67d144f2511a6fc487aa594
>
> Thanks,
>    Luben
>
> P.S.
> git --version
> git version 1.5.1.rc1.901.gb7f2

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

* Re: Errors pushing tags in "next"
  2007-03-23  2:48 ` Junio C Hamano
@ 2007-03-23  3:35   ` Luben Tuikov
  2007-03-23  4:18     ` Junio C Hamano
  0 siblings, 1 reply; 12+ messages in thread
From: Luben Tuikov @ 2007-03-23  3:35 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

--- Junio C Hamano <junkio@cox.net> wrote:

> Luben Tuikov <ltuikov@yahoo.com> writes:
> 
> > Is this of any concern?
> 
> Sorry, I cannot tell without a command line.

Sorry, I didn't include that.  It is:

git-push --tags web

   Luben


> 
> > ### Pushing version 'v2.6.21-rc4' to the masses
> > fatal: ambiguous argument 'v2.6.21-rc3-329..bac6eefe96204d0ad67d144f2511a6fc487aa594': unknown
> > revision or path not in the working tree.
> > Use '--' to separate paths from revisions
> > fatal: ambiguous argument 'v2.6.21-rc3-329..bac6eefe96204d0ad67d144f2511a6fc487aa594': unknown
> > revision or path not in the working tree.
> > Use '--' to separate paths from revisions
> > refs/tags/v2.6.21-rc4: 0000000000000000000000000000000000000000 ->
> > bac6eefe96204d0ad67d144f2511a6fc487aa594
> >
> > Thanks,
> >    Luben
> >
> > P.S.
> > git --version
> > git version 1.5.1.rc1.901.gb7f2
> 
> 

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

* Re: Errors pushing tags in "next"
  2007-03-23  3:35   ` Luben Tuikov
@ 2007-03-23  4:18     ` Junio C Hamano
  2007-03-23  7:44       ` Luben Tuikov
  0 siblings, 1 reply; 12+ messages in thread
From: Junio C Hamano @ 2007-03-23  4:18 UTC (permalink / raw)
  To: ltuikov; +Cc: git

Luben Tuikov <ltuikov@yahoo.com> writes:

> --- Junio C Hamano <junkio@cox.net> wrote:
>
>> Luben Tuikov <ltuikov@yahoo.com> writes:
>> 
>> > Is this of any concern?
>> 
>> Sorry, I cannot tell without a command line.
>
> Sorry, I didn't include that.  It is:
>
> git-push --tags web
>
>    Luben
>> 
>> > ### Pushing version 'v2.6.21-rc4' to the masses
>> > fatal: ambiguous argument 'v2.6.21-rc3-329..bac6eefe96204d0ad67d144f2511a6fc487aa594': unknown
>> > revision or path not in the working tree.
>> > Use '--' to separate paths from revisions
>> > fatal: ambiguous argument 'v2.6.21-rc3-329..bac6eefe96204d0ad67d144f2511a6fc487aa594': unknown

Well, *I* don't say '### Pushing version blah to the masses', so
it's hard to diagnose from this output.  Is it coming from some
of your own script (perhaps update hook on the receiving end)?

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

* Re: Errors pushing tags in "next"
  2007-03-23  4:18     ` Junio C Hamano
@ 2007-03-23  7:44       ` Luben Tuikov
  2007-03-23  8:16         ` Junio C Hamano
  0 siblings, 1 reply; 12+ messages in thread
From: Luben Tuikov @ 2007-03-23  7:44 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

--- Junio C Hamano <junkio@cox.net> wrote:
> Luben Tuikov <ltuikov@yahoo.com> writes:
> 
> > --- Junio C Hamano <junkio@cox.net> wrote:
> >
> >> Luben Tuikov <ltuikov@yahoo.com> writes:
> >> 
> >> > Is this of any concern?
> >> 
> >> Sorry, I cannot tell without a command line.
> >
> > Sorry, I didn't include that.  It is:
> >
> > git-push --tags web
> >
> >    Luben
> >> 
> >> > ### Pushing version 'v2.6.21-rc4' to the masses
> >> > fatal: ambiguous argument 'v2.6.21-rc3-329..bac6eefe96204d0ad67d144f2511a6fc487aa594':
> unknown
> >> > revision or path not in the working tree.
> >> > Use '--' to separate paths from revisions
> >> > fatal: ambiguous argument 'v2.6.21-rc3-329..bac6eefe96204d0ad67d144f2511a6fc487aa594':
> unknown
> 
> Well, *I* don't say '### Pushing version blah to the masses', so
> it's hard to diagnose from this output.  Is it coming from some
> of your own script (perhaps update hook on the receiving end)?

No, I don't have a script hooked onto git-push.

BTW, git has always said to me "Pushing version ... to the masses"
whenever I'd do "git-push --tags web".

On the receiving end, I've only the standard git hooks enabled.
In fact only "post-update" is enabled.

   Luben


    Luben

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

* Re: Errors pushing tags in "next"
  2007-03-23  7:44       ` Luben Tuikov
@ 2007-03-23  8:16         ` Junio C Hamano
  2007-03-23  9:02           ` Marco Roeland
  2007-03-23  9:13           ` Andy Parkins
  0 siblings, 2 replies; 12+ messages in thread
From: Junio C Hamano @ 2007-03-23  8:16 UTC (permalink / raw)
  To: ltuikov; +Cc: git

Luben Tuikov <ltuikov@yahoo.com> writes:

> BTW, git has always said to me "Pushing version ... to the masses"
> whenever I'd do "git-push --tags web".

Sorry, I must be blind, and git-grep is too.

$ git grep -e 'to the masses' -e 'Pushing v'

returns absolutely empty.

Puzzled...

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

* Re: Errors pushing tags in "next"
  2007-03-23  8:16         ` Junio C Hamano
@ 2007-03-23  9:02           ` Marco Roeland
  2007-03-23  9:17             ` Junio C Hamano
  2007-03-23  9:19             ` Luben Tuikov
  2007-03-23  9:13           ` Andy Parkins
  1 sibling, 2 replies; 12+ messages in thread
From: Marco Roeland @ 2007-03-23  9:02 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: ltuikov, git

On Friday March 23rd 2007 at 01:16 Junio C Hamano wrote:

> Luben Tuikov <ltuikov@yahoo.com> writes:
> 
> > BTW, git has always said to me "Pushing version ... to the masses"
> > whenever I'd do "git-push --tags web".
> 
> Sorry, I must be blind, and git-grep is too.
> 
> $ git grep -e 'to the masses' -e 'Pushing v'
> 
> returns absolutely empty.

The line comes from an older version of templates/hooks--update. The
line was removed in commit 829a686f1b50ba96cac2d88494fa339efe0c0862 .

So Luben does seem to have a hook installed, perhaps this is the
culprit.
-- 
Marco Roeland

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

* Re: Errors pushing tags in "next"
  2007-03-23  8:16         ` Junio C Hamano
  2007-03-23  9:02           ` Marco Roeland
@ 2007-03-23  9:13           ` Andy Parkins
  2007-03-23  9:38             ` Luben Tuikov
  1 sibling, 1 reply; 12+ messages in thread
From: Andy Parkins @ 2007-03-23  9:13 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano, ltuikov

On Friday 2007 March 23 08:16, Junio C Hamano wrote:

> $ git grep -e 'to the masses' -e 'Pushing v'
>
> returns absolutely empty.

As Doc Brown once said: "That's because you're not thinking four 
dimensionally" ;-)

 git-show v1.4.4:templates/hooks--update | grep masses

Luben: that message is being generated by the remote version of git rather 
than your local version.  It doesn't matter that /you/ don't have any hook 
scripts enabled, what matters is that the remote repository has them enabled.  
In particular the hooks/update script has been enabled.

The output you show is from the update hook from an older version of git, but 
the git you're running on the remote end is a newer version.  The hook 
scripts don't get updated when you upgrade git because they're copied to the 
repository from the latest template when you clone or init.

Now: onto the fault; this same fault was fixed in the sample hook in revision 
a2ee81bb7594b; the problem is that the older update hook used to split the 
output of git-describe on the last dash and made the assumption that 
everything before the dash was a tag name.  git-describe gained a nice new 
feature were it would show the number of revisions since that tag as well.  
So now the output of git-describe is

  tag-N-revision

So you can see that splitting on the last dash would return "tag-N" rather 
than "tag".  Now, when the update hook uses this "tag-N" as if it were a tag, 
git obviously doesn't find it, so you're fatal error is coming from running 
something like:

 git-rev-list v2.6.21-rc3-329..bac6eefe96204d0ad67d144f2511a6fc487aa594

becuase "v2.6.21-rc3-329" is not a tag.

The fix:  My own suggestion would be to just swap the update hook on the 
server for the one that came with the latest version of git (although I'm 
completely biased :-)).  Remember to do this on the remote repository, not 
your local one.  Alternatively you could fix just that bug in the hook script 
you have to leave things as close as possible to what you've got now, by 
editing .git/hooks/update and making this change:

-  prev=$(git describe "$3^" | sed 's/-g.*//')
+  prev=$(git describe --abbrev=0 "$3^")

Alternatively; I've got a further update to the notification email script 
prepared that I'm finishing testing and will send today that updates to use 
the post-receive hook rather than the update hook and fixes a number of bugs.


Andy
-- 
Dr Andy Parkins, M Eng (hons), MIET
andyparkins@gmail.com

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

* Re: Errors pushing tags in "next"
  2007-03-23  9:02           ` Marco Roeland
@ 2007-03-23  9:17             ` Junio C Hamano
  2007-03-23  9:43               ` Luben Tuikov
  2007-03-23  9:19             ` Luben Tuikov
  1 sibling, 1 reply; 12+ messages in thread
From: Junio C Hamano @ 2007-03-23  9:17 UTC (permalink / raw)
  To: Marco Roeland; +Cc: ltuikov, git

Marco Roeland <marco.roeland@xs4all.nl> writes:

>> Luben Tuikov <ltuikov@yahoo.com> writes:
>> 
>> > BTW, git has always said to me "Pushing version ... to the masses"
>> > whenever I'd do "git-push --tags web".
>> 
>> Sorry, I must be blind, and git-grep is too.
>> 
>> $ git grep -e 'to the masses' -e 'Pushing v'
>> 
>> returns absolutely empty.
>
> The line comes from an older version of templates/hooks--update. The
> line was removed in commit 829a686f1b50ba96cac2d88494fa339efe0c0862 .
>
> So Luben does seem to have a hook installed, perhaps this is the
> culprit.

Thanks for spotting this.  I do not use this hook (well, I only
use commit-msg, pre-commit, and pre-rebase patches) and it was
totally outside of my radar.

It runs describe to find the previous tag, but the parser is a
bit old fashioned.  It says:

	prev=$(git describe "$3^" | sed 's/-g.*//')

but modern way to say the same is:

	prev=$(git describe --abbrev=0 "$3^")

Luben, sorry for the trouble.

I do not know how much better the recent hooks--update is
compared to the version you use.  It is supposed to be backward
compatible, so you _might_ want to simply update it with the one
from 'master' after checking if it suits your needs.  Otherwise,
I think the above one-liner should work the problem around.

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

* Re: Errors pushing tags in "next"
  2007-03-23  9:02           ` Marco Roeland
  2007-03-23  9:17             ` Junio C Hamano
@ 2007-03-23  9:19             ` Luben Tuikov
  1 sibling, 0 replies; 12+ messages in thread
From: Luben Tuikov @ 2007-03-23  9:19 UTC (permalink / raw)
  To: Marco Roeland, Junio C Hamano; +Cc: git

--- Marco Roeland <marco.roeland@xs4all.nl> wrote:
> On Friday March 23rd 2007 at 01:16 Junio C Hamano wrote:
> 
> > Luben Tuikov <ltuikov@yahoo.com> writes:
> > 
> > > BTW, git has always said to me "Pushing version ... to the masses"
> > > whenever I'd do "git-push --tags web".
> > 
> > Sorry, I must be blind, and git-grep is too.
> > 
> > $ git grep -e 'to the masses' -e 'Pushing v'
> > 
> > returns absolutely empty.
> 
> The line comes from an older version of templates/hooks--update. The
> line was removed in commit 829a686f1b50ba96cac2d88494fa339efe0c0862 .
> 
> So Luben does seem to have a hook installed, perhaps this is the
> culprit.

I see.

I double checked and I do have "update" and "post-update" hooks
enabled.  I don't think that it is "post-update" and this leaves
"update" to be the problem (which is from an ancient git version
when the repo was created...).

I'll update the "update" hook from a recent git version and
will see if I get the same warning message.  Hopefully not.

Thanks,
   Luben

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

* Re: Errors pushing tags in "next"
  2007-03-23  9:13           ` Andy Parkins
@ 2007-03-23  9:38             ` Luben Tuikov
  0 siblings, 0 replies; 12+ messages in thread
From: Luben Tuikov @ 2007-03-23  9:38 UTC (permalink / raw)
  To: Andy Parkins, git; +Cc: Junio C Hamano

--- Andy Parkins <andyparkins@gmail.com> wrote:
> The output you show is from the update hook from an older version of git, but 
> the git you're running on the remote end is a newer version.  The hook 
> scripts don't get updated when you upgrade git because they're copied to the 
> repository from the latest template when you clone or init.

Yeah, most of my git repos, especially the web exported ones are
truly of an ancient git...

> The fix:  My own suggestion would be to just swap the update hook on the 
> server for the one that came with the latest version of git (although I'm 
> completely biased :-)).  Remember to do this on the remote repository, not 
> your local one.

Yeah, I'll cp(1) the most recent "update" hook I got in "next" to the
ancient web exported repos I own...

> Alternatively; I've got a further update to the notification email script 
> prepared that I'm finishing testing and will send today that updates to use 
> the post-receive hook rather than the update hook and fixes a number of bugs.

Ok, sounds good.

Thanks,
   Luben

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

* Re: Errors pushing tags in "next"
  2007-03-23  9:17             ` Junio C Hamano
@ 2007-03-23  9:43               ` Luben Tuikov
  0 siblings, 0 replies; 12+ messages in thread
From: Luben Tuikov @ 2007-03-23  9:43 UTC (permalink / raw)
  To: Junio C Hamano, Marco Roeland; +Cc: git

--- Junio C Hamano <junkio@cox.net> wrote:
> > So Luben does seem to have a hook installed, perhaps this is the
> > culprit.
> 
> Thanks for spotting this.  I do not use this hook (well, I only
> use commit-msg, pre-commit, and pre-rebase patches) and it was
> totally outside of my radar.
> 
> It runs describe to find the previous tag, but the parser is a
> bit old fashioned.  It says:
> 
> 	prev=$(git describe "$3^" | sed 's/-g.*//')
> 
> but modern way to say the same is:
> 
> 	prev=$(git describe --abbrev=0 "$3^")
> 
> Luben, sorry for the trouble.
> 
> I do not know how much better the recent hooks--update is
> compared to the version you use.  It is supposed to be backward
> compatible, so you _might_ want to simply update it with the one
> from 'master' after checking if it suits your needs.  Otherwise,
> I think the above one-liner should work the problem around.

Yeah, that's what Andy suggested too.

I guess the problem is that my git repos, especially the web
exported ones are truly of an ancient git...

I'll just update the "update" hook from the most recent "next"
I've got and see if I get this again.

Thanks,
   Luben

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

end of thread, other threads:[~2007-03-23  9:43 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-03-23  2:03 Errors pushing tags in "next" Luben Tuikov
2007-03-23  2:48 ` Junio C Hamano
2007-03-23  3:35   ` Luben Tuikov
2007-03-23  4:18     ` Junio C Hamano
2007-03-23  7:44       ` Luben Tuikov
2007-03-23  8:16         ` Junio C Hamano
2007-03-23  9:02           ` Marco Roeland
2007-03-23  9:17             ` Junio C Hamano
2007-03-23  9:43               ` Luben Tuikov
2007-03-23  9:19             ` Luben Tuikov
2007-03-23  9:13           ` Andy Parkins
2007-03-23  9:38             ` Luben Tuikov

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.