git log -S not finding all commits?

Hi,

I did:

$ git version git version 1.6.4.4 $ mkdir a && cd a && git init $ echo "Free data" > a $ git add a $ git commit -m1 $ echo "Free data allocated by other function" > a $ git commit -a -m2 $ PAGER=cat git log -S'Free' --oneline 2f34241 1

I would expect "git log" to show both 1 and 2 commit, but it prints only 1.

Is it the correct behavior?

On 10/08/2009 10:21 AM, Daniel wrote:

Yes, it's the correct behaviour. -S finds only lines where what you search for was added or deleted. It counts the number of occurrences of what you specify in each resulting tree and only shows the commits where that number changed. In your case, searching for "Free data " would have printed both commits, since you first introduce that entire string and then remove it.

Andreas Ericsson <ae@op5.se> wrote:

Thanks. However, your suggestion doesn't work. It prints only commit 2. Maybe you meant:

$ PAGER=cat git log --pickaxe-regex -S'Free data$' --oneline

but that doesn't solve my problem. I want to find all commits which changed lines containing "Free data" (the example I posted is simplified).

Seems I have to use "git log -p" and search its output using pager...

Daniel <mjucde@o2.pl> writes:

Search the ML's archives, this is a FAQ. People have proposed an option to allow log -S to actually search the diff (much slower, but sometimes what you really want), but AFAIK, no one wrote the code. But I think someone posted a small perl script along the lines of

git log -p --format="%s\n%x00"  | perl -0 -ne 'print if(/whatever-you-search/);'

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

git log -p -z is better than my --format= indeed.

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote:

Thanks, it's practically what I was looking for.

Daniel <mjucde@o2.pl> writes:

http://git.or.cz/gitwiki/GitFaq#A.22gitlog-S.22doesnotshowallcommits

Feel free to improve.

Matthieu> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

That "if" is noisier than it needs to be:

  perl -0 -ne 'print if /this/'

suffices.

merlyn@stonehenge.com (Randal L. Schwartz) writes:

Thanks,

Also, this seems to actually print the \0 character. Perhaps a perl guru can give a simple solution to replace the \0 by a \n?

On Fri, Oct 09, 2009 at 10:55:38AM +0200, Matthieu Moy wrote:

If you want some indication that there is a null character:

  perl -0 -ne '/this/ or next; s/\0/{NULL}/g; print'

otherwise:

  perl -0 -ne '/this/ or next; s/\0/\n/g; print'

Scott

Matthieu> merlyn@stonehenge.com (Randal L. Schwartz) writes:

Matthieu> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

Matthieu> Also, this seems to actually print the \0 character. Perhaps a perl Matthieu> guru can give a simple solution to replace the \0 by a \n?

Just a matter of one more switch.  Sorry for forgetting it earlier.

  .. | perl -ln0e 'print if /this/'

print "Just another Perl hacker,"; # the original

merlyn@stonehenge.com (Randal L. Schwartz) writes:

Ah, good. I would have done this with 3 lines of code, glad to see a solution with a single more character ;-).

Just updated the FAQ.

Matthieu> merlyn@stonehenge.com (Randal L. Schwartz) writes:

Matthieu> Ah, good. I would have done this with 3 lines of code, glad to see a Matthieu> solution with a single more character ;-).

Matthieu> Just updated the FAQ.

And I found that in "perldoc perlrun", because I couldn't remember either. :)

On Fri, Oct 09, 2009 at 07:07:02AM -0700, Randal L. Schwartz wrote:

And I thought mine was a pretty tidy response... You *are* Japh.

Scott

Quoting Daniel <mjucde@o2.pl>

Junio described how various features in git were invented to realize the goal of "Linus's ultimate content tracking" in his blog http://gitster.livejournal.com/35628.html (and he extended on the article in a chapter in his book that was published in Japan last month).

The "pickaxe" search is one of such components. It is meant to be given the block of lines you are interested in the newer version and used to find the commit that changes anything in the given block of lines. For details, see his blog article (item no. 3) at the above URL (and other items as well, if you are interested in learning the history of other notable features).