summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2007-08-06 14:15:30 +0000
committerJunio C Hamano <gitster@pobox.com>2007-08-06 16:16:27 -0700
commit3f0a8f3c015f5f2502228a72d8c944d9e700c559 (patch)
tree0cf8c9ef884e5f931e68525b8981045508334066 /git-am.sh
parent7d4aef4027e6a95fa112fa7b069f945cad294a23 (diff)
downloadgit-3f0a8f3c015f5f2502228a72d8c944d9e700c559.tar.gz
git-am: initialize variable $resume on startup
git-am expects the variable $resume to be empty or unset, which might not be the case if $resume is set in the user's environment. So initialize it to an empty value on startup. The problem was noticed by Pierre Habouzit and reported through http://bugs.debian.org/435807 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 6cf0eeee71..b5ed8ca15c 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -103,7 +103,8 @@ It does not apply to blobs recorded in its index."
}
prec=4
-dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= resolvemsg=
+dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary=
+resolvemsg= resume=
git_apply_opt=
while case "$#" in 0) break;; esac