From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Riesen <raa.lkml@gmail.com>
Subject: Re: [PATCH] Remove empty directories in recursive merge
Date: Thu, 25 Sep 2008 22:33:29 +0200
Message-ID: <20080925203329.GC3959@blimp.localhost>
References: <87k5d1v71l.fsf@cup.kalibalik.dk> <20080925201245.GB3959@blimp.localhost>
Reply-To: Alex Riesen <raa.lkml@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
	Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
X-From: git-owner@vger.kernel.org Thu Sep 25 22:35:10 2008
connect(): Connection refused
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1KixYA-0002ZY-Go
	for gcvg-git-2@gmane.org; Thu, 25 Sep 2008 22:34:59 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754907AbYIYUde (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Thu, 25 Sep 2008 16:33:34 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754244AbYIYUdc
	(ORCPT <rfc822;git-outgoing>); Thu, 25 Sep 2008 16:33:32 -0400
Received: from mo-p05-ob.rzone.de ([81.169.146.181]:45865 "EHLO
	mo-p05-ob.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753976AbYIYUdb (ORCPT <rfc822;git@vger.kernel.org>);
	Thu, 25 Sep 2008 16:33:31 -0400
X-RZG-CLASS-ID: mo05
X-RZG-AUTH: :Pm0FVUW6aauhRGJJc5OfA4AU8DM8ZlijdmJYxKn/UQvEQQx8AE81p7LJ
Received: from tigra.home (Fab79.f.strato-dslnet.de [195.4.171.121])
	by post.webmailer.de (fruni mo52) (RZmta 17.4)
	with ESMTP id B03a87k8PJvkF9 ; Thu, 25 Sep 2008 22:33:29 +0200 (MEST)
	(envelope-from: <raa.lkml@gmail.com>)
Received: from blimp (unknown [192.168.0.8])
	by tigra.home (Postfix) with ESMTP id 65D35277AE;
	Thu, 25 Sep 2008 22:33:29 +0200 (CEST)
Received: by blimp (Postfix, from userid 1000)
	id 5C4C936D1E; Thu, 25 Sep 2008 22:33:29 +0200 (CEST)
Content-Disposition: inline
In-Reply-To: <20080925201245.GB3959@blimp.localhost>
User-Agent: Mutt/1.5.17+20080114 (2008-01-14)
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/96794>

Alex Riesen, Thu, Sep 25, 2008 22:12:45 +0200:
> The code was actually supposed to do that, but was accidentally broken.
> Noticed by Anders Melchiorsen.
> 
> Signed-off-by: Alex Riesen <raa.lkml@gmail.com>

Shawn, the change is intentionally based on Junios master,
so people can just apply it. But if you wish, I can rebase it on top
of Miklos' patches.