On 22 December 2010 18:17, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Jonathan del Strother <jdelstrother@xxxxxxxxx> writes: > >> I was trying to find a particular string in my project this morning. >> 'git grep mystring' suggested that the string didn't exist in my repo, >> but 'git log -Smystring' turned up a single commit that had added it. >> It took me a long time to figure out that in the past, a branch had >> added that string to foo.c, but a second branch deleted foo.c, and the >> two branches were later merged (deleting foo.c and ignoring mystring). > > This is a typical case of the history simplification in action, isn't it? > > "log" will give you one possible and simplest explanation of how the > project came into the current shape. ÂBecause side branches with changes > that were discarded before merging it to the history that lead to the > commit you run "log" from do not contribute anything to the end result, > "log" will not traverse the entire side branch when it sees the merge. I don't follow ... 'log' isn't showing me how the project came into it's current shape. In the test case I posted, for example, it's showing me that 'needle' was added to the repository at some point, but it neglects to mention that it was removed. If 'needle' was added and removed within the duration of a single branch, I could understand "git log -S" never finding 'needle' due to history simplication, but I don't understand how simplification applies here. > > Try your "log" with --full-history, perhaps? Doesn't seem to affect the output in this case. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html