Is there a way of having git show lines added, lines changed and lines removed?

Question

"git diff --stat" and "git log --stat" show output like:

$ git diff -C --stat HEAD c9af3e6136e8aec1f79368c2a6164e56bf7a7e07
 app/controllers/application_controller.rb |   34 +++-------------------------
 1 files changed, 4 insertions(+), 30 deletions(-)

But what really happened in that commit was that 4 lines were changed and 26 lines were deleted which is different than adding 4 lines and deleting 30.

Is there any way of getting the delta LOCs (26 in this case)? I don't really care about differentiating between lines added or removed.

Answer 1

You can use:

git diff --numstat

to get numerical diff information.

As far as separating modification from an add and remove pair, --word-diff might help. You could try something like this:

MOD_PATTERN='^.+(\[-|\{\+).*$' \
ADD_PATTERN='^\{\+.*\+\}$' \
REM_PATTERN='^\[-.*-\]$' \
git diff --word-diff --unified=0 | sed -nr \
    -e "s/$MOD_PATTERN/modified/p" \
    -e "s/$ADD_PATTERN/added/p" \
    -e "s/$REM_PATTERN/removed/p" \
    | sort | uniq -c

It's a little long-winded so you may want to parse it in your own script instead.

Answer 2

1. If you want to know the lines added/changed/deleted by a commit with id commit-id, you could use

   git show commit-id --stat
   

   or

   git diff commit-id-before commit-id --stat
   

2. If you wat to know the lines added/changed/deleted by a range commits, you could use

   git diff commit-id1 commit-id2 --stat
   

3. If you want to know the lines added/changed/deleted by each commit, you could use

   git log --stat