diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:40:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:40:33 -0700 |
| commit | d0780b0643123dcf68639ac9fc4d79da4e41e6da (patch) | |
| tree | c82b903ac5b6b3c60a300702e6484d61ea72deb1 | |
| parent | cb2af93ac183c1a6d5635bb2be047c1ade362099 (diff) | |
| parent | 29609e682226acbdaa3340145792b5bd7a1ef5a8 (diff) | |
| download | git-d0780b0643123dcf68639ac9fc4d79da4e41e6da.tar.gz git-d0780b0643123dcf68639ac9fc4d79da4e41e6da.tar.xz | |
Merge branch 'jk/maint-pull-dry-run-noop' into maint
* jk/maint-pull-dry-run-noop:
pull: do nothing on --dry-run
| -rwxr-xr-x | git-pull.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index 1a4729f7b..a09a44ec4 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -43,6 +43,7 @@ merge_args= curr_branch=$(git symbolic-ref -q HEAD) curr_branch_short="${curr_branch#refs/heads/}" rebase=$(git config --bool branch.$curr_branch_short.rebase) +dry_run= while : do case "$1" in @@ -104,6 +105,9 @@ do --no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase) rebase=false ;; + --d|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run) + dry_run=--dry-run + ;; -h|--h|--he|--hel|--help) usage ;; @@ -216,7 +220,8 @@ test true = "$rebase" && { done } orig_head=$(git rev-parse -q --verify HEAD) -git fetch $verbosity $progress --update-head-ok "$@" || exit 1 +git fetch $verbosity $progress $dry_run --update-head-ok "$@" || exit 1 +test -z "$dry_run" || exit 0 curr_head=$(git rev-parse -q --verify HEAD) if test -n "$orig_head" && test "$curr_head" != "$orig_head" |