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 0/5] modify tests for --[no-]autostash option
Date: Tue, 29 Mar 2016 18:59:55 +0530	[thread overview]
Message-ID: <1459258200-32444-1-git-send-email-mehul.jain2029@gmail.com> (raw)

The following patch series is applicable on mj/pull-rebase-autostash.

This series contain changes suggested by Eric and Matthieu on following
series

        http://thread.gmane.org/gmane.comp.version-control.git/289434

Changes made:
        * [Patch 4/5] reduces the code needed to test possible
          combinations of --autostash and rebase.autostash by introducing
          two functions.

          Also introduce a loop to tackle the repetitive code used to
          test the usage of --[no-]autostash without --rebase.

        * [Patch 5/5] introduces two new tests to check the cases when
          "git pull --[no-]autostash" is called with pull.rebase=true.


Mehul Jain (5):
  t/t5520: change rebase.autoStash to rebase.autostash
  t/t5520: explicitly unset rebase.autostash
  t/t5520: use test_i18ngrep instead of test_cmp
  t/t5520: modify tests to reduce common code
  t/t5520: test --[no-]autostash with pull.rebase=true

 t/t5520-pull.sh | 120 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 61 insertions(+), 59 deletions(-)

-- 
2.7.1.340.g69eb491.dirty

             reply	other threads:[~2016-03-29 13:30 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-29 13:29 Mehul Jain [this message]
2016-03-29 13:29 ` [PATCH 1/5] t/t5520: change rebase.autoStash to rebase.autostash Mehul Jain
2016-03-29 20:06   ` Eric Sunshine
2016-03-29 13:29 ` [PATCH 2/5] t/t5520: explicitly unset rebase.autostash Mehul Jain
2016-03-29 20:16   ` Eric Sunshine
2016-03-29 13:29 ` [PATCH 3/5] t/t5520: use test_i18ngrep instead of test_cmp Mehul Jain
2016-03-29 20:27   ` Eric Sunshine
2016-03-29 13:29 ` [PATCH 4/5] t/t5520: modify tests to reduce common code Mehul Jain
2016-03-29 20:13   ` Junio C Hamano
2016-03-29 21:01   ` Eric Sunshine
2016-03-29 13:30 ` [PATCH 5/5] t/t5520: test --[no-]autostash with pull.rebase=true Mehul Jain
2016-03-29 21:16   ` Eric Sunshine
2016-03-30 19:00     ` Mehul Jain
2016-03-30 20:31       ` Eric Sunshine
2016-04-01 10:27         ` Mehul Jain
2016-04-03 19:28           ` Eric Sunshine
2016-04-04 16:42             ` Mehul Jain
2016-04-04 16:52               ` Matthieu Moy
2016-04-04 17:36                 ` Mehul Jain
2016-04-04 17:48                   ` Eric Sunshine
2016-04-04 18:25                     ` Matthieu Moy
2016-04-04 18:21                   ` Matthieu Moy

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=1459258200-32444-1-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).