* reflog/show question
@ 2008-04-28 1:59 Geoff Russell
2008-04-28 9:24 ` Jeff King
0 siblings, 1 reply; 11+ messages in thread
From: Geoff Russell @ 2008-04-28 1:59 UTC (permalink / raw)
To: git
git show HEAD@{"3 minutes ago"}
works as I expect, but
git show HEAD@{"3 minutes ago"}:data/node/node.data
gives me a message:
warning: Log for 'HEAD' only goes back to Mon, 28 Apr 2008
10:18:37 +0930.
fatal: ambiguous argument
'HEAD@{3.minutes.ago}:data/node/node.newds1': unknown revision or path
not in the working tree.
Use '--' to separate paths from revisions
However,
git show HEAD@{2}:data/node/node.data
shows me the file as it was 3 minutes ago.
I'm using 1.5.4.rc4
Cheers,
Geoff Russell
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: reflog/show question
2008-04-28 1:59 reflog/show question Geoff Russell
@ 2008-04-28 9:24 ` Jeff King
2008-04-29 1:47 ` Geoff Russell
0 siblings, 1 reply; 11+ messages in thread
From: Jeff King @ 2008-04-28 9:24 UTC (permalink / raw)
To: Geoff Russell; +Cc: git
On Mon, Apr 28, 2008 at 11:29:17AM +0930, Geoff Russell wrote:
> git show HEAD@{"3 minutes ago"}
>
> works as I expect, but
>
> git show HEAD@{"3 minutes ago"}:data/node/node.data
>
> gives me a message:
>
> warning: Log for 'HEAD' only goes back to Mon, 28 Apr 2008
> 10:18:37 +0930.
>
> [...]
> I'm using 1.5.4.rc4
I can't reproduce here, using the current master or v1.5.4-rc4. If I
have a matching reflog, both work. And if I choose a much older time
(say, "1.year.ago"), then both fail. What are the entries in your
reflog (.git/logs/HEAD)?
-Peff
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: reflog/show question
2008-04-28 9:24 ` Jeff King
@ 2008-04-29 1:47 ` Geoff Russell
2008-04-29 20:12 ` Jeff King
0 siblings, 1 reply; 11+ messages in thread
From: Geoff Russell @ 2008-04-29 1:47 UTC (permalink / raw)
To: Jeff King, git
[-- Attachment #1: Type: text/plain, Size: 936 bytes --]
On Mon, Apr 28, 2008 at 6:54 PM, Jeff King <peff@peff.net> wrote:
> On Mon, Apr 28, 2008 at 11:29:17AM +0930, Geoff Russell wrote:
>
> > git show HEAD@{"3 minutes ago"}
> >
> > works as I expect, but
> >
> > git show HEAD@{"3 minutes ago"}:data/node/node.data
> >
> > gives me a message:
> >
> > warning: Log for 'HEAD' only goes back to Mon, 28 Apr 2008
> > 10:18:37 +0930.
> >
> > [...]
>
> > I'm using 1.5.4.rc4
>
> I can't reproduce here, using the current master or v1.5.4-rc4. If I
> have a matching reflog, both work. And if I choose a much older time
> (say, "1.year.ago"), then both fail. What are the entries in your
> reflog (.git/logs/HEAD)?
I think its something to do with the filename and my commit comments.
The command
works as expected on other files. The HEAD file is attached.
Geoff
>
> -Peff
>
--
6 Fifth Ave,
St Morris, S.A. 5068
Australia
Ph: 041 8805 184 / 08 8332 5069
[-- Attachment #2: HEAD --]
[-- Type: application/octet-stream, Size: 3317 bytes --]
0000000000000000000000000000000000000000 73387f4abc3f55ba93f9379d9359c5a03a516a66 MATRICS Software <matrics@faith.localdomain> 1209432646 +0930 commit (initial): createDataset newds1
73387f4abc3f55ba93f9379d9359c5a03a516a66 f13469b805a05cef213e3ca8b030e8314d196acc MATRICS Software <matrics@faith.localdomain> 1209432648 +0930 commit: setProperties
f13469b805a05cef213e3ca8b030e8314d196acc fe61eeaa85c8ec68935224bae99528fdcfc87352 MATRICS Software <matrics@faith.localdomain> 1209432659 +0930 commit: update .matrics.restrict
fe61eeaa85c8ec68935224bae99528fdcfc87352 7b0783a2f99131a1a759d16494f91889fe23e726 MATRICS Software <matrics@faith.localdomain> 1209432662 +0930 commit: new node.db
7b0783a2f99131a1a759d16494f91889fe23e726 2124da80643760e9cb65cbeea1678f6f65f6a603 MATRICS Software <matrics@faith.localdomain> 1209432665 +0930 commit: new node.newds1
2124da80643760e9cb65cbeea1678f6f65f6a603 4167fcad224941322c4a15e813ac4fdd702fa6ff MATRICS Software <matrics@faith.localdomain> 1209432666 +0930 commit: new node.delnewds1
4167fcad224941322c4a15e813ac4fdd702fa6ff b3d1ca03a6ede31ac7f7d4ea264aba6e17ca49bb MATRICS Software <matrics@faith.localdomain> 1209432667 +0930 commit: delf node.delnewds1
b3d1ca03a6ede31ac7f7d4ea264aba6e17ca49bb d6b727f0a54f64511126715d0f328261391ef60a MATRICS Software <matrics@faith.localdomain> 1209432671 +0930 commit: user=geoff,file=node.newds1,program=putf,cwd=/usr/local/AusTop/AuPrograms/AuServer,time=1209432671,sourceds=newds1
d6b727f0a54f64511126715d0f328261391ef60a f9975f6cc061350ab3d1d1b4947a218b0dfb8b23 MATRICS Software <matrics@faith.localdomain> 1209432674 +0930 commit: recvf node.newds1
f9975f6cc061350ab3d1d1b4947a218b0dfb8b23 8bbd74b28dbb0b350e699d661c748084e08edf3e MATRICS Software <matrics@faith.localdomain> 1209432686 +0930 commit: user=geoff,file=node.newds1,program=putf,cwd=/usr/local/AusTop/AuPrograms/AuServer,time=1209432685,sourceds=newds1
8bbd74b28dbb0b350e699d661c748084e08edf3e 1b83468bf234455040a270392992077bd0d07b01 MATRICS Software <matrics@faith.localdomain> 1209432689 +0930 commit: geoff resetting dataset 2124da80643760e9cb65cbeea1678f6f65f6a603
1b83468bf234455040a270392992077bd0d07b01 d2356b1ce02bbcbf24e1e7951f4fa00d5b58d4a0 MATRICS Software <matrics@faith.localdomain> 1209432690 +0930 commit: geoff resetting dataset HEAD@'{1}'
d2356b1ce02bbcbf24e1e7951f4fa00d5b58d4a0 f0265c2bbdefa52cd830bd0e9624eb7d720eed12 MATRICS Software <matrics@faith.localdomain> 1209432692 +0930 commit: copyf node.newds1 node.copynewds1
f0265c2bbdefa52cd830bd0e9624eb7d720eed12 bfe7094f4bd3b3f9ff33950c484b3b44e0d9b5e5 MATRICS Software <matrics@faith.localdomain> 1209432695 +0930 commit: delf node.copynewds1
bfe7094f4bd3b3f9ff33950c484b3b44e0d9b5e5 40c2c72852419f1c2220903ee977ea3e06338926 Geoff Russell <geoffrey.russell@gmail.com> 1209432997 +0930 commit: modify it
40c2c72852419f1c2220903ee977ea3e06338926 69edafd8371ed8613cf87736b69e3184f974cd74 Geoff Russell <geoffrey.russell@gmail.com> 1209433118 +0930 commit: add stuff
69edafd8371ed8613cf87736b69e3184f974cd74 8d4e7aa2303982da5dd1dff60b67e924098323b4 Geoff Russell <geoffrey.russell@gmail.com> 1209433220 +0930 commit: new file: data/node/xxx
8d4e7aa2303982da5dd1dff60b67e924098323b4 efe0f90772d84c808a228c1c785565a34b5b2c82 Geoff Russell <geoffrey.russell@gmail.com> 1209433250 +0930 commit: Okay
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: reflog/show question
2008-04-29 1:47 ` Geoff Russell
@ 2008-04-29 20:12 ` Jeff King
2008-04-29 22:06 ` Geoff Russell
0 siblings, 1 reply; 11+ messages in thread
From: Jeff King @ 2008-04-29 20:12 UTC (permalink / raw)
To: Geoff Russell; +Cc: git
On Tue, Apr 29, 2008 at 11:17:09AM +0930, Geoff Russell wrote:
> > > git show HEAD@{"3 minutes ago"}
> > >
> > > works as I expect, but
> > >
> > > git show HEAD@{"3 minutes ago"}:data/node/node.data
> > >
> > > gives me a message:
> > >
> > > warning: Log for 'HEAD' only goes back to Mon, 28 Apr 2008
> > > 10:18:37 +0930.
> > >
> >
> I think its something to do with the filename and my commit comments.
> The command works as expected on other files. The HEAD file is
> attached.
Hmm. Are you sure that the commit you got from HEAD@{"3 minutes ago"}
actually _has_ the file data/node/node.data? If it doesn't, then you get
the error message you saw. And it may be that the reflog warning happens
in _both_ cases, only you don't see it in the first because it is masked
by the pager. In v1.5.5, that output is now sent to the pager, instead.
-Peff
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: reflog/show question
2008-04-29 20:12 ` Jeff King
@ 2008-04-29 22:06 ` Geoff Russell
2008-04-29 23:07 ` Jeff King
0 siblings, 1 reply; 11+ messages in thread
From: Geoff Russell @ 2008-04-29 22:06 UTC (permalink / raw)
To: Jeff King; +Cc: git
On 4/30/08, Jeff King <peff@peff.net> wrote:
> On Tue, Apr 29, 2008 at 11:17:09AM +0930, Geoff Russell wrote:
>
> > > > git show HEAD@{"3 minutes ago"}
> > > >
> > > > works as I expect, but
> > > >
> > > > git show HEAD@{"3 minutes ago"}:data/node/node.data
> > > >
> > > > gives me a message:
> > > >
> > > > warning: Log for 'HEAD' only goes back to Mon, 28 Apr 2008
> > > > 10:18:37 +0930.
> > > >
> > >
>
> > I think its something to do with the filename and my commit comments.
> > The command works as expected on other files. The HEAD file is
> > attached.
>
>
> Hmm. Are you sure that the commit you got from HEAD@{"3 minutes ago"}
> actually _has_ the file data/node/node.data? If it doesn't, then you get
> the error message you saw. And it may be that the reflog warning happens
> in _both_ cases, only you don't see it in the first because it is masked
> by the pager. In v1.5.5, that output is now sent to the pager, instead.
>
> -Peff
>
Later today (touch wood) I'll prepare as small a test case as
possible, then send
a tar.gz of the .git directory. Okay?
Geoff.
--
6 Fifth Ave,
St Morris, S.A. 5068
Australia
Ph: 041 8805 184 / 08 8332 5069
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: reflog/show question
2008-04-29 22:06 ` Geoff Russell
@ 2008-04-29 23:07 ` Jeff King
2008-04-30 0:12 ` Geoff Russell
0 siblings, 1 reply; 11+ messages in thread
From: Jeff King @ 2008-04-29 23:07 UTC (permalink / raw)
To: Geoff Russell; +Cc: git
On Wed, Apr 30, 2008 at 07:36:23AM +0930, Geoff Russell wrote:
> > Hmm. Are you sure that the commit you got from HEAD@{"3 minutes ago"}
> > actually _has_ the file data/node/node.data? If it doesn't, then you get
>
> Later today (touch wood) I'll prepare as small a test case as
> possible, then send
> a tar.gz of the .git directory. Okay?
That would be great, thanks.
-Peff
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: reflog/show question
2008-04-29 23:07 ` Jeff King
@ 2008-04-30 0:12 ` Geoff Russell
2008-04-30 0:26 ` Geoff Russell
0 siblings, 1 reply; 11+ messages in thread
From: Geoff Russell @ 2008-04-30 0:12 UTC (permalink / raw)
To: Jeff King; +Cc: git
[-- Attachment #1: Type: text/plain, Size: 1345 bytes --]
On Wed, Apr 30, 2008 at 8:37 AM, Jeff King <peff@peff.net> wrote:
> On Wed, Apr 30, 2008 at 07:36:23AM +0930, Geoff Russell wrote:
>
> > > Hmm. Are you sure that the commit you got from HEAD@{"3 minutes ago"}
> > > actually _has_ the file data/node/node.data? If it doesn't, then you get
> >
>
> > Later today (touch wood) I'll prepare as small a test case as
> > possible, then send
> > a tar.gz of the .git directory. Okay?
>
> That would be great, thanks.
Attached is tar.gz of working directory (.) - so unpack in a new directory.
git show HEAD@{"N seconds ago"}:data/node/.gitignore
works fine for values of N back to creationof file
But:
git show HEAD@{"N seconds ago"}:data/node/node.newds1
doesn't work for any values of N.
During my attempts to create this example, I managed created a
directory which where
the show command failed for both files, but when I changed the commit
message, the
show worked for .gitignore but not the node file. Hence my suspicion
of that the slashes
in the path are being interpreted as requesting a commit message match ...?
I hope you can track it down, I will install the latest version of git
later on today to
confirm the behaviour is still happening.
Thanks,
Geoff Russell
>
> -Peff
>
--
6 Fifth Ave,
St Morris, S.A. 5068
Australia
Ph: 041 8805 184 / 08 8332 5069
[-- Attachment #2: gitdemo.tar.gz --]
[-- Type: application/x-gzip, Size: 9309 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: reflog/show question
2008-04-30 0:12 ` Geoff Russell
@ 2008-04-30 0:26 ` Geoff Russell
2008-05-01 0:15 ` Geoff Russell
0 siblings, 1 reply; 11+ messages in thread
From: Geoff Russell @ 2008-04-30 0:26 UTC (permalink / raw)
To: Jeff King; +Cc: git
On Wed, Apr 30, 2008 at 9:42 AM, Geoff Russell
<geoffrey.russell@gmail.com> wrote:
>
> On Wed, Apr 30, 2008 at 8:37 AM, Jeff King <peff@peff.net> wrote:
> > On Wed, Apr 30, 2008 at 07:36:23AM +0930, Geoff Russell wrote:
> >
> > > > Hmm. Are you sure that the commit you got from HEAD@{"3 minutes ago"}
> > > > actually _has_ the file data/node/node.data? If it doesn't, then you get
> > >
> >
> > > Later today (touch wood) I'll prepare as small a test case as
> > > possible, then send
> > > a tar.gz of the .git directory. Okay?
> >
> > That would be great, thanks.
>
> Attached is tar.gz of working directory (.) - so unpack in a new directory.
>
> git show HEAD@{"N seconds ago"}:data/node/.gitignore
>
> works fine for values of N back to creationof file
>
> But:
>
> git show HEAD@{"N seconds ago"}:data/node/node.newds1
>
> doesn't work for any values of N.
>
> During my attempts to create this example, I managed created a
> directory which where
> the show command failed for both files, but when I changed the commit
> message, the
> show worked for .gitignore but not the node file. Hence my suspicion
> of that the slashes
> in the path are being interpreted as requesting a commit message match ...?
>
> I hope you can track it down, I will install the latest version of git
> later on today to
> confirm the behaviour is still happening.
I just confirmed behaviour is still the same in 1.5.5
Geoff.
>
> Thanks,
> Geoff Russell
>
> >
> > -Peff
>
>
> >
>
>
>
> --
> 6 Fifth Ave,
> St Morris, S.A. 5068
> Australia
> Ph: 041 8805 184 / 08 8332 5069
>
--
6 Fifth Ave,
St Morris, S.A. 5068
Australia
Ph: 041 8805 184 / 08 8332 5069
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: reflog/show question
2008-04-30 0:26 ` Geoff Russell
@ 2008-05-01 0:15 ` Geoff Russell
2008-05-01 13:53 ` Jeff King
0 siblings, 1 reply; 11+ messages in thread
From: Geoff Russell @ 2008-05-01 0:15 UTC (permalink / raw)
To: Jeff King; +Cc: git
N.B. This problem has vanished -- which means its probably something I
messed up. I haven't
worked out what yet, but I will. Apologies for any time wasted.
Cheers,
Geoff.
On Wed, Apr 30, 2008 at 9:56 AM, Geoff Russell
<geoffrey.russell@gmail.com> wrote:
>
> On Wed, Apr 30, 2008 at 9:42 AM, Geoff Russell
> <geoffrey.russell@gmail.com> wrote:
> >
> > On Wed, Apr 30, 2008 at 8:37 AM, Jeff King <peff@peff.net> wrote:
> > > On Wed, Apr 30, 2008 at 07:36:23AM +0930, Geoff Russell wrote:
> > >
> > > > > Hmm. Are you sure that the commit you got from HEAD@{"3 minutes ago"}
> > > > > actually _has_ the file data/node/node.data? If it doesn't, then you get
> > > >
> > >
> > > > Later today (touch wood) I'll prepare as small a test case as
> > > > possible, then send
> > > > a tar.gz of the .git directory. Okay?
> > >
> > > That would be great, thanks.
> >
> > Attached is tar.gz of working directory (.) - so unpack in a new directory.
> >
> > git show HEAD@{"N seconds ago"}:data/node/.gitignore
> >
> > works fine for values of N back to creationof file
> >
> > But:
> >
> > git show HEAD@{"N seconds ago"}:data/node/node.newds1
> >
> > doesn't work for any values of N.
> >
> > During my attempts to create this example, I managed created a
> > directory which where
> > the show command failed for both files, but when I changed the commit
> > message, the
> > show worked for .gitignore but not the node file. Hence my suspicion
> > of that the slashes
> > in the path are being interpreted as requesting a commit message match ...?
> >
> > I hope you can track it down, I will install the latest version of git
> > later on today to
> > confirm the behaviour is still happening.
>
> I just confirmed behaviour is still the same in 1.5.5
>
> Geoff.
>
>
>
>
>
> >
> > Thanks,
> > Geoff Russell
> >
> > >
> > > -Peff
> >
> >
> > >
> >
> >
> >
> > --
> > 6 Fifth Ave,
> > St Morris, S.A. 5068
> > Australia
> > Ph: 041 8805 184 / 08 8332 5069
> >
>
>
>
> --
> 6 Fifth Ave,
> St Morris, S.A. 5068
> Australia
> Ph: 041 8805 184 / 08 8332 5069
>
--
6 Fifth Ave,
St Morris, S.A. 5068
Australia
Ph: 041 8805 184 / 08 8332 5069
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: reflog/show question
2008-05-01 0:15 ` Geoff Russell
@ 2008-05-01 13:53 ` Jeff King
2008-05-02 2:21 ` Geoff Russell
0 siblings, 1 reply; 11+ messages in thread
From: Jeff King @ 2008-05-01 13:53 UTC (permalink / raw)
To: Geoff Russell; +Cc: git
On Thu, May 01, 2008 at 09:45:40AM +0930, Geoff Russell wrote:
> N.B. This problem has vanished -- which means its probably something I
> messed up. I haven't worked out what yet, but I will. Apologies for
> any time wasted.
Vanished randomly, or after you upgraded to the latest master? Did you
miss the "fix reflog approxidate parsing bug" patch I posted?
-Peff
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: reflog/show question
2008-05-01 13:53 ` Jeff King
@ 2008-05-02 2:21 ` Geoff Russell
0 siblings, 0 replies; 11+ messages in thread
From: Geoff Russell @ 2008-05-02 2:21 UTC (permalink / raw)
To: Jeff King; +Cc: git
On 5/1/08, Jeff King <peff@peff.net> wrote:
> On Thu, May 01, 2008 at 09:45:40AM +0930, Geoff Russell wrote:
>
> > N.B. This problem has vanished -- which means its probably something I
> > messed up. I haven't worked out what yet, but I will. Apologies for
> > any time wasted.
>
>
> Vanished randomly, or after you upgraded to the latest master? Did you
> miss the "fix reflog approxidate parsing bug" patch I posted?
I did a "git pull origin" and used both 1.5.5.1 and my original
1.5.4-rc4 and couldn't
reproduce the problem. I have just looked at the patch and
it certainly sounds like it is attacking the problem that I was
seeing, but it shouldn't
have affected the 1.5.4-rc4 code.
Thanks
Geoff.
>
> -Peff
>
--
6 Fifth Ave,
St Morris, S.A. 5068
Australia
Ph: 041 8805 184 / 08 8332 5069
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2008-05-02 2:22 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-28 1:59 reflog/show question Geoff Russell
2008-04-28 9:24 ` Jeff King
2008-04-29 1:47 ` Geoff Russell
2008-04-29 20:12 ` Jeff King
2008-04-29 22:06 ` Geoff Russell
2008-04-29 23:07 ` Jeff King
2008-04-30 0:12 ` Geoff Russell
2008-04-30 0:26 ` Geoff Russell
2008-05-01 0:15 ` Geoff Russell
2008-05-01 13:53 ` Jeff King
2008-05-02 2:21 ` Geoff Russell
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).