Skip to content

Commit

Permalink
git-am: initialize variable $resume on startup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Gerrit Pape authored and gitster committed Aug 6, 2007
1 parent 7d4aef4 commit 3f0a8f3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion git-am.sh
Expand Up @@ -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
Expand Down

0 comments on commit 3f0a8f3

Please sign in to comment.