From: "Carl Fürstenberg" <azatoth@gmail.com>
To: git@vger.kernel.org
Subject: gut submodule update and merge
Date: Thu, 17 Mar 2011 21:16:47 +0100 [thread overview]
Message-ID: <AANLkTimneYSkr11yDt1eL5d-r6pJrt2EMLGEOBfOxOoD@mail.gmail.com> (raw)
Hello,
I've tried to setup in a n makefile a way to easy initialize and
update submodules and at the same time keep eventual changes in the
submodules. I though an "git submodule update --init --recursive
--merge" would work,
but this i notices created strange result if the submodules hadn't
been checked out in the first place. the result then was that it
marked in index all files to be deleted.
This behavior wasn't what I had in mind, and it resulted in I did
following "fix" to resolve the issue (ugly):
https://github.com/azatoth/jquery/commit/9977732a26820dd7f3ced2ce4554edadd62ae52c
Is this the intended behavior? logically I think an clean "git
submodule update --init --merge" should not try to merge if there
wasn't anything to begin with.
/Carl
next reply other threads:[~2011-03-17 20:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-17 20:16 Carl Fürstenberg [this message]
2011-03-18 14:13 ` gut submodule update and merge Carl Fürstenberg
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=AANLkTimneYSkr11yDt1eL5d-r6pJrt2EMLGEOBfOxOoD@mail.gmail.com \
--to=azatoth@gmail.com \
--cc=git@vger.kernel.org \
/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).