undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-pull-dry-run-noop'

Browse Source 
* jk/maint-pull-dry-run-noop:
  pull: do nothing on --dry-run
This commit is contained in:
Junio C Hamano 2010-06-13 11:21:55 -07:00
commit 0267d8bf3c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git-pull.sh
View File

@ -43,6 +43,7 @@ merge_args=
curr_branch=$(git symbolic-ref -q HEAD) curr_branch=$(git symbolic-ref -q HEAD)
curr_branch_short="${curr_branch#refs/heads/}" curr_branch_short="${curr_branch#refs/heads/}"
rebase=$(git config --bool branch.$curr_branch_short.rebase) rebase=$(git config --bool branch.$curr_branch_short.rebase)
dry_run=
while : while :
do do
case "$1" in case "$1" in
@ -104,6 +105,9 @@ do
--no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase) --no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)
rebase=false rebase=false
;; ;;
--d|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run)
dry_run=--dry-run
;;
-h|--h|--he|--hel|--help) -h|--h|--he|--hel|--help)
usage usage
;; ;;
@ -216,7 +220,8 @@ test true = "$rebase" && {
done done
} }
orig_head=$(git rev-parse -q --verify HEAD) 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) curr_head=$(git rev-parse -q --verify HEAD)
if test -n "$orig_head" && test "$curr_head" != "$orig_head" if test -n "$orig_head" && test "$curr_head" != "$orig_head"