Andrew's git - gitweb.git/blob

   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Junio C Hamano
   4#
   5# Fetch one or more remote refs and merge it/them into the current HEAD.
   6
   7USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <repo> <head>...'
   8LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
   9. git-sh-setup
  10
  11strategy_args= no_summary= no_commit=
  12while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
  13do
  14        case "$1" in
  15        -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
  16                --no-summa|--no-summar|--no-summary)
  17                no_summary=-n ;;
  18        --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
  19                no_commit=--no-commit ;;
  20        -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
  21                --strateg=*|--strategy=*|\
  22        -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
  23                case "$#,$1" in
  24                *,*=*)
  25                        strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
  26                1,*)
  27                        usage ;;
  28                *)
  29                        strategy="$2"
  30                        shift ;;
  31                esac
  32                strategy_args="${strategy_args}-s $strategy "
  33                ;;
  34        -h|--h|--he|--hel|--help)
  35                usage
  36                ;;
  37        -*)
  38                # Pass thru anything that is meant for fetch.
  39                break
  40                ;;
  41        esac
  42        shift
  43done
  44
  45orig_head=$(git-rev-parse --verify HEAD) || die "Pulling into a black hole?"
  46git-fetch --update-head-ok "$@" || exit 1
  47
  48curr_head=$(git-rev-parse --verify HEAD)
  49if test "$curr_head" != "$orig_head"
  50then
  51        # The fetch involved updating the current branch.
  52
  53        # The working tree and the index file is still based on the
  54        # $orig_head commit, but we are merging into $curr_head.
  55        # First update the working tree to match $curr_head.
  56
  57        echo >&2 "Warning: fetch updated the current branch head."
  58        echo >&2 "Warning: fast forwarding your working tree."
  59        git-read-tree -u -m "$orig_head" "$curr_head" ||
  60                die "You need to first update your working tree."
  61fi
  62
  63merge_head=$(sed -e '/  not-for-merge   /d' \
  64        -e 's/  .*//' "$GIT_DIR"/FETCH_HEAD | \
  65        tr '\012' ' ')
  66
  67case "$merge_head" in
  68'')
  69        echo >&2 "No changes."
  70        exit 0
  71        ;;
  72?*' '?*)
  73        var=`git repo-config --get pull.octopus`
  74        if test -n "$var"
  75        then
  76                strategy_default_args="-s $var"
  77        fi
  78        ;;
  79*)
  80        var=`git repo-config --get pull.twohead`
  81        if test -n "$var"
  82        then
  83                strategy_default_args="-s $var"
  84        fi
  85        ;;
  86esac
  87
  88case "$strategy_args" in
  89'')
  90        strategy_args=$strategy_default_args
  91        ;;
  92esac
  93
  94merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
  95git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head