From: Jens Lehmann <Jens.Lehmann@web.de>
To: Nicolas Morey-Chaisemartin <nmorey@kalray.eu>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] git-submodule.sh: Handle submodules with merge conflicts
Date: Tue, 22 Mar 2011 20:22:23 +0100 [thread overview]
Message-ID: <4D88F6EF.3020804@web.de> (raw)
In-Reply-To: <4D886430.3080300@kalray.eu>
Thanks, that fixes it nicely!
Am 22.03.2011 09:56, schrieb Nicolas Morey-Chaisemartin:
> During a merge with conflict on a submodule, the submodule appears 3 times in git ls-files (stage 1,2,3) which caused the submodule to be used 3 times in git submodule init, sync, update and status command.
> This patch filters the results of git ls-files to generate a single entry for conflicting submodules with a 0 SHA1 and 'U' as stage.
Nit: Usually we wrap commit messages at about 72 characters.
> After this patch:
> - init and sync behave as previously but only once per submodule
> - update skips submodule with merge conflicts
> - status now display a null SHA1 prefixed by 'U' for submodule with merge conflicts
A test case would be nice (t7405 looks like the right spot for one).
next prev parent reply other threads:[~2011-03-22 19:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-22 8:56 [PATCH 1/2] git-submodule.sh: Handle submodules with merge conflicts Nicolas Morey-Chaisemartin
2011-03-22 19:22 ` Jens Lehmann [this message]
2011-03-22 21:41 ` Junio C Hamano
2011-03-24 6:58 ` Nicolas Morey-Chaisemartin
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=4D88F6EF.3020804@web.de \
--to=jens.lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=nmorey@kalray.eu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.