From: Charles Bailey <charles@hashpling.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Slightly obscure merge-file inconsistency
Date: Mon, 25 May 2009 01:21:12 +0100 [thread overview]
Message-ID: <1243210874-18451-1-git-send-email-charles@hashpling.org> (raw)
This was spotted by someone on stackoverflow.com.
It seems that git merge-file will wipe the merged file in the
degenerate case when all the inputs have identical contents. As
far as I can tell this is a bug, albeit one which will never be
triggered in practice because merge-file won't ever be called on
files that are identical in base, local and remote versions.
I think that the problem is just an overzealous null check in
xdl_merge. Certainly with the fix, the test suite still passes but
there may be some use cases of xdl_merge that I'm not aware of
that rely on the current behaviour.
http://stackoverflow.com/questions/903966/
next reply other threads:[~2009-05-25 0:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-25 0:21 Charles Bailey [this message]
2009-05-25 0:21 ` [PATCH 1/2] merge-file fails to output anything for a degenerate merge Charles Bailey
2009-05-25 0:21 ` [PATCH 2/2] Change xdl_merge to generate output even for null merges Charles Bailey
2009-05-25 7:51 ` Johannes Schindelin
2009-05-25 7:52 ` [PATCH 1/2] merge-file fails to output anything for a degenerate merge Johannes Schindelin
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=1243210874-18451-1-git-send-email-charles@hashpling.org \
--to=charles@hashpling.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).