summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-12 20:52:03 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-13 00:54:38 (GMT)
commit533b70390e540de4e0faed4823ee561c8368e5ec (patch)
treea8daab8c94e77c77cb5a8cdba6a071d5cfb3f2a8 /git-pull.sh
parent514c09fdcfef6385f1a61ee52344794356c99986 (diff)
downloadgit-533b70390e540de4e0faed4823ee561c8368e5ec.zip
git-533b70390e540de4e0faed4823ee561c8368e5ec.tar.gz
git-533b70390e540de4e0faed4823ee561c8368e5ec.tar.bz2
Allow whole-tree operations to be started from a subdirectory
This updates five commands (merge, pull, rebase, revert and cherry-pick) so that they can be started from a subdirectory. This may not actually be what we want to do. These commands are inherently whole-tree operations, and an inexperienced user may mistakenly expect a "git pull" from a subdirectory would merge only the subdirectory the command started from. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index e9826fc..9592617 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -6,12 +6,14 @@
USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <repo> <head>...'
LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
+SUBDIRECTORY_OK=Yes
. git-sh-setup
set_reflog_action "pull $*"
require_work_tree
+cd_to_toplevel
test -z "$(git ls-files -u)" ||
- die "You are in a middle of conflicted merge."
+ die "You are in the middle of a conflicted merge."
strategy_args= no_summary= no_commit= squash=
while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac