From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Palmer Subject: [PATCH 0/2] merge-tree: fix (merge-base a b) b a Date: Sat, 10 Jul 2010 01:53:49 +0100 Message-ID: <1278723231-24802-1-git-send-email-wmpalmer@gmail.com> Cc: wmpalmer@gmail.com, gitster@pobox.com To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Jul 10 02:54:26 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OXOKl-0002Hh-9V for gcvg-git-2@lo.gmane.org; Sat, 10 Jul 2010 02:54:23 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751242Ab0GJAyS (ORCPT ); Fri, 9 Jul 2010 20:54:18 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:65329 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750862Ab0GJAyR (ORCPT ); Fri, 9 Jul 2010 20:54:17 -0400 Received: by wwb24 with SMTP id 24so5477771wwb.1 for ; Fri, 09 Jul 2010 17:54:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=FReEyNSRMYQhS/9f5otIWFlZ5MW9rAJvL6aB4L39bpM=; b=sJpvpsIDEGFzB+uACdMvS/zfufACRbDkyr6LBrsbpdaDz+KkWFncV0mxdQ7GZE83qt uewFd/EEugcmbcnc2wPtY99k0ce22VHJr+0FgY49g4uQJQkwe8MHGjJtGY18e6thjF7T mVyOMMwq/kPHcGINBdhpyEtpAtPwIXREr5JRQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=sDThQpENarK6xYFo8G+ZPjj8h1Y6t7G3UyN0/ISXegpPx1uAgxvM/EIzlqzFTInhrv aaJ1k/07Pt4B0MANg4fKL1bqux6bv4T5jOUNV0ADRs9ers2j5ksDU87LVfmVyrFtnz8u 2eVCHU9rWuzYzygvHPgqkx7lpyg0SB742zP0s= Received: by 10.227.134.2 with SMTP id h2mr9098194wbt.196.1278723255788; Fri, 09 Jul 2010 17:54:15 -0700 (PDT) Received: from localhost.localdomain (5acc3a9a.bb.sky.com [90.204.58.154]) by mx.google.com with ESMTPS id i25sm10539963wbi.4.2010.07.09.17.54.14 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 09 Jul 2010 17:54:15 -0700 (PDT) X-Mailer: git-send-email 1.7.1.703.g42c01 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This series notes, then fixes, a regression introduced by 15b4f7a68d8c3c8ee28424415b203f61202d65d1 / merge-tree: use ll_merge() not xdl_merge() I don't know the proper terminology to describe what's being fixed here. This seems to most-easily be triggered by (for example): git merge-tree $(git merge-base HEAD @{u}) HEAD @{u} In the git repository at the moment, this could be triggered with: git merge-tree $(git merge-base origin/next origin/master) \ origin/next origin/master Though as I write this, next has only just been merged with master, so that is not the case. For an example which is less likely to go away, try: git merge-tree c9eaaab4165d8f402930d12899ec097495b599e6 \ be16ac8cc8ce693c6adf37b80db65d10a41b4eb9 \ 9918285fb10d81af9021dae99c5f4de88ded497c It's actually very trivial to reproduce this, to the point where I can't help but wonder how much merge-tree is actually being used. As I narrowed the test-case more and more, I was surprised by how little it took to trigger it. The first patch in this series includes some very basic tests for merge-tree, the last of which demonstrates the regression. The second patch implements the trivial fix for it. Will Palmer (2): add basic tests for merge-tree fix merge-tree where two branches share no changes builtin/merge-tree.c | 3 ++- t/t4300-merge-tree.sh | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletions(-) create mode 100755 t/t4300-merge-tree.sh -- 1.7.1.703.g42c01