From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, hvoigt@hvoigt.net, dborowitz@google.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCH] transport submodules: correct error message
Date: Fri, 13 Jan 2017 15:54:27 -0800 [thread overview]
Message-ID: <20170113235427.5768-1-sbeller@google.com> (raw)
When push.recurseSubmodules is set to "check" or "on-demand", the transport
layer tries to determine if a submodule needs pushing. This check is done
by walking all remote refs that are known.
For remotes we only store the refs/heads/* (and tags), which doesn't
include all commits. In e.g. Gerrit commits often end up at refs/changes/*
(that we do not store) when pushing to refs/for/master (which we also do
not store). So a workflow such as the following still fails:
$ git -C <submodule> push origin HEAD:refs/for/master
$ git push origin HEAD:refs/for/master
The following submodule paths contain changes that can
not be found on any remote:
submodule
Please try
git push --recurse-submodules=on-demand
or cd to the path and use
git push
to push them to a remote.
Trying to push with --recurse-submodules=on-demand would run into
the same problem. To fix this issue
1) specifically mention that we looked for branches on the remote.
2) advertise pushing without recursing into submodules. ("Use this
command to make the error message go away")
While at it, remove some empty lines, as they blow up the error message.
Reported-by: Dave Borowitz <dborowitz@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
transport.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/transport.c b/transport.c
index 3e8799a611..2445bf0dca 100644
--- a/transport.c
+++ b/transport.c
@@ -883,14 +883,14 @@ static void die_with_unpushed_submodules(struct string_list *needs_pushing)
int i;
fprintf(stderr, _("The following submodule paths contain changes that can\n"
- "not be found on any remote:\n"));
+ "not be found on any remote branch:\n"));
for (i = 0; i < needs_pushing->nr; i++)
fprintf(stderr, " %s\n", needs_pushing->items[i].string);
- fprintf(stderr, _("\nPlease try\n\n"
- " git push --recurse-submodules=on-demand\n\n"
- "or cd to the path and use\n\n"
- " git push\n\n"
- "to push them to a remote.\n\n"));
+ fprintf(stderr, _("\nSuppress submodule checks via\n"
+ " git push --no-recurse-submodules\n"
+ "or cd to the path and use\n"
+ " git push\n"
+ "to push them to a remote.\n"));
string_list_clear(needs_pushing, 0);
--
2.11.0.297.g298debce27
next reply other threads:[~2017-01-13 23:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-13 23:54 Stefan Beller [this message]
2017-01-17 23:42 ` [PATCH] transport submodules: correct error message Junio C Hamano
2017-01-18 0:08 ` Stefan Beller
2017-01-18 0:15 ` Junio C Hamano
2017-01-18 0:21 ` 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
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=20170113235427.5768-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=dborowitz@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.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.
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).