From: Kevin Daudt <me@ikke.info>
To: "Junio C. Hamano" <gitster@pobox.com>
Cc: Paul Tan <pyokagan@gmail.com>,
git@vger.kernel.org, Kevin daudt <me@ikke.info>
Subject: [PATCH v2 1/2] t5520-pull: Simplify --rebase with dirty tree test
Date: Sat, 6 Jun 2015 23:12:24 +0200 [thread overview]
Message-ID: <1433625145-29668-1-git-send-email-me@ikke.info> (raw)
In-Reply-To: <1433282157-8171-1-git-send-email-me@ikke.info>
Simplify the test case for testing git aborts the pull --rebase when the
work tree is dirty.
Signed-off-by: Kevin Daudt <me@ikke.info>
Helped-by: Paul Tan <pyokagan@gmail.com>
---
This is a preparation for the next pathch.
Changes since v1:
- Moved the tests just belof the first --rebase test
- Simplified both tests to only test if the rebase either succeded for
failed
t/t5520-pull.sh | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 7efd45b..925ad49 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -122,6 +122,19 @@ test_expect_success '--rebase' '
test $(git rev-parse HEAD^) = $(git rev-parse copy) &&
test new = $(git show HEAD:file2)
'
+
+test_expect_success 'pull --rebase dies early with dirty working directory' '
+ git reset --hard before-rebase &&
+ before=$(git rev-parse --verify before-rebase) &&
+ test_config branch.to-rebase.rebase true &&
+ echo dirty >>file &&
+ cp file expect &&
+ git add file &&
+ test_must_fail git pull . copy &&
+ test $(git rev-parse --verify to-rebase) = $before &&
+ test_cmp file expect
+'
+
test_expect_success 'pull.rebase' '
git reset --hard before-rebase &&
test_config pull.rebase true &&
@@ -278,25 +291,6 @@ test_expect_success 'rebased upstream + fetch + pull --rebase' '
'
-test_expect_success 'pull --rebase dies early with dirty working directory' '
-
- git checkout to-rebase &&
- git update-ref refs/remotes/me/copy copy^ &&
- COPY=$(git rev-parse --verify me/copy) &&
- git rebase --onto $COPY copy &&
- test_config branch.to-rebase.remote me &&
- test_config branch.to-rebase.merge refs/heads/copy &&
- test_config branch.to-rebase.rebase true &&
- echo dirty >> file &&
- git add file &&
- test_must_fail git pull &&
- test $COPY = $(git rev-parse --verify me/copy) &&
- git checkout HEAD -- file &&
- git pull &&
- test $COPY != $(git rev-parse --verify me/copy)
-
-'
-
test_expect_success 'pull --rebase works on branch yet to be born' '
git rev-parse master >expect &&
mkdir empty_repo &&
--
2.4.2
next prev parent reply other threads:[~2015-06-06 21:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 21:55 [PATCH] pull: allow dirty tree when rebase.autostash enabled Kevin Daudt
2015-06-03 4:50 ` Paul Tan
2015-06-06 21:12 ` Kevin Daudt [this message]
2015-06-11 13:20 ` [PATCH v2 1/2] t5520-pull: Simplify --rebase with dirty tree test Paul Tan
2015-06-06 21:12 ` [PATCH v2 2/2] pull: allow dirty tree when rebase.autostash enabled Kevin Daudt
2015-06-11 13:34 ` Paul Tan
2015-06-17 10:40 ` Kevin Daudt
2015-06-17 11:01 ` [PATCH v3] " Kevin Daudt
2015-06-17 15:36 ` Junio C Hamano
2015-07-04 21:00 ` kd/ Kevin Daudt
2015-07-04 21:42 ` [PATCH v4] pull: allow dirty tree when rebase.autostash enabled Kevin Daudt
2015-07-06 20:39 ` Junio C Hamano
2015-07-07 3:59 ` [PATCH v5] " Paul Tan
2015-07-22 19:07 ` Kevin Daudt
2015-07-22 19:42 ` Junio C Hamano
2015-07-22 20:48 ` Kevin Daudt
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433625145-29668-1-git-send-email-me@ikke.info \
--to=me@ikke.info \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pyokagan@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).