<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><br class=""><div><blockquote type="cite" class=""><div class="">On 31 Jul 2017, at 10:58, Frediano Ziglio <<a href="mailto:fziglio@redhat.com" class="">fziglio@redhat.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div style="" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class=""><br class="">Hi<br class=""><br class="">----- Original Message -----<br class=""><blockquote type="cite" class="">From: Christophe de Dinechin <<a href="mailto:dinechin@redhat.com" class="">dinechin@redhat.com</a>><br class=""><br class="">By default, subdmodules will be checked out in detached state.<br class="">This means that you may lose some work in progress.<br class=""></blockquote><br class="">Lose is a bit strong here.<br class=""><br class="">If you have uncommitted changes, submodule update will fail.<br class=""><br class=""></blockquote><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">This to me seems a good reason for a nack. The update will fail as</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">a normal conflict without loosing any work.</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""></div></div></blockquote><div><br class=""></div><div>Only if you have uncommitted changes. Otherwise, you end up</div><div>in detached head state. That’s OK if I run git submodule update</div><div>myself, I know what I’m doing. I’m more concerned about a builds script</div><div>doing that for me.</div><div><br class=""></div><div>IOW, I don’t want to have some work in a submodule in branch “topic”,</div><div>and just because I ran autogen.sh, end up in detached head state with</div><div>a detached head that does not even contain my topic.</div><div><br class=""></div><blockquote type="cite" class=""><div class=""><div style="" class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class="">If it's committed, it's in your reflog, and in which case you should have<br class="">created a branch for your work.<br class=""><br class=""><blockquote type="cite" class=""><br class="">Using the --merge option will also ensure that if there<br class="">are conflicts between your current submodule and the<br class="">version referenced by the parent, you get an opportunity<br class="">to resolve the conflicts instead of having your changes<br class="">silently wiped out.<br class=""><br class="">Signed-off-by: Christophe de Dinechin <<a href="mailto:dinechin@redhat.com" class="">dinechin@redhat.com</a>><br class="">---<br class="">autogen.sh | 2 +-<br class="">1 file changed, 1 insertion(+), 1 deletion(-)<br class=""><br class="">diff --git a/autogen.sh b/autogen.sh<br class="">index cc7bda3..3fbd5b3 100755<br class="">--- a/autogen.sh<br class="">+++ b/autogen.sh<br class="">@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.<br class=""><br class="">(<br class=""> cd "$srcdir"<br class="">- git submodule update --init --recursive<br class="">+ git submodule update --init --recursive --merge<br class=""></blockquote><br class="">I would rather use --rebase (to avoid accidental push of those update<br class="">merges).<br class=""><br class=""><blockquote type="cite" class=""> gtkdocize<br class=""> autoreconf -v --force --install<br class="">)<br class=""></blockquote></blockquote><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">Frediano</span></div></div></blockquote></div><br class=""></body></html>