From: Gerrit Pape <pape@smarden.org>
Date: Mon, 6 Aug 2007 14:15:30 +0000 (+0000)
Subject: git-am: initialize variable $resume on startup
X-Git-Tag: v1.5.3-rc5~63
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3f0a8f3c015f5f2502228a72d8c944d9e700c559;p=git.git

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>
---

diff --git a/git-am.sh b/git-am.sh
index 6cf0eeee7..b5ed8ca15 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