diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-08-20 03:00:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-24 16:50:51 -0700 |
| commit | 92c533ef0ea2cb43f0d7d493f006f5b4dfa7cda1 (patch) | |
| tree | db8870719dbc80c883137397b3af686cc9719c43 /git-fetch-script | |
| parent | [PATCH] Infamous 'octopus merge' (diff) | |
| download | tgif-92c533ef0ea2cb43f0d7d493f006f5b4dfa7cda1.tar.xz | |
[PATCH] Make "git pull" and "git fetch" default to origin
Amos Waterland sent in a patch for the pre-multi-head aware
version of "git pull" to do this, but the code changed quite a
bit since then. If there is no argument given to pull from, and
if "origin" makes sense, default to fetch/pull from "origin"
instead of barfing.
[jc: besides, the patch by Amos broke the non-default case where
explicit refspecs are specified, and did not make sure we know
what "origin" means before defaulting to it.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-fetch-script')
| -rwxr-xr-x | git-fetch-script | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-fetch-script b/git-fetch-script index 9b05e41176..a70909e4ff 100755 --- a/git-fetch-script +++ b/git-fetch-script @@ -8,7 +8,10 @@ _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" append= case "$#" in 0) - die "Where do you want to fetch from?" ;; + test -f "$GIT_DIR/branches/origin" || + test -f "$GIT_DIR/remotes/origin" || + die "Where do you want to fetch from?" + set origin ;; *) case "$1" in -a|--a|--ap|--app|--appe|--appen|--append) |