git-parse-remote.shon commit mergetool: Provide an empty file when needed (ec245ba)
   1#!/bin/sh
   2
   3# git-ls-remote could be called from outside a git managed repository;
   4# this would fail in that case and would issue an error message.
   5GIT_DIR=$(git rev-parse -q --git-dir) || :;
   6
   7get_default_remote () {
   8        curr_branch=$(git symbolic-ref -q HEAD)
   9        curr_branch="${curr_branch#refs/heads/}"
  10        origin=$(git config --get "branch.$curr_branch.remote")
  11        echo ${origin:-origin}
  12}
  13
  14get_remote_merge_branch () {
  15        case "$#" in
  16        0|1)
  17            origin="$1"
  18            default=$(get_default_remote)
  19            test -z "$origin" && origin=$default
  20            curr_branch=$(git symbolic-ref -q HEAD) &&
  21            [ "$origin" = "$default" ] &&
  22            echo $(git for-each-ref --format='%(upstream)' $curr_branch)
  23            ;;
  24        *)
  25            repo=$1
  26            shift
  27            ref=$1
  28            # FIXME: It should return the tracking branch
  29            #        Currently only works with the default mapping
  30            case "$ref" in
  31            +*)
  32                ref=$(expr "z$ref" : 'z+\(.*\)')
  33                ;;
  34            esac
  35            expr "z$ref" : 'z.*:' >/dev/null || ref="${ref}:"
  36            remote=$(expr "z$ref" : 'z\([^:]*\):')
  37            case "$remote" in
  38            '' | HEAD ) remote=HEAD ;;
  39            heads/*) remote=${remote#heads/} ;;
  40            refs/heads/*) remote=${remote#refs/heads/} ;;
  41            refs/* | tags/* | remotes/* ) remote=
  42            esac
  43            [ -n "$remote" ] && case "$repo" in
  44                .)
  45                    echo "refs/heads/$remote"
  46                    ;;
  47                *)
  48                    echo "refs/remotes/$repo/$remote"
  49                    ;;
  50            esac
  51        esac
  52}
  53
  54error_on_missing_default_upstream () {
  55        cmd="$1"
  56        op_type="$2"
  57        op_prep="$3"
  58        example="$4"
  59        branch_name=$(git symbolic-ref -q HEAD)
  60        if test -z "$branch_name"
  61        then
  62                echo "You are not currently on a branch, so I cannot use any
  63'branch.<branchname>.merge' in your configuration file.
  64Please specify which branch you want to $op_type $op_prep on the command
  65line and try again (e.g. '$example').
  66See git-${cmd}(1) for details."
  67        else
  68                echo "You asked me to $cmd without telling me which branch you
  69want to $op_type $op_prep, and 'branch.${branch_name#refs/heads/}.merge' in
  70your configuration file does not tell me, either. Please
  71specify which branch you want to use on the command line and
  72try again (e.g. '$example').
  73See git-${cmd}(1) for details.
  74
  75If you often $op_type $op_prep the same branch, you may want to
  76use something like the following in your configuration file:
  77    [branch \"${branch_name#refs/heads/}\"]
  78    remote = <nickname>
  79    merge = <remote-ref>"
  80                test rebase = "$op_type" &&
  81                echo "    rebase = true"
  82                echo "
  83    [remote \"<nickname>\"]
  84    url = <url>
  85    fetch = <refspec>
  86
  87See git-config(1) for details."
  88        fi
  89        exit 1
  90}