On Sun, May 13, 2012 at 07:23:25PM +0200, Heiko Voigt wrote: > Here is the simplest approach I could think of (not sure if its maybe > too simple). On first sight it seems to work (even if I exchange the > absolute path in alternates with a relative one. > > Please see below. > > Cheers Heiko > > I used the following setup to test: > > mkdir sub_alt && > (cd sub_alt && > git init && > echo a >a && > git add a && > git commit -m a) && > mkdir super && > (cd super && > git clone -s ../sub_alt sub && > git init && > git add sub && > git commit -m "sub a") && > (cd sub_alt && > echo b >b && > git add b && > git commit -m b) && > (cd super && > (cd sub && > git fetch && > git checkout origin/master) && > git diff --submodule > ) Junio in case you decide to queue this: I would like to rework the above code into a proper testcase and add that to the patch. The previous patch is the state as far as I got today so interested people can test whether it fixes their issue. Cheers Heiko -- 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