development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-28 19:25:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'pe/pull-rebase-v-q' into maint

Browse source 
* pe/pull-rebase-v-q:
  pull: Apply -q and -v options to rebase mode as well
This commit is contained in:
Junio C Hamano 2013-04-26 11:00:14 -07:00
commit bcd660871a
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-pull.sh
View file

@ -279,7 +279,7 @@ fi
merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
case "$rebase" in
true)
eval="git-rebase $diffstat $strategy_args $merge_args"
eval="git-rebase $diffstat $strategy_args $merge_args $verbosity"
eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}"
;;
*)

27
t/t5521-pull-options.sh
View file

@ -19,6 +19,17 @@ test_expect_success 'git pull -q' '
test ! -s out)
'
test_expect_success 'git pull -q --rebase' '
mkdir clonedqrb &&
(cd clonedqrb && git init &&
git pull -q --rebase "../parent" >out 2>err &&
test ! -s err &&
test ! -s out &&
git pull -q --rebase "../parent" >out 2>err &&
test ! -s err &&
test ! -s out)
'
test_expect_success 'git pull' '
mkdir cloned &&
(cd cloned && git init &&
@ -27,6 +38,14 @@ test_expect_success 'git pull' '
test ! -s out)
'
test_expect_success 'git pull --rebase' '
mkdir clonedrb &&
(cd clonedrb && git init &&
git pull --rebase "../parent" >out 2>err &&
test -s err &&
test ! -s out)
'
test_expect_success 'git pull -v' '
mkdir clonedv &&
(cd clonedv && git init &&
@ -35,6 +54,14 @@ test_expect_success 'git pull -v' '
test ! -s out)
'
test_expect_success 'git pull -v --rebase' '
mkdir clonedvrb &&
(cd clonedvrb && git init &&
git pull -v --rebase "../parent" >out 2>err &&
test -s err &&
test ! -s out)
'
test_expect_success 'git pull -v -q' '
mkdir clonedvq &&
(cd clonedvq && git init &&