From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH v2 2/2] gitk: add --no-replace-objects option Date: Wed, 18 Nov 2009 07:50:59 +0100 Message-ID: <20091118065100.4206.48820.chriscool@tuxfamily.org> Cc: git@vger.kernel.org, Michael J Gruber , Jakub Narebski , Johannes Sixt , bill lam , Andreas Schwab , Paul Mackerras To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Nov 18 07:50:14 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1NAeMn-0000qi-70 for gcvg-git-2@lo.gmane.org; Wed, 18 Nov 2009 07:50:13 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754179AbZKRGt6 (ORCPT ); Wed, 18 Nov 2009 01:49:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753666AbZKRGt5 (ORCPT ); Wed, 18 Nov 2009 01:49:57 -0500 Received: from smtp3-g21.free.fr ([212.27.42.3]:59506 "EHLO smtp3-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752846AbZKRGt4 (ORCPT ); Wed, 18 Nov 2009 01:49:56 -0500 Received: from smtp3-g21.free.fr (localhost [127.0.0.1]) by smtp3-g21.free.fr (Postfix) with ESMTP id 47F698180D1; Wed, 18 Nov 2009 07:49:53 +0100 (CET) Received: from bureau.boubyland (gre92-7-82-243-130-161.fbx.proxad.net [82.243.130.161]) by smtp3-g21.free.fr (Postfix) with ESMTP id 3C9B8818076; Wed, 18 Nov 2009 07:49:51 +0100 (CET) X-git-sha1: 87cadea848c43fdb97799c3fba2a0130c44c5c9a X-Mailer: git-mail-commits v0.5.2 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This option simply sets the GIT_NO_REPLACE_OBJECTS environment variable, and that is enough to make gitk ignore replace refs. The GIT_NO_REPLACE_OBJECTS is set to "1" instead of "" as it is safer on some platforms, thanks to Johannes Sixt and Michael J Gruber. Tested-by: Michael J Gruber Signed-off-by: Christian Couder --- gitk-git/gitk | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/gitk-git/gitk b/gitk-git/gitk index a0214b7..c586b93 100644 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -128,7 +128,7 @@ proc unmerged_files {files} { } proc parseviewargs {n arglist} { - global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs + global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs env set vdatemode($n) 0 set vmergeonly($n) 0 @@ -208,6 +208,9 @@ proc parseviewargs {n arglist} { # git rev-parse doesn't understand --merge lappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD } + "--no-replace-objects" { + set env(GIT_NO_REPLACE_OBJECTS) "1" + } "-*" { # Other flag arguments including - if {[string is digit -strict [string range $arg 1 end]]} { -- 1.6.5.1.gaf97d