gut submodule update and merge

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello,

I've tried to setup in a n makefile a way to easy initialize and
update submodules and at the same time keep eventual changes in the
submodules. I though an "git submodule update --init --recursive
--merge" would work,
but  this i notices created strange result if the submodules hadn't
been checked out in the first place. the result then was that it
marked in index all files to be deleted.

This behavior wasn't what I had in mind, and it resulted in I did
following "fix" to resolve the issue (ugly):
https://github.com/azatoth/jquery/commit/9977732a26820dd7f3ced2ce4554edadd62ae52c

Is this the intended behavior? logically I think an clean "git
submodule update --init --merge" should not try to merge if there
wasn't anything to begin with.

/Carl
--
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


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]