All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jacob Keller <jacob.keller@gmail.com>
Cc: Stefan Beller <sbeller@google.com>,
	Jacob Keller <jacob.e.keller@intel.com>,
	"git\@vger.kernel.org" <git@vger.kernel.org>,
	Stefan Beller <stefanbeller@gmail.com>, Jeff King <peff@peff.net>,
	Johannes Sixt <j6t@kdbg.org>
Subject: Re: [PATCH v10 0/9] submodule inline diff format
Date: Thu, 25 Aug 2016 15:38:50 -0700	[thread overview]
Message-ID: <xmqqr39cjwxx.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CA+P7+xrQy33gt8bnsagLVPAHhZPZx-3s0E_Aj7tOwXnHjOoCBg@mail.gmail.com> (Jacob Keller's message of "Thu, 25 Aug 2016 13:39:18 -0700")

Jacob Keller <jacob.keller@gmail.com> writes:

> So we should support the gitlink to a repository stored at <path>
> without stuff inside the .git/modules, and we should support submodule
> gitlinks with a proper .gitmodules setup. I don't think we should
> die() but we should error properly so I will introduce a _gently()
> variant of these functions, and die properly in the regular flow.

Because "git diff [--cached] [<tree-ish>]" in the top-level is
driven by a gitlink in the index, immediately after adding a new
submodule to the index but before describing it in .gitmodules you
might not have a name (and you know in that case the path will
become the name when adding it to .gitmodules).  Also a gitlink in
the index may correspond to a submodule the user of the top-level is
not interested in, so there may not be anything in .git/modules/
that corresponds to it.  In these cases, I suspect that you do not
want to die, but you can just tell the user "I do not have enough
information to tell you a useful story yet".


  parent reply	other threads:[~2016-08-25 22:45 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-22 23:43 [PATCH v10 0/9] submodule inline diff format Jacob Keller
2016-08-22 23:43 ` [PATCH v10 1/9] Git 2.10-rc1 Jacob Keller
2016-08-23  0:28   ` Stefan Beller
2016-08-23  6:21     ` Jacob Keller
2016-08-22 23:43 ` [PATCH v10 2/9] cache: add empty_tree_oid object and helper function Jacob Keller
2016-08-22 23:43 ` [PATCH v10 3/9] diff.c: remove output_prefix_length field Jacob Keller
2016-08-22 23:43 ` [PATCH v10 4/9] graph: add support for --line-prefix on all graph-aware output Jacob Keller
2016-08-22 23:43 ` [PATCH v10 5/9] diff: prepare for additional submodule formats Jacob Keller
2016-08-22 23:43 ` [PATCH v10 6/9] allow do_submodule_path to work even if submodule isn't checked out Jacob Keller
2016-08-22 23:43 ` [PATCH v10 7/9] submodule: convert show_submodule_summary to use struct object_id * Jacob Keller
2016-08-22 23:43 ` [PATCH v10 8/9] submodule: refactor show_submodule_summary with helper function Jacob Keller
2016-08-23 23:07   ` Junio C Hamano
2016-08-24  6:28     ` Jacob Keller
2016-08-22 23:43 ` [PATCH v10 9/9] diff: teach diff to display submodule difference with an inline diff Jacob Keller
2016-08-23  1:00 ` [PATCH v10 0/9] submodule inline diff format Stefan Beller
2016-08-23  7:23   ` Jacob Keller
2016-08-23 17:25   ` Junio C Hamano
2016-08-23 17:47     ` Stefan Beller
2016-08-25 20:39       ` Jacob Keller
2016-08-25 20:46         ` Stefan Beller
2016-08-25 22:16           ` Jacob Keller
2016-08-25 22:38         ` Junio C Hamano [this message]
2016-08-25 22:46           ` Jacob Keller
2016-08-26 17:35             ` Stefan Beller
2016-08-26 18:26               ` Keller, Jacob E
2016-08-25 20:35     ` Jacob Keller

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=xmqqr39cjwxx.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=j6t@kdbg.org \
    --cc=jacob.e.keller@intel.com \
    --cc=jacob.keller@gmail.com \
    --cc=peff@peff.net \
    --cc=sbeller@google.com \
    --cc=stefanbeller@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.