Git: Show all of the various changes to a single line in a specified file over the entire git history

Question

I\'ve looked around, and am not sure if this is possible, but here goes:

I have a (javascript) file (say /lib/client.js) in which I have a unique identifier assigned

Answer 1

Since git 1.8.4, there is a more direct way to answer your question.

Assuming that line 110 is the line saying var identifier = "SOME_IDENTIFIER";, then do this:

git log -L110,110:/lib/client.js

This will return every commit which touched that line of code.

[Git Documentation (see the "-L" command line paramenter)]

Answer 2

In magit, you can do this with

l, =L

It will then ask you for file and start,end lines.

Answer 3

If you adapt @rob's answer just a bit, git log will basically do this for you, if all you need is a visual comparison:

git log -U0 -S "var identifier =" path/to/file

-U0 means output in patch mode (-p), and show zero lines of context around the patch.

You can even do this across branches:

git log -U0 -S "var identifier =" branchname1 branchname2 -- path/to/file

There may be a way to suppress the diff header, but I don't know of one.

Answer 4

See the man page for git-log and gitdiffcore. I believe this command would do it, but it might not be quite right:

git log -G "var identifier =" file.js

---

EDIT: Here's a rough start for a bash script to show the actual lines. This might be more what you're looking for.

for c in $(git log -G "something" --format=%H -- file.js); do
    git --no-pager grep -e "something" $c -- file.js
done

It uses git log -G to find the interesting commits, using --format=%H to produce a list of commit hashes. It then iterates over each interesting commit, asking git grep to show the lines from that commit and file that contain the regex, prefaced with the commit hash.

---

EDIT: Changed to use -G instead of -S as suggested in comments.

Answer 5

You can also do this with gitk:

gitk file.js

In the "commit" drop down, choose "adding/removing string:" and in the text box next to it, enter "var identifier =", and any commits that add or remove lines that contain that string will be highlighted.