From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ronald Weiss Subject: Re: [PATCH v2.1] commit: add --ignore-submodules[=] parameter Date: Tue, 01 Apr 2014 23:59:06 +0200 Message-ID: <533B36AA.3090600@gmail.com> References: <5335A78C.60401@web.de> <53374E49.9000702@gmail.com> <533874F9.3090802@web.de> <5338AC36.6000109@gmail.com> <5338B1B0.3050703@gmail.com> <5339BAE4.8020306@web.de> <5339F122.60801@gmail.com> <5339FBB4.1010101@gmail.com> <533B2036.3050506@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org, Heiko Voigt , Junio C Hamano To: Jens Lehmann X-From: git-owner@vger.kernel.org Tue Apr 01 23:59:19 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WV6iD-0005pA-Km for gcvg-git-2@plane.gmane.org; Tue, 01 Apr 2014 23:59:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751645AbaDAV7L (ORCPT ); Tue, 1 Apr 2014 17:59:11 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:38633 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751626AbaDAV7K (ORCPT ); Tue, 1 Apr 2014 17:59:10 -0400 Received: by mail-wg0-f44.google.com with SMTP id m15so8179189wgh.27 for ; Tue, 01 Apr 2014 14:59:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=l8fHu5foCT9wdVGxzPyN4grq+H8g0nWfZ3evsKLDYuo=; b=fCRwfSQcdIa1QjepwWS/E4zsQ/Sl8FG3eDRIqJiI2gVGTnoe0R0zhugUTbhAsJsCzw TSx94YJ9kVNtUfM41H+1+OSKxHsyN+X/Ensbddq9D4CEwPiIv0X/3dQ6jAUCrCC9MHDi laEx6mAOF9rEqP+1NKd/I5DuPaQMBZ8TyUOL14t7qsXQsQsbFL+aqEMWcorNhvHI7HNv yMQmCVaEuc8fVRpeakWmqbzu3tEUilEZHxuYAXqjKcCv4cYnRAWSMd+BW8oUvPhHGaB0 K79mXMDD9qDXecDFxk5FcMiGOQ2QXRQf50nRdnwv/Kzkfz5uHjM8+1GoicEqaYvlN/08 U6Jw== X-Received: by 10.180.87.164 with SMTP id az4mr23142762wib.2.1396389548909; Tue, 01 Apr 2014 14:59:08 -0700 (PDT) Received: from [10.0.1.226] (chello089173067059.chello.sk. [89.173.67.59]) by mx.google.com with ESMTPSA id e42sm43393808eev.32.2014.04.01.14.59.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Apr 2014 14:59:08 -0700 (PDT) User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 In-Reply-To: <533B2036.3050506@web.de> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On 1. 4. 2014 22:23, Jens Lehmann wrote: > Am 01.04.2014 01:35, schrieb Ronald Weiss: >> On 1. 4. 2014 0:50, Ronald Weiss wrote: >>> On 31. 3. 2014 23:47, Ronald Weiss wrote: >>>> On Mon, Mar 31, 2014 at 8:58 PM, Jens Lehmann wrote: >>>>> As Junio mentioned it would be great if you could teach the add >>>>> command also honor the --ignore-submodule command line option in >>>>> a companion patch. In the course of doing so you'll easily see if >>>>> I was right or not, then please just order them in the most logical >>>>> way. >>>> >>>> Well, if You (or Junio) really don't want my patch without another one >>>> for git add, I may try to do it. However, git add does not even honor >>>> the submodules' ignore setting from .gitmodules (just tested with git >>>> 1.9.1: "git add -u" doesn't honor it, while "git commit -a" does). So >>>> teaching git add the --ignore-submodules switch in current state >>>> doesn't seem right to me. You might propose to add also support for >>>> the ignore setting, to make "add -u" and "commit -a" more consistent. >>>> That seems like a good idea, but the effort needed is getting bigger, >>> >>> Well, now I actually looked at it, and it was pretty easy after all. >>> The changes below seem to enable support for both ignore setting in >>> .gitmodules, and also --ignore-submodules switch, for git add, on top >>> of my patch for commit. >> >> There is a catch. With the changes below, submodules are ignored by add even if explitely named on command line (eg. "git add x" does nothing if x is submodule with new commits, but with ignore=all in .gitmodules). >> That doesn't seem right. >> >> Any ideas, what to do about that? When exactly should such submodule be actually ignored? > > Me thinks git add should require the '-f' option to add an ignored > submodule (just like it does for files) unless the user uses the > '--ignore-submodules=none' option. And if neither of these are given > it should "fail with a list of ignored files" as the documentation > states. It's still not clear, at least not to me. Should '-f' suppress the ignore setting of all involved submodules? That would make it a synonyme (or a superset) of --ignore-submodules=none. Or only if the submodule is explicitly named on command line? That seems fuzzy to me, and also more tricky to implement.