git.oblomov.eu Git - git/blob - git-pull-script

   1 #!/bin/sh
   2 #
   3 merge_repo=$1
   4
   5 merge_name=$(echo "$1" | sed 's:\.git/*$::')
   6 merge_head=HEAD
   7 type=head
   8 if [ "$2" = "tag" ]; then
   9    type=tag
  10    shift
  11 fi
  12 if [ "$2" ]
  13 then
  14    merge_name="$type '$2' of $merge_name"
  15    merge_head="refs/${type}s/$2"
  16 fi
  17
  18 : ${GIT_DIR=.git}
  19 : ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
  20
  21 git-fetch-script "$merge_repo" "$merge_head" || exit 1
  22
  23 git-resolve-script \
  24         "$(cat "$GIT_DIR"/HEAD)" \
  25         "$(cat "$GIT_DIR"/FETCH_HEAD)" \
  26         "$merge_name"