Skip to content

Commit

Permalink
allow git-am to run in a subdirectory
Browse files Browse the repository at this point in the history
We just move to the top of the tree and proceed. This
shouldn't break any existing callers, since the behavior was
previously disallowed.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Mar 1, 2008
1 parent ee542ee commit c149184
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#
# Copyright (c) 2005, 2006 Junio C Hamano

SUBDIRECTORY_OK=Yes
OPTIONS_KEEPDASHDASH=
OPTIONS_SPEC="\
git-am [options] <mbox>|<Maildir>...
Expand All @@ -25,6 +26,7 @@ skip skip the current patch"
. git-sh-setup
set_reflog_action am
require_work_tree
cd_to_toplevel

git var GIT_COMMITTER_IDENT >/dev/null || exit

Expand Down

0 comments on commit c149184

Please sign in to comment.