pull: Apply -q and -v options to rebase mode as well
git pull passed -q and -v only to git merge, but they can be useful for git rebase as well, so pass them there, too. In particular, using -q shuts up the "Already up-to-date." message. Especially, a new test script runs the same "pull --rebase" twice to make sure both cases are quiet, when it has something to fetch and when it is already up to date. Signed-off-by: Peter Eisentraut <peter@eisentraut.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Peter Eisentraut committed
Mar 14, 2013 at 22:26 UTC
ce4c4d4ec3df274349f20431c61ed85cea038026
2 files changed
+28
-1
git-pull.sh
+1
-1
@@ -279,7 +279,7 @@ fi
279
merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
280
case "$rebase" in
281
true)
282
- eval="git-rebase $diffstat $strategy_args $merge_args"
282
+ eval="git-rebase $diffstat $strategy_args $merge_args $verbosity"
283
eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}"
284
;;
285
*)
t/t5521-pull-options.sh
+27
@@ -19,6 +19,17 @@ test_expect_success 'git pull -q' '
19
test ! -s out)
20
'
21
22
+test_expect_success 'git pull -q --rebase' '
23
+ mkdir clonedqrb &&
24
+ (cd clonedqrb && git init &&
25
+ git pull -q --rebase "../parent" >out 2>err &&
26
+ test ! -s err &&
27
+ test ! -s out &&
28
+ git pull -q --rebase "../parent" >out 2>err &&
29
+ test ! -s err &&
30
+ test ! -s out)
31
+'
32
+
33
test_expect_success 'git pull' '
34
mkdir cloned &&
35
(cd cloned && git init &&
@@ -27,6 +38,14 @@ test_expect_success 'git pull' '
38
test ! -s out)
39
'
40
41
+test_expect_success 'git pull --rebase' '
42
+ mkdir clonedrb &&
43
+ (cd clonedrb && git init &&
44
+ git pull --rebase "../parent" >out 2>err &&
45
+ test -s err &&
46
+ test ! -s out)
47
+'
48
+
49
test_expect_success 'git pull -v' '
50
mkdir clonedv &&
51
(cd clonedv && git init &&
@@ -35,6 +54,14 @@ test_expect_success 'git pull -v' '
54
test ! -s out)
55
'
56
57
+test_expect_success 'git pull -v --rebase' '
58
+ mkdir clonedvrb &&
59
+ (cd clonedvrb && git init &&
60
+ git pull -v --rebase "../parent" >out 2>err &&
61
+ test -s err &&
62
+ test ! -s out)
63
+'
64
+
65
test_expect_success 'git pull -v -q' '
66
mkdir clonedvq &&
67
(cd clonedvq && git init &&