Skip to content

Commit 621ac24

Browse files
committed
Merge branch 'jk/jump-quickfix-fixes'
A few usability fixes to "git jump" (in contrib/). * jk/jump-quickfix-fixes: git-jump: ignore deleted files in diff mode git-jump: always specify column 1 for diff entries
2 parents fed9298 + 083b825 commit 621ac24

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

contrib/git-jump/git-jump

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ open_editor() {
4444
mode_diff() {
4545
git diff --no-prefix --relative "$@" |
4646
perl -ne '
47-
if (m{^\+\+\+ (.*)}) { $file = $1; next }
47+
if (m{^\+\+\+ (.*)}) { $file = $1 eq "/dev/null" ? undef : $1; next }
4848
defined($file) or next;
4949
if (m/^@@ .*?\+(\d+)/) { $line = $1; next }
5050
defined($line) or next;
5151
if (/^ /) { $line++; next }
5252
if (/^[-+]\s*(.*)/) {
53-
print "$file:$line: $1\n";
53+
print "$file:$line:1: $1\n";
5454
$line = undef;
5555
}
5656
'

0 commit comments

Comments
 (0)