[RFC/PATCH] am/pull/rebase/stash: cd_to_toplevel before require_work_tree
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Jul 14, 2010, 12:55 UTC
- Message-ID
- <96abf622ca2cf92998ce4ed393ccaa75d95dd9a8.1279112025.git.git@drmicha.warpmail.net>
- In-Reply-To
- <4C3DB396.2040109@drmicha.warpmail.net>
Currently, "cd_to_toplevel" comes right after "require_work_tree" for these commands.
Put "cd_to_toplevel" before "require_work_tree" so that these commands do not die fatally when called with --work-tree or GIT_WORK_TREE properly set from outside of the work tree.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> --- git-am.sh | 2 +- git-pull.sh | 2 +- git-rebase.sh | 2 +- git-stash.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-am.sh b/git-am.sh index e7f008c..bf81030 100755 --- a/git-am.sh +++ b/git-am.sh @@ -39,8 +39,8 @@ rebasing* (internal use for git-rebase)" . git-sh-setup prefix=$(git rev-parse --show-prefix) set_reflog_action am -require_work_tree cd_to_toplevel +require_work_tree git var GIT_COMMITTER_IDENT >/dev/null || die "You need to set your committer info first" diff --git a/git-pull.sh b/git-pull.sh index a09a44e..83c25b9 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -10,8 +10,8 @@ SUBDIRECTORY_OK=Yes OPTIONS_SPEC= . git-sh-setup set_reflog_action "pull $*" -require_work_tree cd_to_toplevel +require_work_tree die_conflict () { diff --git a/git-rebase.sh b/git-rebase.sh index ab4afa7..96dd34f 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -31,8 +31,8 @@ SUBDIRECTORY_OK=Yes OPTIONS_SPEC= . git-sh-setup set_reflog_action rebase -require_work_tree cd_to_toplevel +require_work_tree LF=' ' diff --git a/git-stash.sh b/git-stash.sh index 1d95447..4564892 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -13,8 +13,8 @@ USAGE="list [<options>] SUBDIRECTORY_OK=Yes OPTIONS_SPEC= . git-sh-setup -require_work_tree cd_to_toplevel +require_work_tree TMP="$GIT_DIR/.git-stash.$$" trap 'rm -f "$TMP-*"' 0
-- 1.7.2.rc1.212.g850a