git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mehul Jain <mehul.jain2029@gmail.com>
To: git@vger.kernel.org
Cc: sunshine@sunshineco.com, Matthieu.Moy@grenoble-inp.fr,
	gitster@pobox.com, Mehul Jain <mehul.jain2029@gmail.com>
Subject: [PATCH v2 7/7] t5520: test --[no-]autostash with pull.rebase=true
Date: Sat,  2 Apr 2016 23:28:32 +0530	[thread overview]
Message-ID: <1459619912-5445-8-git-send-email-mehul.jain2029@gmail.com> (raw)
In-Reply-To: <1459619912-5445-1-git-send-email-mehul.jain2029@gmail.com>

"--[no-]autostash" option for git-pull is only valid in rebase mode(
i.e. either --rebase should be used or pull.rebase=true). Existing
tests already check the cases when --rebase is used but fails to check
for pull.rebase=true case.

Add two new tests to check that --[no-]autostash option works with
pull.rebase=true.

Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
---
 t/t5520-pull.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index e12af96..bed75f5 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -314,6 +314,16 @@ test_expect_success 'pull.rebase' '
 	test new = "$(git show HEAD:file2)"
 '
 
+test_expect_success 'pull --autostash & pull.rebase=true' '
+	test_config pull.rebase true &&
+	test_pull_autostash --autostash
+'
+
+test_expect_success 'pull --no-autostash & pull.rebase=true' '
+	test_config pull.rebase true &&
+	test_pull_autostash_fail --no-autostash
+'
+
 test_expect_success 'branch.to-rebase.rebase' '
 	git reset --hard before-rebase &&
 	test_config branch.to-rebase.rebase true &&
-- 
2.7.1.340.g69eb491.dirty

  parent reply	other threads:[~2016-04-02 18:01 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-02 17:58 [PATCH v2 0/7] t5520: tests for --[no-]autostash option Mehul Jain
2016-04-02 17:58 ` [PATCH v2 1/7] t5520: use consistent capitalization in test titles Mehul Jain
2016-04-02 17:58 ` [PATCH v2 2/7] t5520: ensure consistent test conditions Mehul Jain
2016-04-02 17:58 ` [PATCH v2 3/7] t5520: use better test to check stderr output Mehul Jain
2016-04-02 17:58 ` [PATCH v2 4/7] t5520: factor out common code Mehul Jain
2016-04-03 20:03   ` Eric Sunshine
2016-04-02 17:58 ` [PATCH v2 5/7] " Mehul Jain
2016-04-03 20:05   ` Eric Sunshine
2016-04-02 17:58 ` [PATCH v2 6/7] t5520: reduce commom lines of code Mehul Jain
2016-04-02 18:50   ` Johannes Sixt
2016-04-03  6:24     ` Mehul Jain
2016-04-03  6:46       ` Johannes Sixt
2016-04-02 17:58 ` Mehul Jain [this message]
2016-04-03 20:11   ` [PATCH v2 7/7] t5520: test --[no-]autostash with pull.rebase=true Eric Sunshine
2016-04-03  8:47 ` [PATCH v2 6/7] t5520: reduce commom lines of code Mehul Jain
2016-04-03 20:17 ` [PATCH v2 0/7] t5520: tests for --[no-]autostash option Eric Sunshine
2016-04-04  7:31 ` Matthieu Moy
2016-04-04 16:58   ` Mehul Jain
2016-04-04 17:00   ` Junio C Hamano
2016-04-04 17:07     ` Mehul Jain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1459619912-5445-8-git-send-email-mehul.jain2029@gmail.com \
    --to=mehul.jain2029@gmail.com \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).