From: Jens Lehmann <Jens.Lehmann@web.de>
To: "Spencer E. Olson" <olsonse@umich.edu>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/2 (v2)] submodule: no [--merge|--rebase] when newly cloned
Date: Thu, 17 Feb 2011 20:41:58 +0100 [thread overview]
Message-ID: <4D5D7A06.6050700@web.de> (raw)
In-Reply-To: <1297959526-8089-1-git-send-email-olsonse@umich.edu>
Am 17.02.2011 17:18, schrieb Spencer E. Olson:
> Previously, when a new submodule is cloned by running "git submodule update
> [--merge|--rebase]", the newly cloned submodule does not get checked out and a
> rebase or merge is incorrectly attempted against an empty working directory.
> This patch ignores --rebase or --merge for new submodules and instead simply
> checks out the appropriate revision.
Nice work, thanks!
Just a small thing: This problem also happens when the configuration
"submodule.<name>.update" is set to either "rebase" or "merge", not only
when using the command line options. So perhaps you could reword the topic
to something like "submodule: don't merge or rebase when newly cloned" and
adjust both commit messages a bit?
Apart from that:
Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
next prev parent reply other threads:[~2011-02-17 19:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-17 16:18 [PATCH 1/2 (v2)] submodule: no [--merge|--rebase] when newly cloned Spencer E. Olson
2011-02-17 16:18 ` [PATCH 2/2 (v2)] t7406: "git submodule update {--merge|--rebase]" with new submodules Spencer E. Olson
2011-02-17 19:43 ` Jens Lehmann
2011-02-17 20:18 ` Junio C Hamano
2011-02-17 21:39 ` Jens Lehmann
2011-02-17 19:41 ` Jens Lehmann [this message]
2011-02-17 20:25 ` [PATCH 1/2 (v2)] submodule: no [--merge|--rebase] when newly cloned Junio C Hamano
2011-02-17 22:17 ` Spencer E. Olson
2011-02-17 23:37 ` Junio C Hamano
2011-02-17 23:50 ` Spencer E. Olson
2011-02-17 20:02 ` 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=4D5D7A06.6050700@web.de \
--to=jens.lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=olsonse@umich.edu \
/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).