* git log -S doesn't search stash WIPs
@ 2008-02-08 10:46 Jonathan del Strother
2008-02-08 12:18 ` Johannes Schindelin
0 siblings, 1 reply; 3+ messages in thread
From: Jonathan del Strother @ 2008-02-08 10:46 UTC (permalink / raw)
To: Git Mailing List
"git log --all -Sfoo" doesn't find strings introduced in stash WIP
commits, only the stash index. That is, if I do :
$ echo foo >> file
$ git add file
$ echo bar >> file
$ git stash
Saved working directory and index state "WIP on master: 00495fc... initial"
(To restore them type "git stash apply")
HEAD is now at 00495fc... initial
$ git log --all -Sfoo
commit a8834ce80ebdf84e6579280c1fc75cdb7b4ac7c9
Author: Jonathan del Strother <me@here.com>
Date: Fri Feb 8 10:43:44 2008 +0000
index on master: 00495fc... initial
$ git log --all -Sbar
<this space intentionally left blank>
Is this intentional? Am I missing some git-log option that would
allow me to search the stash WIPs?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git log -S doesn't search stash WIPs
2008-02-08 10:46 git log -S doesn't search stash WIPs Jonathan del Strother
@ 2008-02-08 12:18 ` Johannes Schindelin
2008-02-09 15:18 ` Jonathan del Strother
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Schindelin @ 2008-02-08 12:18 UTC (permalink / raw)
To: Jonathan del Strother; +Cc: Git Mailing List
Hi,
On Fri, 8 Feb 2008, Jonathan del Strother wrote:
> "git log --all -Sfoo" doesn't find strings introduced in stash WIP
> commits, only the stash index.
It is a little unfortunate that a stash will do this:
HEAD ------- stash
\ /
index
In other words, the index will be "committed" as a regular commit, but the
working directory will actually be a "merge commit".
So you need to add "--cc" to see the commit.
Further, the stash is not just a branch. The stash is actually a stack of
reflogs. So could you try again, with
$ git log --cc -Sfoo --walk-reflogs stash
?
Hth,
Dscho
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git log -S doesn't search stash WIPs
2008-02-08 12:18 ` Johannes Schindelin
@ 2008-02-09 15:18 ` Jonathan del Strother
0 siblings, 0 replies; 3+ messages in thread
From: Jonathan del Strother @ 2008-02-09 15:18 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Git Mailing List
On Feb 8, 2008 12:18 PM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Hi,
>
> On Fri, 8 Feb 2008, Jonathan del Strother wrote:
>
> > "git log --all -Sfoo" doesn't find strings introduced in stash WIP
> > commits, only the stash index.
>
> It is a little unfortunate that a stash will do this:
>
> HEAD ------- stash
> \ /
> index
>
> In other words, the index will be "committed" as a regular commit, but the
> working directory will actually be a "merge commit".
>
> So you need to add "--cc" to see the commit.
>
> Further, the stash is not just a branch. The stash is actually a stack of
> reflogs. So could you try again, with
>
> $ git log --cc -Sfoo --walk-reflogs stash
Hmmm, I'm a little fuzzy on why --cc helps, though it looks like
either or both of --cc and --walk-reflogs will do the trick.
Thanks for the help
Jon
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-02-09 15:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-08 10:46 git log -S doesn't search stash WIPs Jonathan del Strother
2008-02-08 12:18 ` Johannes Schindelin
2008-02-09 15:18 ` Jonathan del Strother
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).