Skip to content

Add support for passing options and specify filenames #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add support for passing options and specify filenames #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfce377
Add support for passing options and specify filenames
Nov 12, 2021
56d8e9e
Fix "Use of uninitialized" warning
Dec 8, 2020
1876951
Let "git-diff-blame 1234 1234" behave like "git-diff-blame 1234^ 1234"
Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

Annotates each line in a diff hunk with author and commit information like blame.

## Usage

```shell
git diff-blame [oldrev [newrev [options] [-- [file1] [file2] [file3] ...]]]
```

There is support for passing on options to `git diff` but they must be given
after `oldrev` and `newrev` if they are present. E.g.

```shell
git diff-blame HEAD^ HEAD -w
git diff-blame --cached -- myfile.c
```

## Example:

$ git diff-blame HEAD^
Expand Down
51 changes: 44 additions & 7 deletions git-diff-blame
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
# binary, for any purpose, commercial or non-commercial, and by any
# means.

use List::Util qw(first);

sub parse_hunk_header {
my ($line) = @_;
my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
Expand All @@ -18,6 +20,7 @@ sub parse_hunk_header {

sub get_blame_prefix {
my ($line) = @_;
return "" if not $line;
$line =~ /^(\^?[0-9a-f]+\s+(\S+\s+)?\([^\)]+\))/ or die "bad blame output: $line";
return $1;
}
Expand All @@ -27,12 +30,41 @@ $git_root =~ s/^\s+//;
$git_root =~ s/\s+$//;
chdir($git_root) or die "$!";

my ($oldrev, $newrev) = @ARGV;
$oldrev ||= 'HEAD';
if ($newrev) {
open($diff, '-|', 'git', '--no-pager', 'diff', $oldrev, $newrev) or die;
my ($oldrev, $newrev, @REST);

# First check if file arguments are present.
my $index = first { $ARGV[$_] eq '--' } 0..$#ARGV;
if (defined $index) {
($oldrev, $newrev) = @ARGV[0 .. $index-1];
@REST = @ARGV[$index .. $#ARGV];
} else {
($oldrev, $newrev, @REST) = @ARGV;
}

# Then check if any of the revisons accidentally were assigned git diff option values.
if (defined $newrev && $newrev =~ /^-/) {
unshift(@REST, $newrev);
$newrev = undef;
}

if (defined $oldrev && $oldrev =~ /^-/) {
unshift(@REST, $oldrev);
$oldrev = undef;
}

# 123abc 123abc --> 123abc^ 123abc
if (defined $oldrev && defined $newrev && $oldrev eq $newrev) {
$oldrev = $oldrev . "^";
}

if (defined $oldrev) {
if (defined $newrev) {
open($diff, '-|', 'git', '--no-pager', 'diff', $oldrev, $newrev, @REST) or die;
} else {
open($diff, '-|', 'git', '--no-pager', 'diff', $oldrev, @REST) or die;
}
} else {
open($diff, '-|', 'git', '--no-pager', 'diff', $oldrev) or die;
open($diff, '-|', 'git', '--no-pager', 'diff', @REST) or die;
}

my ($pre, $post);
Expand Down Expand Up @@ -63,8 +95,13 @@ while (<$diff>) {
my $o_end = $o_ofs + $o_cnt - 1;
my $n_end = $n_ofs + $n_cnt - 1;
if (!$create) {
open($pre, '-|', 'git', 'blame', '-M', "-L$o_ofs,$o_end",
$oldrev, '--', $prefilename) or die;
if ($oldrev) {
open($pre, '-|', 'git', 'blame', '-M', "-L$o_ofs,$o_end",
$oldrev, '--', $prefilename) or die;
} else {
open($pre, '-|', 'git', 'blame', '-M', "-L$o_ofs,$o_end",
'HEAD', '--', $prefilename) or die;
}
}
if (!$delete) {
if ($newrev) {
Expand Down