{"thread":{"id":"30626","subject":"[PATCH] Pass $verbosity from git pull to git rebase","startedAt":"2012-05-26T01:00:09Z","lastAt":"2012-05-26T01:00:09Z","messageCount":1,"participants":["Iustin Pop"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"192216","messageId":"20120526010009.GA16666@hq.k1024.org","threadId":"30626","inReplyTo":null,"subject":"[PATCH] Pass $verbosity from git pull to git rebase","fromName":"Iustin Pop","fromEmail":"iusty@k1024.org","sentAt":"2012-05-26T01:00:09Z","receivedAt":"2012-05-26T01:00:09Z","isPatch":true,"sender":{"key":"iusty@k1024.org","avatar":"https://gravatar.com/avatar/1ac09cc70e5882c6f3a189aa2289395499c2e25b8335208b79028b8dad5d2125?d=mp&s=160"},"body":"Currently \"git pull -q\" only takes effect in merge mode, as commit\n7f87aff2 (which introduced \"git pull -q\") only passes it to\ngit-merge. This is not nice as a \"git pull --rebase -q\" will result in\nthe \"Current branch master is up to date.\", instead of being quiet.\n\nThe patch adds a simple unit-test that checks that the initial pull, a\npull that forwards the head, and a no-op pull are all silent.\n\nSigned-off-by: Iustin Pop <iusty@k1024.org>\n---\n Please keep me CC-ed, not subscribed to the list.\n\n git-pull.sh             |    2 +-\n t/t5521-pull-options.sh |   15 ++++++++++++++-\n 2 files changed, 15 insertions(+), 2 deletions(-)\n\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 2a10047..2920c69 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -278,7 +278,7 @@ fi\n merge_name=$(git fmt-merge-msg $log_arg <\"$GIT_DIR/FETCH_HEAD\") || exit\n case \"$rebase\" in\n true)\n-\teval=\"git-rebase $diffstat $strategy_args $merge_args\"\n+\teval=\"git-rebase $diffstat $strategy_args $merge_args $verbosity\"\n \teval=\"$eval --onto $merge_head ${oldremoteref:-$merge_head}\"\n \t;;\n *)\ndiff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh\nindex 1b06691..9735fb4 100755\n--- a/t/t5521-pull-options.sh\n+++ b/t/t5521-pull-options.sh\n@@ -8,7 +8,9 @@ test_expect_success 'setup' '\n \tmkdir parent &&\n \t(cd parent && git init &&\n \t echo one >file && git add file &&\n-\t git commit -m one)\n+\t git commit -m one &&\n+\t echo two >file && git add file &&\n+\t git commit -m two)\n '\n \n test_expect_success 'git pull -q' '\n@@ -19,6 +21,17 @@ test_expect_success 'git pull -q' '\n \ttest ! -s out)\n '\n \n+test_expect_success 'git pull -q --rebase' '\n+\tmkdir clonedqr &&\n+\t(cd clonedqr && git init &&\n+\tgit pull -q --rebase \"../parent\" >out 2>err &&\n+\tgit reset --hard -q HEAD^ >>out 2>>err &&\n+\tgit pull -q --rebase \"../parent\" >>out 2>>err &&\n+\tgit pull -q --rebase \"../parent\" >>out 2>>err &&\n+\ttest ! -s err &&\n+\ttest ! -s out)\n+'\n+\n test_expect_success 'git pull' '\n \tmkdir cloned &&\n \t(cd cloned && git init &&\n-- \n1.7.10\n"}]}