[PATCH] git-am: initialize variable $resume on startup

From: Gerrit Pape <pape@smarden.org>
Date: Aug 6, 2007, 14:15 UTC
Message-ID: <20070806141530.10422.qmail@8bd9c2a0b9ecab.315fe32.mid.smarden.org>
In-Reply-To: <20070803201405.GB12430@artemis.corp>

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>
---
 git-am.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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

-- 
1.5.3.GIT