|
Removed
Link Here
|
| 1 |
Option parsing in the Git shell scripts uses the construct 'while |
| 2 |
case "$#" in 0) break ;; esac; do ... done'. This is neat, because |
| 3 |
it needs no external commands invocation. But for the FreeBSD's |
| 4 |
original Bourne shell (that is not fully IEEE 1003.2-compliant) the |
| 5 |
'case' construct that has not matched patterns does not modify the |
| 6 |
exit value. As per IEEE 1003.2, it should return zero: see |
| 7 |
http://opengroup.org/onlinepubs/000095399, Shell and Utilities |
| 8 |
Volume (XCU), Case Conditional Construct. |
| 9 |
|
| 10 |
The fix is to add the case branch '*) : ;;'. It also needs no |
| 11 |
external commands invocation and it does its work, because ':' |
| 12 |
always returns zero. |
| 13 |
|
| 14 |
FreeBSD has the PR 116559, |
| 15 |
http://www.freebsd.org/cgi/query-pr.cgi?pr=116559 |
| 16 |
that fixes the shell issue. If it will be committed, this patch |
| 17 |
will not be needed anymore for systems that will have the fixed |
| 18 |
/bin/sh. |
| 19 |
|
| 20 |
Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru> |
| 21 |
--- |
| 22 |
contrib/examples/git-gc.sh | 2 +- |
| 23 |
contrib/examples/git-tag.sh | 2 +- |
| 24 |
contrib/examples/git-verify-tag.sh | 2 +- |
| 25 |
git-am.sh | 2 +- |
| 26 |
git-clean.sh | 2 +- |
| 27 |
git-commit.sh | 2 +- |
| 28 |
git-fetch.sh | 2 +- |
| 29 |
git-filter-branch.sh | 2 +- |
| 30 |
git-instaweb.sh | 2 +- |
| 31 |
git-ls-remote.sh | 2 +- |
| 32 |
git-merge.sh | 2 +- |
| 33 |
git-mergetool.sh | 2 +- |
| 34 |
git-pull.sh | 2 +- |
| 35 |
git-quiltimport.sh | 2 +- |
| 36 |
git-rebase--interactive.sh | 2 +- |
| 37 |
git-rebase.sh | 4 ++-- |
| 38 |
git-repack.sh | 2 +- |
| 39 |
git-reset.sh | 2 +- |
| 40 |
git-submodule.sh | 2 +- |
| 41 |
19 files changed, 20 insertions(+), 20 deletions(-) |
| 42 |
|
| 43 |
diff --git contrib/examples/git-gc.sh b/contrib/examples/git-gc.sh |
| 44 |
index 2ae235b..60cb348 100755 |
| 45 |
--- contrib/examples/git-gc.sh |
| 46 |
+++ contrib/examples/git-gc.sh |
| 47 |
@@ -9,7 +9,7 @@ SUBDIRECTORY_OK=Yes |
| 48 |
. git-sh-setup |
| 49 |
|
| 50 |
no_prune=: |
| 51 |
-while case $# in 0) break ;; esac |
| 52 |
+while case $# in 0) break ;; *) : ;; esac |
| 53 |
do |
| 54 |
case "$1" in |
| 55 |
--prune) |
| 56 |
diff --git contrib/examples/git-tag.sh b/contrib/examples/git-tag.sh |
| 57 |
index 5ee3f50..26aab69 100755 |
| 58 |
--- contrib/examples/git-tag.sh |
| 59 |
+++ contrib/examples/git-tag.sh |
| 60 |
@@ -14,7 +14,7 @@ username= |
| 61 |
list= |
| 62 |
verify= |
| 63 |
LINES=0 |
| 64 |
-while case "$#" in 0) break ;; esac |
| 65 |
+while case "$#" in 0) break ;; *) : ;; esac |
| 66 |
do |
| 67 |
case "$1" in |
| 68 |
-a) |
| 69 |
diff --git contrib/examples/git-verify-tag.sh b/contrib/examples/git-verify-tag.sh |
| 70 |
index 37b0023..9a0f011 100755 |
| 71 |
--- contrib/examples/git-verify-tag.sh |
| 72 |
+++ contrib/examples/git-verify-tag.sh |
| 73 |
@@ -5,7 +5,7 @@ SUBDIRECTORY_OK='Yes' |
| 74 |
. git-sh-setup |
| 75 |
|
| 76 |
verbose= |
| 77 |
-while case $# in 0) break;; esac |
| 78 |
+while case $# in 0) break;; *) : ;; esac |
| 79 |
do |
| 80 |
case "$1" in |
| 81 |
-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose) |
| 82 |
diff --git git-am.sh b/git-am.sh |
| 83 |
index 6809aa0..0bd8d34 100755 |
| 84 |
--- git-am.sh |
| 85 |
+++ git-am.sh |
| 86 |
@@ -109,7 +109,7 @@ dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= |
| 87 |
resolvemsg= resume= |
| 88 |
git_apply_opt= |
| 89 |
|
| 90 |
-while case "$#" in 0) break;; esac |
| 91 |
+while case "$#" in 0) break;; *) : ;; esac |
| 92 |
do |
| 93 |
case "$1" in |
| 94 |
-d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*) |
| 95 |
diff --git git-clean.sh b/git-clean.sh |
| 96 |
index a5cfd9f..1fac731 100755 |
| 97 |
--- git-clean.sh |
| 98 |
+++ git-clean.sh |
| 99 |
@@ -26,7 +26,7 @@ rmrf="rm -rf --" |
| 100 |
rm_refuse="echo Not removing" |
| 101 |
echo1="echo" |
| 102 |
|
| 103 |
-while case "$#" in 0) break ;; esac |
| 104 |
+while case "$#" in 0) break ;; *) : ;; esac |
| 105 |
do |
| 106 |
case "$1" in |
| 107 |
-d) |
| 108 |
diff --git git-commit.sh b/git-commit.sh |
| 109 |
index bb113e8..5f298c1 100755 |
| 110 |
--- git-commit.sh |
| 111 |
+++ git-commit.sh |
| 112 |
@@ -89,7 +89,7 @@ force_author= |
| 113 |
only_include_assumed= |
| 114 |
untracked_files= |
| 115 |
templatefile="`git config commit.template`" |
| 116 |
-while case "$#" in 0) break;; esac |
| 117 |
+while case "$#" in 0) break;; *) : ;; esac |
| 118 |
do |
| 119 |
case "$1" in |
| 120 |
-F|--F|-f|--f|--fi|--fil|--file) |
| 121 |
diff --git git-fetch.sh b/git-fetch.sh |
| 122 |
index c3a2001..dac2d72 100755 |
| 123 |
--- git-fetch.sh |
| 124 |
+++ git-fetch.sh |
| 125 |
@@ -27,7 +27,7 @@ shallow_depth= |
| 126 |
no_progress= |
| 127 |
test -t 1 || no_progress=--no-progress |
| 128 |
quiet= |
| 129 |
-while case "$#" in 0) break ;; esac |
| 130 |
+while case "$#" in 0) break ;; *) : ;; esac |
| 131 |
do |
| 132 |
case "$1" in |
| 133 |
-a|--a|--ap|--app|--appe|--appen|--append) |
| 134 |
diff --git git-filter-branch.sh b/git-filter-branch.sh |
| 135 |
index a4b6577..02b567b 100755 |
| 136 |
--- git-filter-branch.sh |
| 137 |
+++ git-filter-branch.sh |
| 138 |
@@ -105,7 +105,7 @@ filter_tag_name= |
| 139 |
filter_subdir= |
| 140 |
orig_namespace=refs/original/ |
| 141 |
force= |
| 142 |
-while case "$#" in 0) usage;; esac |
| 143 |
+while case "$#" in 0) usage;; *) : ;; esac |
| 144 |
do |
| 145 |
case "$1" in |
| 146 |
--) |
| 147 |
diff --git git-instaweb.sh b/git-instaweb.sh |
| 148 |
index b79c6b6..c85f8c0 100755 |
| 149 |
--- git-instaweb.sh |
| 150 |
+++ git-instaweb.sh |
| 151 |
@@ -61,7 +61,7 @@ stop_httpd () { |
| 152 |
test -f "$fqgitdir/pid" && kill `cat "$fqgitdir/pid"` |
| 153 |
} |
| 154 |
|
| 155 |
-while case "$#" in 0) break ;; esac |
| 156 |
+while case "$#" in 0) break ;; *) : ;; esac |
| 157 |
do |
| 158 |
case "$1" in |
| 159 |
--stop|stop) |
| 160 |
diff --git git-ls-remote.sh b/git-ls-remote.sh |
| 161 |
index b7e5d04..4ef4341 100755 |
| 162 |
--- git-ls-remote.sh |
| 163 |
+++ git-ls-remote.sh |
| 164 |
@@ -13,7 +13,7 @@ die () { |
| 165 |
} |
| 166 |
|
| 167 |
exec= |
| 168 |
-while case "$#" in 0) break;; esac |
| 169 |
+while case "$#" in 0) break;; *) : ;; esac |
| 170 |
do |
| 171 |
case "$1" in |
| 172 |
-h|--h|--he|--hea|--head|--heads) |
| 173 |
diff --git git-merge.sh b/git-merge.sh |
| 174 |
index 3a01db0..94a50aa 100755 |
| 175 |
--- git-merge.sh |
| 176 |
+++ git-merge.sh |
| 177 |
@@ -122,7 +122,7 @@ merge_name () { |
| 178 |
case "$#" in 0) usage ;; esac |
| 179 |
|
| 180 |
have_message= |
| 181 |
-while case "$#" in 0) break ;; esac |
| 182 |
+while case "$#" in 0) break ;; *) : ;; esac |
| 183 |
do |
| 184 |
case "$1" in |
| 185 |
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ |
| 186 |
diff --git git-mergetool.sh b/git-mergetool.sh |
| 187 |
index 47a8055..0e286dd 100755 |
| 188 |
--- git-mergetool.sh |
| 189 |
+++ git-mergetool.sh |
| 190 |
@@ -268,7 +268,7 @@ merge_file () { |
| 191 |
cleanup_temp_files |
| 192 |
} |
| 193 |
|
| 194 |
-while case $# in 0) break ;; esac |
| 195 |
+while case $# in 0) break ;; *) : ;; esac |
| 196 |
do |
| 197 |
case "$1" in |
| 198 |
-t|--tool*) |
| 199 |
diff --git git-pull.sh b/git-pull.sh |
| 200 |
index 5e96d1f..722ed4e 100755 |
| 201 |
--- git-pull.sh |
| 202 |
+++ git-pull.sh |
| 203 |
@@ -16,7 +16,7 @@ test -z "$(git ls-files -u)" || |
| 204 |
die "You are in the middle of a conflicted merge." |
| 205 |
|
| 206 |
strategy_args= no_summary= no_commit= squash= |
| 207 |
-while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac |
| 208 |
+while case "$#,$1" in 0) break ;; *,-*) : ;; *) break ;; esac |
| 209 |
do |
| 210 |
case "$1" in |
| 211 |
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ |
| 212 |
diff --git git-quiltimport.sh b/git-quiltimport.sh |
| 213 |
index 9de54d1..4039617 100755 |
| 214 |
--- git-quiltimport.sh |
| 215 |
+++ git-quiltimport.sh |
| 216 |
@@ -5,7 +5,7 @@ SUBDIRECTORY_ON=Yes |
| 217 |
|
| 218 |
dry_run="" |
| 219 |
quilt_author="" |
| 220 |
-while case "$#" in 0) break;; esac |
| 221 |
+while case "$#" in 0) break;; *) : ;; esac |
| 222 |
do |
| 223 |
case "$1" in |
| 224 |
--au=*|--aut=*|--auth=*|--autho=*|--author=*) |
| 225 |
diff --git git-rebase--interactive.sh b/git-rebase--interactive.sh |
| 226 |
index abc2b1c..54e4299 100755 |
| 227 |
--- git-rebase--interactive.sh |
| 228 |
+++ git-rebase--interactive.sh |
| 229 |
@@ -317,7 +317,7 @@ do_rest () { |
| 230 |
done |
| 231 |
} |
| 232 |
|
| 233 |
-while case $# in 0) break ;; esac |
| 234 |
+while case $# in 0) break ;; *) : ;; esac |
| 235 |
do |
| 236 |
case "$1" in |
| 237 |
--continue) |
| 238 |
diff --git git-rebase.sh b/git-rebase.sh |
| 239 |
index 3bd66b0..29cfab2 100755 |
| 240 |
--- git-rebase.sh |
| 241 |
+++ git-rebase.sh |
| 242 |
@@ -122,7 +122,7 @@ finish_rb_merge () { |
| 243 |
|
| 244 |
is_interactive () { |
| 245 |
test -f "$dotest"/interactive || |
| 246 |
- while case $#,"$1" in 0,|*,-i|*,--interactive) break ;; esac |
| 247 |
+ while case $#,"$1" in 0,|*,-i|*,--interactive) break ;; *) : ;; esac |
| 248 |
do |
| 249 |
shift |
| 250 |
done && test -n "$1" |
| 251 |
@@ -130,7 +130,7 @@ is_interactive () { |
| 252 |
|
| 253 |
is_interactive "$@" && exec git-rebase--interactive "$@" |
| 254 |
|
| 255 |
-while case "$#" in 0) break ;; esac |
| 256 |
+while case "$#" in 0) break ;; *) : ;; esac |
| 257 |
do |
| 258 |
case "$1" in |
| 259 |
--continue) |
| 260 |
diff --git git-repack.sh b/git-repack.sh |
| 261 |
index 156c5e8..aac771e 100755 |
| 262 |
--- git-repack.sh |
| 263 |
+++ git-repack.sh |
| 264 |
@@ -9,7 +9,7 @@ SUBDIRECTORY_OK='Yes' |
| 265 |
|
| 266 |
no_update_info= all_into_one= remove_redundant= |
| 267 |
local= quiet= no_reuse= extra= |
| 268 |
-while case "$#" in 0) break ;; esac |
| 269 |
+while case "$#" in 0) break ;; *) : ;; esac |
| 270 |
do |
| 271 |
case "$1" in |
| 272 |
-n) no_update_info=t ;; |
| 273 |
diff --git git-reset.sh b/git-reset.sh |
| 274 |
index 1dc606f..eb92610 100755 |
| 275 |
--- git-reset.sh |
| 276 |
+++ git-reset.sh |
| 277 |
@@ -11,7 +11,7 @@ require_work_tree |
| 278 |
update= reset_type=--mixed |
| 279 |
unset rev |
| 280 |
|
| 281 |
-while case $# in 0) break ;; esac |
| 282 |
+while case $# in 0) break ;; *) : ;; esac |
| 283 |
do |
| 284 |
case "$1" in |
| 285 |
--mixed | --soft | --hard) |
| 286 |
diff --git git-submodule.sh b/git-submodule.sh |
| 287 |
index 3320998..78a25ad 100755 |
| 288 |
--- git-submodule.sh |
| 289 |
+++ git-submodule.sh |
| 290 |
@@ -251,7 +251,7 @@ modules_list() |
| 291 |
done |
| 292 |
} |
| 293 |
|
| 294 |
-while case "$#" in 0) break ;; esac |
| 295 |
+while case "$#" in 0) break ;; *) : ;; esac |
| 296 |
do |
| 297 |
case "$1" in |
| 298 |
add) |