From: Jeff King <peff@peff.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: git@vger.kernel.org
Subject: Re: new behaviour in git merge
Date: Thu, 24 Feb 2011 03:15:53 -0500 [thread overview]
Message-ID: <20110224081553.GD25595@sigill.intra.peff.net> (raw)
In-Reply-To: <20110224143353.ddaa316a.sfr@canb.auug.org.au>
On Thu, Feb 24, 2011 at 02:33:53PM +1100, Stephen Rothwell wrote:
> I am not sure when this started, but I think git has changed its behaviour
> when merging. As you all know, I do a lot of merging of trees for
> linux-next each day. Today I noticed that when I merge a tree, sometimes
> the timestamps are modified for files that are not modified on one side
> of the merge. It is not consistent and it is not all the files that are
> modified on the HEAD side (relative to the merge-base).
>
> [...]
>
> I am pretty sure that git did not used to do this. Has anyone else seen
> this? I am running git version 1.7.4.1 from Debian unstable.
I don't think any such change was intentional. I couldn't reproduce
with a trivial example. Can you give the commit IDs of the two heads in
your example merge? I'd like to try bisecting if I can reproduce the
issue.
-Peff
next prev parent reply other threads:[~2011-02-24 8:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-24 3:33 new behaviour in git merge Stephen Rothwell
2011-02-24 8:15 ` Jeff King [this message]
2011-02-24 9:24 ` Stephen Rothwell
2011-02-24 11:52 ` Jeff King
2011-02-26 18:34 ` [RFC PATCH 0/2] Fix unnecessary updates of files during merge Elijah Newren
2011-02-26 18:34 ` [RFC PATCH 1/2] t6022: New test checking for unnecessary updates of renamed+modified files Elijah Newren
2011-02-26 18:34 ` [RFC PATCH 2/2] merge-recursive: When we detect we can skip an update, actually skip it Elijah Newren
2011-02-26 18:43 ` [RFC PATCH 0/2] Fix unnecessary updates of files during merge Elijah Newren
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=20110224081553.GD25595@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--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).