From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Jonathan Nieder <jrnieder@gmail.com>, Pete Wyckoff <pw@padd.com>,
git@vger.kernel.org, Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [PATCH] cherry-pick/revert: transparently refresh index
Date: Wed, 03 Nov 2010 10:30:44 -0700 [thread overview]
Message-ID: <7v4obyxqkb.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <201011010909.15198.j6t@kdbg.org> (Johannes Sixt's message of "Mon\, 1 Nov 2010 09\:09\:15 +0100")
Johannes Sixt <j6t@kdbg.org> writes:
> On Windows, this doesn't test what it should test because we do not look at
> the inode number (currently). Please use test-chmtime to change stat
> information.
Like this, perhaps?
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index b210188..a5b963a 100755
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -81,15 +81,12 @@ test_expect_success 'revert after renaming branch' '
'
-test_expect_success 'revert on stat-dirty working tree' '
- git clone . repo &&
- (
- cd repo &&
- git checkout initial
- ) &&
- cp -R repo copy &&
+test_expect_success 'cherry-pick on stat-dirty working tree' '
+ git clone . copy
(
cd copy &&
+ git checkout initial &&
+ test-chmtime +40 oops &&
git cherry-pick added
)
'
next prev parent reply other threads:[~2010-11-03 17:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-31 17:44 index rebuild for cloned repo Pete Wyckoff
2010-10-31 18:07 ` Jonathan Nieder
2010-10-31 19:59 ` [PATCH] cherry-pick/revert: transparently refresh index Jonathan Nieder
2010-10-31 20:26 ` Andreas Schwab
2010-10-31 20:32 ` Jonathan Nieder
2010-10-31 22:26 ` Pete Wyckoff
2010-10-31 22:28 ` [PATCH] teach update-index --refresh about --data-unchanged Pete Wyckoff
2010-11-03 17:37 ` Junio C Hamano
2010-11-03 18:36 ` Jonathan Nieder
2010-11-03 22:02 ` Pete Wyckoff
2010-11-14 16:58 ` Pete Wyckoff
2010-11-14 17:34 ` Jonathan Nieder
2010-11-01 8:09 ` [PATCH] cherry-pick/revert: transparently refresh index Johannes Sixt
2010-11-03 17:30 ` Junio C Hamano [this message]
2010-11-03 20:33 ` Johannes Sixt
2010-11-01 8:44 ` Nguyen Thai Ngoc Duy
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=7v4obyxqkb.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=jrnieder@gmail.com \
--cc=pw@padd.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).