add .mailmap for git-shortlog output with the git repository

[git.git] / git-pull.sh

diff --git a/git-pull.sh b/git-pull.sh
index d337bf4da31c8a86eeaee7b34b910611100ccca8..1703091bbb988e22f39b2c8d4c70ec7340a2f109 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -44,10 +44,10 @@ do
        shift
 done
 
-orig_head=$(git-rev-parse --verify HEAD) || die "Pulling into a black hole?"
+orig_head=$(git-rev-parse --verify HEAD 2>/dev/null)
 git-fetch --update-head-ok --reflog-action=pull "$@" || exit 1
 
-curr_head=$(git-rev-parse --verify HEAD)
+curr_head=$(git-rev-parse --verify HEAD 2>/dev/null)
 if test "$curr_head" != "$orig_head"
 then
        # The fetch involved updating the current branch.
@@ -58,7 +58,7 @@ then
 
        echo >&2 "Warning: fetch updated the current branch head."
        echo >&2 "Warning: fast forwarding your working tree from"
-       echo >&2 "Warning: $orig_head commit."
+       echo >&2 "Warning: commit $orig_head."
        git-update-index --refresh 2>/dev/null
        git-read-tree -u -m "$orig_head" "$curr_head" ||
                die 'Cannot fast-forward your working tree.
@@ -76,10 +76,19 @@ merge_head=$(sed -e '/      not-for-merge   /d' \
 
 case "$merge_head" in
 '')
+       curr_branch=$(git-symbolic-ref HEAD | \
+               sed -e 's|^refs/heads/||')
+       echo >&2 "Warning: No merge candidate found because value of config option
+         \"branch.${curr_branch}.merge\" does not match any remote branch fetched."
        echo >&2 "No changes."
        exit 0
        ;;
 ?*' '?*)
+       if test -z "$orig_head"
+       then
+               echo >&2 "Cannot merge multiple branches into empty head"
+               exit 1
+       fi
        var=`git-repo-config --get pull.octopus`
        if test -n "$var"
        then
@@ -95,6 +104,13 @@ case "$merge_head" in
        ;;
 esac
 
+if test -z "$orig_head"
+then
+       git-update-ref -m "initial pull" HEAD $merge_head "" &&
+       git-read-tree --reset -u HEAD || exit 1
+       exit
+fi
+
 case "$strategy_args" in
 '')
        strategy_args=$strategy_default_args
@@ -102,5 +118,6 @@ case "$strategy_args" in
 esac
 
 merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
-git-merge $no_summary $no_commit $squash $strategy_args \
+git-merge "--reflog-action=pull $*" \
+       $no_summary $no_commit $squash $strategy_args \
        "$merge_name" HEAD $merge_head