Am 5/31/2012 12:40, schrieb Fredrik Gustafsson: > On Thu, May 31, 2012 at 11:19:04AM +0200, Johannes Sixt wrote: >> Be prepared for backslashes in the path name: >> >> while read -r mode sha1 stage path > > We are not using -r on any place in git-submodule.sh. Maybe we should? I > can provide a patch if needed. I can imagine that this would fix a bug or two with paths that contain to-be-quoted characters. >>> + do >>> + if test $mode -eq 160000 >> >> $mode is not a number, but a string: test "$mode" = 160000 > > okay, fixed in next iteration. > >> >>> + then >>> + if test $stage -ne 0 >> >> That $stage looks like a number is of no importance, either. > > Actually I don't know what stage does and if it's important here. This > part is just to mimic the perl code. Should it be removed? No; you should 'test "$stage" != 0'. >>> + then >>> + if test -z "$(echo $unmerged | grep "|$path|")" >>> + then >>> + echo "$mode $null_sha1 U\t$path" >>> + fi >>> + unmerged="$unmerged|$path|" >> >> IIUC, the purpose of $unmerged and this check is to avoid that an unmerged >> path is dumped for each stage that is listed by ls-files. Therefore it >> should be sufficient to just check that the current path is different from >> the last path. > > That requires that submodules always is in the same order, right? ls-files guarantees a suitable order: different stages of the same submodule path appear on consecutive lines. -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html