Skip to contentSkip to conversation

git jump: support show

PATCH In review Geoffrey Thomas 3 participants 3 messages Aug 14, 2024 – Aug 15, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 git jump: support show

This makes it easy to go to the changes in the latest commit, or a previous named commit, to fix a bug and commit a fixup, to respond to code review feedback, etc.

---
 contrib/git-jump/git-jump | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
contrib/git-jump/git-jump +12 -2
index 47e0c557e6..6cf16e0f32 100755
@@ -41,8 +41,10 @@ open_editor() {
 	esac
 }
 
-mode_diff() {
-	git diff --no-prefix --relative "$@" |
+do_diff() {
+	cmd=$1
+	shift
+	git "$cmd" --no-prefix --relative "$@" |
 	perl -ne '
 	if (m{^\+\+\+ (.*)}) { $file = $1; next }
 	defined($file) or next;
@@ -56,6 +58,14 @@ mode_diff() {
 	'
 }
 
+mode_diff() {
+	do_diff diff "$@"
+}
+
+mode_show() {
+	do_diff show "$@"
+}
+
 mode_merge() {
 	git ls-files -u "$@" |
 	perl -pe 's/^.*?\t//' |

base-commit: 25673b1c476756ec0587fb0596ab3c22b96dc52a

Signature · 1 line
2.39.3 (Apple Git-145)
#1 lore raw
Quoted 18 lines · Geoffrey Thomas

This makes it easy to go to the changes in the latest commit, or a previous named commit, to fix a bug and commit a fixup, to respond to code review feedback, etc.

---

contrib/git-jump/git-jump +4 -2
@@ -41,8 +41,10 @@ open_editor() {
-mode_diff() {
-       git diff --no-prefix --relative "$@" |
+do_diff() {
+       cmd=$1
+       shift
+       git "$cmd" --no-prefix --relative "$@" |
        perl -ne '
        if (m{^\+\+\+ (.*)}) { $file = $1; next }
        defined($file) or next;

contrib/git-jump/git-jump mode_diff() { · line 65

Quoted 8 lines
contrib/git-jump/git-jump +8 -0
@@ -56,6 +58,14 @@ mode_diff() {
+mode_diff() {
+       do_diff diff "$@"
+}
+
+mode_show() {
+       do_diff show "$@"
+}
+

I'm not a git-jump user (indeed, I've never even looked at it), but should this change be accompanied by corresponding updates to the documentation in the README and usage statement emitted by the usage() function in git-jump script?

#2 lore raw
In reply to Geoffrey Thomas
Quoted 3 lines · Geoffrey Thomas

This makes it easy to go to the changes in the latest commit, or a previous named commit, to fix a bug and commit a fixup, to respond to code review feedback, etc.

One trouble with this approach is that you're analyzing a diff whose endpoint is something other than the current working tree. So the line numbers in the diff do not necessarily correspond to what you're going to open in the editor.

For something like the changes in the latest commit, I'd usually do "git jump diff HEAD^", which I think is strictly better than a "show" on the latest commit.

For looking at older commits that doesn't work, though. And if they're not _too_ old, then you've got a reasonable chance of ending up somewhere useful. So I'm not opposed to this patch. As Eric mentioned, we'd probably want an update to the README. And I think it should mention the caveat that the post-image of the diff you're viewing won't necessarily match the working tree.

-Peff