From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Jens.Lehmann@web.de, apenwarr@gmail.com,
jrnieder@gmail.com, Stefan Beller <sbeller@google.com>
Subject: [PATCHv4 {6,7}/7] submodule update: allow '.' for branch value
Date: Wed, 3 Aug 2016 13:44:02 -0700 [thread overview]
Message-ID: <20160803204404.3356-1-sbeller@google.com> (raw)
This replaces the last two commits of sb/submodule-update-dot-branch.
Thanks Jeff for pointing out the possible segfault.
In the last commit I removed commented code in the test.
Thanks,
Stefan
diff to sb/submodule-update-dot-branch:
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index ae88eff..f1acc4d 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -906,6 +906,9 @@ static const char *remote_submodule_branch(const char *path)
git_config(submodule_config, NULL);
sub = submodule_from_path(null_sha1, path);
+ if (!sub)
+ return NULL;
+
if (!sub->branch)
return "master";
@@ -933,11 +936,16 @@ static const char *remote_submodule_branch(const char *path)
static int resolve_remote_submodule_branch(int argc, const char **argv,
const char *prefix)
{
+ const char *ret;
struct strbuf sb = STRBUF_INIT;
if (argc != 2)
die("submodule--helper remote-branch takes exactly one arguments, got %d", argc);
- printf("%s", remote_submodule_branch(argv[1]));
+ ret = remote_submodule_branch(argv[1]);
+ if (!ret)
+ die("submodule %s doesn't exist", argv[1]);
+
+ printf("%s", ret);
strbuf_release(&sb);
return 0;
}
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 1c4c1f2..d7983cf 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -238,7 +238,6 @@ test_expect_success 'submodule update --remote should fetch upstream changes wit
test_cmp expect actual &&
git checkout master &&
git branch -d test-branch &&
- #~ git -C ../submodule branch -d test-branch &&
git reset --hard HEAD^
)
'
Stefan Beller (2):
submodule--helper: add remote-branch helper
submodule update: allow '.' for branch value
builtin/submodule--helper.c | 54 ++++++++++++++++++++++++++++++++++++++++++++-
git-submodule.sh | 2 +-
t/t7406-submodule-update.sh | 35 ++++++++++++++++++++++++++++-
3 files changed, 88 insertions(+), 3 deletions(-)
--
2.9.2.524.gdbd1860
next reply other threads:[~2016-08-03 20:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-03 20:44 Stefan Beller [this message]
2016-08-03 20:44 ` [PATCHv4 6/7] submodule--helper: add remote-branch helper Stefan Beller
2016-08-03 23:13 ` Junio C Hamano
2016-08-03 23:22 ` Stefan Beller
2016-08-03 20:44 ` [PATCHv4 6/7] submodule update: allow '.' for branch value Stefan Beller
2016-08-03 23:14 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160803204404.3356-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).