Merge branch 'ar/verbose'

[git.git] / git-pull.sh
diff --git a/git-pull.sh b/git-pull.sh

index 28d08195f0c84b7f3a89a5c5cff9945bb64ddfb3..ba0ca079e204a464ee05b6c000ed891ed3c08b33 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -6,8 +6,14 @@
  
  USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <repo> <head>...'
  LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
+SUBDIRECTORY_OK=Yes
  . git-sh-setup
  set_reflog_action "pull $*"
+require_work_tree
+cd_to_toplevel
+
+test -z "$(git ls-files -u)" ||
+       die "You are in the middle of a conflicted merge."
  
  strategy_args= no_summary= no_commit= squash=
  while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
@@ -16,6 +22,9 @@ do
         -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
                 --no-summa|--no-summar|--no-summary)
                 no_summary=-n ;;
+       --summary)
+               no_summary=$1
+               ;;
         --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
                 no_commit=--no-commit ;;
         --sq|--squ|--squa|--squas|--squash)
@@ -77,8 +86,17 @@ merge_head=$(sed -e '/       not-for-merge   /d' \
  
  case "$merge_head" in
  '')
-       curr_branch=$(git-symbolic-ref HEAD | \
-               sed -e 's|^refs/heads/||')
+       curr_branch=$(git-symbolic-ref -q HEAD)
+       case $? in
+         0) ;;
+         1) echo >&2 "You are not currently on a branch; you must explicitly"
+            echo >&2 "specify which branch you wish to merge:"
+            echo >&2 "  git pull <remote> <branch>"
+            exit 1;;
+         *) exit $?;;
+       esac
+       curr_branch=${curr_branch#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."