Re: git merge commits are non-deterministic? what changed?

2012-11-20 Thread Ulrich Spörlein
On Mon, 2012-11-12 at 12:27:31 +0100, Michael J Gruber wrote: Ulrich Spörlein venit, vidit, dixit 09.11.2012 19:27: On Fri, 2012-11-09 at 11:16:47 -0500, Jeff King wrote: On Fri, Nov 09, 2012 at 04:52:48PM +0100, Matthieu Moy wrote: Ulrich Spörlein u...@spoerlein.net writes: 2. Why

Re: git merge commits are non-deterministic? what changed?

2012-11-20 Thread Junio C Hamano
Ulrich Spörlein u...@spoerlein.net writes: But this will never be changed, it would break the fundamental git storage model as it is in place now. It doesn't just break storage model, but more importantly, it breaks the semantics. Imagine that things started breaking after merging your topic

Re: git merge commits are non-deterministic? what changed?

2012-11-12 Thread Michael J Gruber
Ulrich Spörlein venit, vidit, dixit 09.11.2012 19:27: On Fri, 2012-11-09 at 11:16:47 -0500, Jeff King wrote: On Fri, Nov 09, 2012 at 04:52:48PM +0100, Matthieu Moy wrote: Ulrich Spörlein u...@spoerlein.net writes: 2. Why the hell is the commit hash dependent on the ordering of the parent

git merge commits are non-deterministic? what changed?

2012-11-09 Thread Ulrich Spörlein
Hi all, I'm running a couple of conversions from SVN to git, using a slightly hacked version of svn2git (because it can cope with multiple branches and is several orders of magnitude faster than git-svn). Anyway, when doing some verification runs, using the same version of svn2git, but different

Re: git merge commits are non-deterministic? what changed?

2012-11-09 Thread Andreas Schwab
Ulrich Spörlein u...@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

Re: git merge commits are non-deterministic? what changed?

2012-11-09 Thread Ulrich Spörlein
On Fri, 2012-11-09 at 16:04:31 +0100, Andreas Schwab wrote: Ulrich Spörlein u...@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

Re: git merge commits are non-deterministic? what changed?

2012-11-09 Thread Matthieu Moy
Ulrich Spörlein u...@spoerlein.net writes: 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? Trivially, the hash of the parents itself. So you'd always

Re: git merge commits are non-deterministic? what changed?

2012-11-09 Thread Jeff King
On Fri, Nov 09, 2012 at 04:52:48PM +0100, Matthieu Moy wrote: Ulrich Spörlein u...@spoerlein.net writes: 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

Re: git merge commits are non-deterministic? what changed?

2012-11-09 Thread Ulrich Spörlein
On Fri, 2012-11-09 at 11:16:47 -0500, Jeff King wrote: On Fri, Nov 09, 2012 at 04:52:48PM +0100, Matthieu Moy wrote: Ulrich Spörlein u...@spoerlein.net writes: 2. Why the hell is the commit hash dependent on the ordering of the parent commits? IMHO it should sort the set of parents