From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Shawn O. Pearce" Subject: Re: [PATCH (GIT-GUI)] git-gui: Reenable staging unmerged files by clicking the icon. Date: Wed, 24 Sep 2008 11:25:08 -0700 Message-ID: <20080924182508.GC3669@spearce.org> References: <200809201219.18630.angavrilov@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: git@vger.kernel.org, Johannes Sixt To: Alexander Gavrilov X-From: git-owner@vger.kernel.org Wed Sep 24 20:26:24 2008 connect(): Connection refused Return-path: 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 1KiZ4C-0008Kq-9r for gcvg-git-2@gmane.org; Wed, 24 Sep 2008 20:26:24 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753352AbYIXSZL (ORCPT ); Wed, 24 Sep 2008 14:25:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753023AbYIXSZK (ORCPT ); Wed, 24 Sep 2008 14:25:10 -0400 Received: from george.spearce.org ([209.20.77.23]:46928 "EHLO george.spearce.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752856AbYIXSZJ (ORCPT ); Wed, 24 Sep 2008 14:25:09 -0400 Received: by george.spearce.org (Postfix, from userid 1001) id F12233835F; Wed, 24 Sep 2008 18:25:08 +0000 (UTC) Content-Disposition: inline In-Reply-To: <200809201219.18630.angavrilov@gmail.com> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Alexander Gavrilov wrote: > This restores functionality of the file icon for unmerged files. > Safety is enforced by loading the diff and checking for lines > that look like conflict markers. If such lines are found, or > the conflict involves deletion and/or symlinks, a confirmation > dialog is presented. Otherwise, the icon immediately stages the > working copy version of the file. > > Includes a revert of 2fe5b2ee42897a3acc78e5ddaace3775eb2713ca > (Restore ability to Stage Working Copy for conflicts) > > Signed-off-by: Alexander Gavrilov > --- > git-gui.sh | 18 ++++++++---------- > lib/diff.tcl | 52 +++++++++++++++++++++++++++++++++++----------------- > lib/mergetool.tcl | 33 +++++++++++++++++++++++++++------ > 3 files changed, 70 insertions(+), 33 deletions(-) Can I get a resend of this patch? I don't seem to have the base objects it applies to, and it doesn't apply clean to any branch I can find... :-| -- Shawn.