git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Stefan Beller <sbeller@google.com>,
	Johannes Schindelin <johannes.schindelin@gmx.de>,
	Paul Tan <pyokagan@gmail.com>
Subject: [PATCH 6/7] t5520: test --rebase failure on unborn branch with index
Date: Sat,  2 May 2015 23:37:14 +0800	[thread overview]
Message-ID: <1430581035-29464-7-git-send-email-pyokagan@gmail.com> (raw)
In-Reply-To: <1430581035-29464-1-git-send-email-pyokagan@gmail.com>

Commit 19a7fcbf (allow pull --rebase on branch yet to be born) special
cases git-pull on an unborn branch in a different code path such that
git-pull --rebase is still valid even though there is no HEAD yet.

This code path still ensures that there is no index in order not to lose
any staged changes. Implement a test to ensure that this check is
triggered.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
---

I wonder if the .git/index check is still required, as git-read-tree -m
will take into account entries in the index as well.

 t/t5520-pull.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 17c63ff..34f3780 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -417,6 +417,17 @@ test_expect_success 'pull --rebase works on branch yet to be born' '
 	test_cmp expect actual
 '
 
+test_expect_success 'pull --rebase fails on unborn branch with staged changes' '
+	git init empty_repo2 &&
+	test_when_finished "rm -rf empty_repo2" &&
+	(
+		cd empty_repo2 &&
+		echo staged-file >staged-file &&
+		git add staged-file &&
+		test_must_fail git pull --rebase .. master
+	)
+'
+
 test_expect_success 'setup for detecting upstreamed changes' '
 	mkdir src &&
 	(cd src &&
-- 
2.1.4

  parent reply	other threads:[~2015-05-02 15:37 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-02 15:37 [PATCH 0/7] Improve git-pull test coverage Paul Tan
2015-05-02 15:37 ` [PATCH 1/7] t5520: test pulling multiple branches into an empty repository Paul Tan
2015-05-02 15:37 ` [PATCH 2/7] t5520: implement tests for no merge candidates cases Paul Tan
2015-05-04  8:04   ` Matthieu Moy
2015-05-06  6:04     ` Paul Tan
2015-05-06  6:06       ` Paul Tan
2015-05-02 15:37 ` [PATCH 3/7] t5520: test for failure if index has unresolved entries Paul Tan
2015-05-04  8:09   ` Matthieu Moy
2015-05-02 15:37 ` [PATCH 4/7] t5520: test work tree fast-forward when fetch updates head Paul Tan
2015-05-03  2:42   ` Eric Sunshine
2015-05-03  2:47     ` Paul Tan
2015-05-02 15:37 ` [PATCH 5/7] t5520: test --rebase with multiple branches Paul Tan
2015-05-04 17:09   ` Stefan Beller
2015-05-04 19:24     ` Junio C Hamano
2015-05-05 16:00     ` Paul Tan
2015-05-02 15:37 ` Paul Tan [this message]
2015-05-02 15:37 ` [PATCH 7/7] t5521: test --dry-run does not make any changes Paul Tan
2015-05-04  8:16 ` [PATCH 0/7] Improve git-pull test coverage Matthieu Moy
2015-05-04 17:35   ` Junio C Hamano
2015-05-05 10:39     ` Paul Tan
2015-05-06  6:30     ` Paul Tan

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=1430581035-29464-7-git-send-email-pyokagan@gmail.com \
    --to=pyokagan@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    --cc=sbeller@google.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).