diff options
| author | Carl Fürstenberg <azatoth@gmail.com> | 2011-03-17 20:40:07 +0100 |
|---|---|---|
| committer | Carl Fürstenberg <azatoth@gmail.com> | 2011-03-18 17:59:16 +0100 |
| commit | 8a1156da9b835d826bfb4b82c41bcdd0d87aff05 (patch) | |
| tree | 1c39d123272e07f7031df465385ab6e6d884dd2e /Makefile | |
| parent | e2dd8916eef1daba1a56a5ff1fbb44cb3385f4f0 (diff) | |
| download | jquery-8a1156da9b835d826bfb4b82c41bcdd0d87aff05.tar.gz jquery-8a1156da9b835d826bfb4b82c41bcdd0d87aff05.zip | |
merge doesn't work when init
sadly the merge strategy doesn't work when doing an initial clone,
circumvent that
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -98,8 +98,16 @@ distclean: clean @@rm -rf test/qunit src/sizzle # change pointers for submodules and update them to what is specified in jQuery +# --merge doesn't work when doing an initial clone, thus test if we have non-existing +# submodules, then do an real update update_submodules: - @@if [ -d .git ]; then git submodule update --init --recursive --merge; fi + @@if [ -d .git ]; then \ + if git submodule status | grep -q -E '^-'; then \ + git submodule update --init --recursive; \ + else \ + git submodule update --init --recursive --merge; \ + fi; \ + fi; # update the submodules to the latest at the most logical branch pull_submodules: |