Re: [PATCH 5/11] git-applypatch: Usage string clean-up, emit usage string at incorrect invocation
Show 25 quoted lines
> On Wed, Dec 14, 2005 at 02:45:42PM +0200, Timo Hirvonen wrote:
>
>>On Tue, 13 Dec 2005 21:20:57 -0800
>>Junio C Hamano <junkio@cox.net> wrote:
>>
>>
>>>freku045@student.liu.se writes:
>>>
>>>
>>>> . git-sh-setup
>>>>
>>>>+[[ "$#" = "3" || "$#" = "4" ]] || usage
>>>>+
>>>
>>>I do not see much advantage to use [[...]] construct here.
>>
>>[[ ]] is bashishm. Does not work with ash.
>>
>>
>>test $# -ge 3 && test $# -le 4 || usage
>>
>>You don't need to quote $# because it is always defined (and always
>>non-negative integer). You can't unset or set it.
>
>
This patch seems not working for me:
$ git-applymbox -k 0001-JUST-A-TEST.txt
1 patch(es) to process.
Usage: /home/marco/bin/git-applypatch <msg> <patch> <info> [<signoff>]
where
$ cat 0001-JUST-A-TEST.txt
From nobody Mon Sep 17 00:00:00 2001
Subject: [PATCH] JUST A TEST
From: Marco Costalba <mcostalba@gmail.com>
Date: 1134677832 +0100
---
git-applypatch.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
ee8ea125fd2b0598e26e1556210abb9d0edc459a
diff --git a/git-applypatch.sh b/git-applypatch.sh
index e8ba34a..26b4cba 100755
--- a/git-applypatch.sh
+++ b/git-applypatch.sh
@@ -10,7 +10,7 @@
## $3 - "info" file with Author, email and subject
## $4 - optional file containing signoff to add
##
-
+## JUST A TEST
USAGE='<msg> <patch> <info> [<signoff>]'
. git-sh-setup
--
0.99.9.GIT
The offending patch is
Author: Junio C Hamano <junkio@cox.net>
Date: 14/12/2005 03:19:12
Parent: git-repack: Usage string clean-up, emit usage at incorrec...
applypatch: no need to do non-portable [[ ... ]]
... when old, proven, case would do.
Signed-off-by: Junio C Hamano <junkio@cox.net>
--- a/git-applypatch.sh
+++ b/git-applypatch.sh
@@ -14,7 +14,7 @@
USAGE='<msg> <patch> <info> [<signoff>]'
. git-sh-setup
-[[ "$#" = "3" || "$#" = "4" ]] || usage
+case "$#" in 3|4) usage ;; esac
final=.dotest/final-commit
##
reverting the patch everything works fine.
Marco