From: Jens Lehmann Date: Fri, 09 Apr 2010 23:11:08 GMT Subject: Re: [WIP PATCH 1/4] Prepare checkout_entry() for recursive checkout of submodules Message-ID: <4BBFB40C.1060905@web.de> In-Reply-To: <7vd3y81e3s.fsf@alter.siamese.dyndns.org> Am 09.04.2010 23:59, schrieb Junio C Hamano: > Jens Lehmann writes: > >> +int checkout_submodule(const char *path, const unsigned char sha1[20], int force) >> +{ >> + struct strbuf buf = STRBUF_INIT; >> + struct child_process cp; >> + const char *hex_sha1 = sha1_to_hex(sha1); >> + const char *argv[] = { >> + "checkout", >> + force ? "-qf" : "-q", >> + hex_sha1, >> + NULL, >> + }; > > Why force -q? Good question. I seem to have tried to silence the output of checkout from run_command(), which AFIACS doesn't reach the console anyway unless i want it to ... (while at the same time managing to mess up the tabs in that line ... :-/ ) >> + strbuf_addf(&buf, "%s/.git/", path); >> + if (!is_directory(buf.buf)) { >> + strbuf_release(&buf); >> + /* The submodule is not populated, so we can't check it out */ >> + return 0; >> + } > > This would give you an incorrect result if .git is a file that records > "gitdir: overthere" (see read_gitfile_gently() in setup.c); I would expect > it would become a fairly important ingredient if we ever enhance the > submodule support to add submodule that disappears/reappears in the > history. Right. This assumption is also present in add_submodule_odb() (used by show_submodule_summary()) and is_submodule_modified(), so i just reused it. This should be addressed in another patch.