From: Jeff King <peff@peff.net>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: Elijah Newren <newren@gmail.com>,
git@vger.kernel.org, gitster@pobox.com,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: [PATCHv2 1/3] t6022: New test checking for unnecessary updates of renamed+modified files
Date: Tue, 1 Mar 2011 14:38:52 -0500 [thread overview]
Message-ID: <20110301193852.GC10082@sigill.intra.peff.net> (raw)
In-Reply-To: <4D6CA13C.1000006@viscovery.net>
On Tue, Mar 01, 2011 at 08:33:16AM +0100, Johannes Sixt wrote:
> > + orig=$(stat --format="%Y" rename) &&
>
> orig=$(test-chmtime -v +0 rename) &&
>
> > + git merge merge-branch-1 &&
> > + new=$(stat --format="%Y" rename) &&
>
> new=$(test-chmtime -v +0 rename) &&
>
> > + echo "Checking whether stat times are same: $orig vs $new" &&
>
> echo "Checking whether stat times are same: ${orig%% *} vs ${new%% *}" &&
>
> (that's TAB after the %%)
>
> > + test "$orig" == "$new" &&
>
> test "${orig%% *}" = "${new%% *}" &&
Maybe this would be simpler as:
test-chmtime -v +0 rename >orig &&
... do the merge ...
test-chmtime -v +0 rename >new &&
test_cmp orig new
And then you don't have to care about the format that test-chmtime
outputs at all, and test_cmp's diff output is usually self-explanatory
when there is a mismatch (it's even better if you name the files
"expect" and "actual").
-Peff
next prev parent reply other threads:[~2011-03-01 19:39 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-01 1:08 [PATCHv2 0/3] Fix unnecessary (mtime) updates of files during merge Elijah Newren
2011-03-01 1:08 ` [PATCHv2 1/3] t6022: New test checking for unnecessary updates of renamed+modified files Elijah Newren
2011-03-01 7:33 ` Johannes Sixt
2011-03-01 19:38 ` Jeff King [this message]
2011-03-02 22:26 ` Elijah Newren
2011-03-01 1:08 ` [PATCHv2 2/3] t6022: New test checking for unnecessary updates of files in D/F conflicts Elijah Newren
2011-03-01 1:08 ` [PATCHv2 3/3] merge-recursive: When we detect we can skip an update, actually skip it Elijah Newren
2011-03-02 20:19 ` Junio C Hamano
2011-03-02 22:22 ` Elijah Newren
2011-03-02 23:23 ` Junio C Hamano
2011-03-01 19:31 ` [PATCHv2 0/3] Fix unnecessary (mtime) updates of files during merge Jeff King
2011-03-01 19:36 ` Jeff King
2011-03-02 23:11 ` Elijah Newren
2011-03-02 23:22 ` Junio C Hamano
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=20110301193852.GC10082@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=newren@gmail.com \
--cc=sfr@canb.auug.org.au \
/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).