diff options
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/git-pull.sh b/git-pull.sh index a10b1290b..9868a0bfb 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -10,8 +10,8 @@ SUBDIRECTORY_OK=Yes OPTIONS_SPEC= . git-sh-setup . git-sh-i18n -set_reflog_action "pull $*" -require_work_tree +set_reflog_action "pull${1+ $*}" +require_work_tree_exists cd_to_toplevel @@ -120,7 +120,7 @@ do --d|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run) dry_run=--dry-run ;; - -h|--h|--he|--hel|--help|--help-|--help-a|--help-al|--help-all) + -h|--help-all) usage ;; *) @@ -217,12 +217,9 @@ then # $orig_head commit, but we are merging into $curr_head. # First update the working tree to match $curr_head. - ( - eval_gettext "Warning: fetch updated the current branch head. + eval_gettextln "Warning: fetch updated the current branch head. Warning: fast-forwarding your working tree from -Warning: commit \$orig_head." && - echo - ) >&2 +Warning: commit \$orig_head." >&2 git update-index -q --refresh git read-tree -u -m "$orig_head" "$curr_head" || die "$(eval_gettext "Cannot fast-forward your working tree. |