Merge branch 'jk/jump-merge-with-pathspec'

gitster · gitster · commit a0f3df5d64b1 · 2021-12-10T14:35:08.000-08:00
The "merge" subcommand of "git jump" (in contrib/) silently ignored
pathspec and other parameters.

* jk/jump-merge-with-pathspec:
  git-jump: pass "merge" arguments to ls-files
diff --git a/contrib/git-jump/README b/contrib/git-jump/README
@@ -65,6 +65,9 @@ git jump diff --cached
 # jump to merge conflicts
 git jump merge
 
+# documentation conflicts are hard; skip past them for now
+git jump merge :^Documentation
+
 # jump to all instances of foo_bar
 git jump grep foo_bar
 
diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump
@@ -39,7 +39,7 @@ mode_diff() {
 }
 
 mode_merge() {
-	git ls-files -u |
+	git ls-files -u "$@" |
 	perl -pe 's/^.*?\t//' |
 	sort -u |
 	while IFS= read fn; do

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ mode_diff() {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`mode_merge() {`
`42`		`- git ls-files -u \|`
	`42`	`+ git ls-files -u "$@" \|`
`43`	`43`	`perl -pe 's/^.*?\t//' \|`
`44`	`44`	`sort -u \|`
`45`	`45`	`while IFS= read fn; do`