From: Andreas Schwab <schwab@linux-m68k.org>
To: "Ulrich Spörlein" <uqs@spoerlein.net>
Cc: git@vger.kernel.org
Subject: Re: git merge commits are non-deterministic? what changed?
Date: Fri, 09 Nov 2012 16:04:31 +0100 [thread overview]
Message-ID: <m2y5iarf5s.fsf@igel.home> (raw)
In-Reply-To: <20121109133132.GK69724@acme.spoerlein.net> ("Ulrich Spörlein"'s message of "Fri, 9 Nov 2012 14:31:32 +0100")
Ulrich Spörlein <uqs@spoerlein.net> writes:
> Two questions:
> 1. Can we impose a stable ordering of the commits being recorded in a
> merge commit? Listing parents in chronological order or something like
> that.
The order is determined by the order the refs are given to git merge (or
git commit-tree when using the plumbing).
> 2. Why the hell is the commit hash dependent on the ordering of the
> parent commits? IMHO it should sort the set of parents before
> calculating the hash ...
What would be the sort key?
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2012-11-09 15:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-09 13:31 git merge commits are non-deterministic? what changed? Ulrich Spörlein
2012-11-09 15:04 ` Andreas Schwab [this message]
2012-11-09 15:42 ` Ulrich Spörlein
2012-11-09 15:52 ` Matthieu Moy
2012-11-09 16:16 ` Jeff King
2012-11-09 18:27 ` Ulrich Spörlein
2012-11-12 11:27 ` Michael J Gruber
2012-11-20 16:22 ` Ulrich Spörlein
2012-11-20 20:39 ` 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=m2y5iarf5s.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=git@vger.kernel.org \
--cc=uqs@spoerlein.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.