From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johan Herland <johan@herland.net>,
A Large Angry SCM <gitzilla@gmail.com>, git <git@vger.kernel.org>
Subject: Re: Latest master failing t7401 submodule tests
Date: Wed, 3 Mar 2010 17:57:44 -0500 [thread overview]
Message-ID: <20100303225744.GA26575@coredump.intra.peff.net> (raw)
In-Reply-To: <7vzl2phz8e.fsf@alter.siamese.dyndns.org>
On Wed, Mar 03, 2010 at 01:28:01PM -0800, Junio C Hamano wrote:
> Continuing to mutter to myself... I am suspecting that the right solution
> to the issue $gmane/140066 raised may be your "dwim-ref fix in 003c6ab
> (dwim_ref: fix dangling symref warning, 2010-02-16) and a patch along the
> line of the attached (with 3deea89 reverted of course).
I am totally clueless about submodules, not having ever actually used
them myself. So I will let others weigh in on whether "git submodule
summary" on an unborn branch makes any sense. But:
1. _if_ it is not a sensible thing, then your patch below:
> diff --git a/wt-status.c b/wt-status.c
> index 5807fc3..1cca3aa 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -476,6 +476,9 @@ static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitt
> NULL
> };
>
> + if (s->is_initial && !uncommitted)
> + return;
> +
> sprintf(summary_limit, "%d", s->submodule_summary);
> snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file);
Seems like the right thing, to protect git-status users.
2. If it is sensible, then the hunk we both posted (to check for args
before shift) makes sense to me. Whether the "compare against empty
tree" bit makes sense is beyond my submodule cluelessness to
determine (but it intuitively sounds right to me).
In either case, I think that:
> We _might_ also want to revert 003c6ab, though it is more or less an
> independent issue.
reverting 003c6ab is not a good idea. As far as I am concerned, it was a
bugfix.
-Peff
next prev parent reply other threads:[~2010-03-03 22:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-03 12:21 Latest master failing t7401 submodule tests A Large Angry SCM
2010-03-03 19:45 ` Junio C Hamano
2010-03-03 20:02 ` Jeff King
2010-03-03 20:32 ` Junio C Hamano
2010-03-03 20:42 ` Jeff King
2010-03-03 21:04 ` Junio C Hamano
2010-03-03 21:28 ` Junio C Hamano
2010-03-03 21:58 ` What should "git submodule summary" give before an initial commit? Junio C Hamano
2010-03-03 23:10 ` Johan Herland
2010-03-04 0:36 ` Jens Lehmann
2010-03-04 6:01 ` Sverre Rabbelier
2010-03-04 6:22 ` Junio C Hamano
2010-03-04 6:36 ` Sverre Rabbelier
2010-03-04 6:43 ` Junio C Hamano
2010-03-04 6:48 ` Sverre Rabbelier
2010-03-03 22:57 ` Jeff King [this message]
2010-03-03 20:52 ` Latest master failing t7401 submodule tests Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100303225744.GA26575@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=gitzilla@gmail.com \
--cc=johan@herland.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).