CODEWITHSUNDEEP
git
Joel
Joel

Reputation: 3477

Find git commits related to a certain part of a file

Case
Quite often I find myself staring at some old code that doesn't look right. It looks like something has been removed (e.g. it has a loop that does nothing of value, or it creates a variable but doesn't use it), or something is just hard to understand the point of. In these cases I would really need to see the history of that section of the file. Not all of the file though, just that section, or function.

Ideal solution
A simple command like

git log books.cpp:10

to find history of line 10 (possibly with surroundings) of file books.cpp is probably too much magic to ask for, but do you have ideas of how to work out that history?

What I have tried
I have tried using blame, and then checking out the commit before the given commit of that line - repeating it until I've seen enough. But that is very tedious work.

Have you felt the need for this feature? Do you have a way of achieving it? Share your experience!

Upvotes: 8

Views: 400

Answers (2)

Peter Farmer
Peter Farmer

Reputation: 9390

Git is very easy to extend. Does something like this achieve what you want?

#!/bin/bash

FILENAME=$1
LINENUMBERS=$2

for hash in `git log --pretty=format:%h ${FILENAME}`
do
    echo "***************** Showing ${FILENAME} at ${hash}"
    git blame -L ${LINENUMBERS} ${hash} ${FILENAME}
done

Put this little script in your path as something like git-linehistory and call it like this:

git linehistory books.cpp 5,15

It will show you what lines 5 to 15 look like at each commit for that file.

Upvotes: 4

CharlesB
CharlesB

Reputation: 90496

  • git blame -L option lets you specify a range of line to output, or even a regexp to match the function you want.
  • You can also specify to blame at a specific commit, then you don't have to checkout the revision before the blame.

So in short you can do successive calls to git blame -L range <commit> <file-name> to browse the history of line by line changes.

Upvotes: 2

Related Questions