diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-23 10:35:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-23 10:35:08 -0700 |
| commit | 621ac241be8d7898bf05a3f8dfac3222f7899a70 (patch) | |
| tree | db99294832b7a1235403e37df68d9fad84a6efaf | |
| parent | Merge branch 'ak/typofixes' (diff) | |
| parent | git-jump: ignore deleted files in diff mode (diff) | |
| download | git-621ac241be8d7898bf05a3f8dfac3222f7899a70.tar.gz git-621ac241be8d7898bf05a3f8dfac3222f7899a70.zip | |
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
| -rwxr-xr-x | contrib/git-jump/git-jump | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump index 47e0c557e6..3f69675961 100755 --- a/contrib/git-jump/git-jump +++ b/contrib/git-jump/git-jump @@ -44,13 +44,13 @@ open_editor() { mode_diff() { git diff --no-prefix --relative "$@" | perl -ne ' - if (m{^\+\+\+ (.*)}) { $file = $1; next } + if (m{^\+\+\+ (.*)}) { $file = $1 eq "/dev/null" ? undef : $1; next } defined($file) or next; if (m/^@@ .*?\+(\d+)/) { $line = $1; next } defined($line) or next; if (/^ /) { $line++; next } if (/^[-+]\s*(.*)/) { - print "$file:$line: $1\n"; + print "$file:$line:1: $1\n"; $line = undef; } ' |