From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Lehmann Subject: Re: [PATCH v3 3/4] get rid of "git submodule summary --for-status" Date: Fri, 30 Aug 2013 22:08:53 +0200 Message-ID: <5220FBD5.6020807@web.de> References: <1377781536-31955-1-git-send-email-Matthieu.Moy@imag.fr> <1377781536-31955-4-git-send-email-Matthieu.Moy@imag.fr> <521FA6ED.9010005@web.de> <5220F539.9050700@web.de> <5220F7D7.2000300@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: Matthieu Moy , git@vger.kernel.org, gitster@pobox.com, "brian m. carlson" To: Jens Lehmann X-From: git-owner@vger.kernel.org Fri Aug 30 22:09:06 2013 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 1VFV0B-0004ZL-IJ for gcvg-git-2@plane.gmane.org; Fri, 30 Aug 2013 22:09:03 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755771Ab3H3UI7 (ORCPT ); Fri, 30 Aug 2013 16:08:59 -0400 Received: from mout.web.de ([212.227.15.14]:59553 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755750Ab3H3UI4 (ORCPT ); Fri, 30 Aug 2013 16:08:56 -0400 Received: from [192.168.178.41] ([91.3.174.105]) by smtp.web.de (mrweb001) with ESMTPA (Nemesis) id 0MWAtV-1VV2id15Yn-00XMLO for ; Fri, 30 Aug 2013 22:08:55 +0200 User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 In-Reply-To: <5220F7D7.2000300@web.de> X-Enigmail-Version: 1.5.2 X-Provags-ID: V03:K0:BBhNXNsm+T4Pw9gTWnMPQ1wcVCWwcXFJAQZJFc2B4ypJ9QFlh7+ /3D7SscbTO1nGpMl4Ut7kPa1n1sUCJef81J3AG9wYJgFbxyQcBZQPGFIjlkGWaYH0iTIadl TO4QwdRt+5abUInFWKksday0pceHOthrCUhNNwoznBwi9fAVY5L7tTyLLEAIGYiWhu4YHnX yIpJi1lCxi25HTpYjGeuQ== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Am 30.08.2013 21:51, schrieb Jens Lehmann: > Am 30.08.2013 21:40, schrieb Jens Lehmann: >> Am 29.08.2013 23:23, schrieb Matthieu Moy: >>> Jens Lehmann writes: >>> >>>> Am 29.08.2013 15:05, schrieb Matthieu Moy: >>>>> The --for-status option was an undocumented option used only by >>>>> wt-status.c, which inserted a header and commented out the output. We can >>>>> achieve the same result within wt-status.c, without polluting the >>>>> submodule command-line options. >>>>> >>>>> This will make it easier to disable the comments from wt-status.c later. >>>> >>>> Cool, thanks for implementing this! >>>> >>>> But unfortunately this change collides with bc/submodule-status-ignored >>>> (I added Brian to the CC) which is currently on its way to next. >>> >>> Thanks for pointing that out. The patch looks buggy: >> >> Ok, I'll tak > > Sorry, I accidentally hit "Send" ... :-( > > Ok, I'll take a look and will comment on that soon. > >>> --- a/git-submodule.sh >>> +++ b/git-submodule.sh >>> @@ -1036,6 +1036,13 @@ cmd_summary() { >>> do >>> # Always show modules deleted or type-changed (blob<->module) >>> test $status = D -o $status = T && echo "$sm_path" && continue >>> + # Respect the ignore setting for --for-status. >>> + if test -n $for_status >>> + then >>> + name=$(module_name "$sm_path") >>> + ignore_config=$(get_submodule_config "$name" ignore none) >>> + test $status != A -a $ignore_config = all && continue >>> + fi >>> >>> Because of the missing quotes around $for_status, it seems the test is >>> unconditionnaly true: >>> >>> $ test -n t ; echo $? >>> 0 >>> $ test -n ; echo $? >>> 0 Right you are, I did not notice the missing "" in my review. Looks like we also should add one or more tests making sure that submodule summary and status never honor the ignore settings.