From: Stefan Beller <sbeller@google.com>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Git List" <git@vger.kernel.org>,
"Lars Schneider" <larsxschneider@gmail.com>,
"René Scharfe" <l.s.r@web.de>
Subject: Re: [PATCH 1/3] submodule-config: passing name reference for .gitmodule blobs
Date: Thu, 28 Jul 2016 09:26:26 -0700 [thread overview]
Message-ID: <CAGZ79kbjDvOziGn+202gOc19Y6omwin9CGhhL3YydS=1qSPjwg@mail.gmail.com> (raw)
In-Reply-To: <20160728124910.GA2530@sandbox>
On Thu, Jul 28, 2016 at 5:49 AM, Heiko Voigt <hvoigt@hvoigt.net> wrote:
> Commit 959b5455 (submodule: implement a config API for lookup of
> .gitmodules values, 2015-08-18) implemented the initial version of the
> submodule config cache. During development of that initial version we
> extracted the function gitmodule_sha1_from_commit(). During that process
> we missed that the strbuf rev was still used in config_from() and now is
> left empty. Lets fix this by also returning this string.
>
> This means that now when reading .gitmodules from revisions, the error
> messages also contain a reference to the blob they are from.
>
> Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
> ---
> Here you go. Now including a test.
All 3 patches look good to me, thanks!
>
> +test_expect_success 'error message contains blob reference' '
> + (cd super &&
> + sha1=$(git rev-parse HEAD) &&
> + test-submodule-config \
> + HEAD b \
> + HEAD submodule \
> + 2>actual_err &&
> + grep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
Makes sense!
next prev parent reply other threads:[~2016-07-28 16:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-19 19:05 [PATCH] submodule-config: use explicit empty string instead of strbuf in config_from() René Scharfe
2016-07-19 19:15 ` Junio C Hamano
2016-07-19 19:24 ` Stefan Beller
2016-07-20 8:25 ` Heiko Voigt
2016-07-21 18:57 ` René Scharfe
2016-07-25 14:37 ` Heiko Voigt
2016-07-25 14:58 ` Junio C Hamano
2016-07-26 9:49 ` [PATCH 1/2] fix passing a name for config from submodules Heiko Voigt
2016-07-26 17:22 ` Stefan Beller
2016-07-26 22:02 ` Junio C Hamano
2016-07-28 12:49 ` [PATCH 1/3] submodule-config: passing name reference for .gitmodule blobs Heiko Voigt
2016-07-28 16:26 ` Stefan Beller [this message]
2016-07-28 12:49 ` [PATCH 2/3] submodule-config: combine early return code into one goto Heiko Voigt
2016-07-28 12:50 ` [PATCH 3/3] submodule-config: fix test binary crashing when no arguments given Heiko Voigt
2016-07-28 11:17 ` [PATCH 1/2] fix passing a name for config from submodules Heiko Voigt
2016-07-28 12:55 ` [PATCH] document how to reference previous commits Heiko Voigt
2016-07-28 15:38 ` Junio C Hamano
2016-07-28 15:57 ` Stefan Beller
2016-08-17 11:36 ` Heiko Voigt
2016-08-17 17:45 ` Junio C Hamano
2016-07-28 14:59 ` [PATCH 1/2] fix passing a name for config from submodules Junio C Hamano
2016-07-26 9:49 ` [PATCH 2/2] submodule-config: combine error checking if clauses Heiko Voigt
2016-07-26 17:24 ` Stefan Beller
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='CAGZ79kbjDvOziGn+202gOc19Y6omwin9CGhhL3YydS=1qSPjwg@mail.gmail.com' \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=l.s.r@web.de \
--cc=larsxschneider@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 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).