On Tue, Nov 22, 2022 at 02:18:22PM +0000, Yoichi Nakayama via GitGitGadget wrote:
> @@ -64,11 +67,31 @@ mode_ws() {
> git diff --check "$@"
> }
>
> +use_stdout=
> +while test $# -gt 0; do
> + case "$1" in
> + --stdout)
> + use_stdout=t
> + shift
> + ;;
> + --*)
> + usage >&2
> + exit 1
> + ;;
> + *)
> + break
> + ;;
> + esac
> +done
> if test $# -lt 1; then
> usage >&2
> exit 1
> fi
> mode=$1; shift
> +if test "$use_stdout" = "t"; then
> + "mode_$mode" "$@"
> + exit 0
> +fi
Thanks, this looks pretty good. I think we'd want this on top.
-- >8 --
Subject: git-jump: move valid-mode check earlier
We check if the "mode" argument supplied by the user is valid by seeing
if we have a mode_$mode function defined. But we don't do that until
after creating the tempfile. This is wasteful (we create a tempfile but
never use it), and makes it harder to add new options (the recent stdout
option exits before creating the tempfile, so it misses the check and
"git jump --stdout foo" will produce "git-jump: 92: mode_foo: not found"
rather than the regular usage message).
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
contrib/git-jump/git-jump | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump
index babb3b5c68..cc97b0dcf0 100755
--- a/contrib/git-jump/git-jump
+++ b/contrib/git-jump/git-jump
@@ -88,14 +88,15 @@ if test $# -lt 1; then
exit 1
fi
mode=$1; shift
+type "mode_$mode" >/dev/null 2>&1 || { usage >&2; exit 1; }
+
if test "$use_stdout" = "t"; then
"mode_$mode" "$@"
exit 0
fi
trap 'rm -f "$tmp"' 0 1 2 3 15
tmp=`mktemp -t git-jump.XXXXXX` || exit 1
-type "mode_$mode" >/dev/null 2>&1 || { usage >&2; exit 1; }
"mode_$mode" "$@" >"$tmp"
test -s "$tmp" || exit 0
open_editor "$tmp"
--
2.38.1.970.g3b99f132c8
