diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-06-21 04:03:07 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-06-21 04:03:07 +0300 |
| commit | cf1b844a98ab4065ac984eda90f160325f288e7f (patch) | |
| tree | 88b18abf0199f1dbe1ef3f664cc644c8b95fa430 /scripts/submodules | |
| parent | 5bf6df828c59ab373700f17dd19d17a359630c40 (diff) | |
[scripts/submodules] Add branch to check if fetch is needed
In some cases the "git log -1 <remote>" check fails even though the remote is configured
and an unnecessary fetch is done. Adding the branch to the check fixes this.
Diffstat (limited to 'scripts/submodules')
| -rw-r--r-- | scripts/submodules/versions.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/submodules/versions.mk b/scripts/submodules/versions.mk index 440476df140..3d429b80eac 100644 --- a/scripts/submodules/versions.mk +++ b/scripts/submodules/versions.mk @@ -68,7 +68,7 @@ test-$(1):: reset-$(1):: @if test -d $($(2)_PATH); then \ - if ! (cd $($(2)_PATH) && git show $(NEEDED_$(2)_VERSION) >/dev/null 2>&1 && git log -1 $(NEEDED_$(2)_REMOTE) >/dev/null 2>&1) ; then \ + if ! (cd $($(2)_PATH) && git show $(NEEDED_$(2)_VERSION) >/dev/null 2>&1 && git log -1 $(NEEDED_$(2)_REMOTE/NEEDED_$(2)_BRANCH) >/dev/null 2>&1) ; then \ echo "*** git fetch `basename $$($(2)_PATH)`" && (cd $($(2)_PATH) && git fetch); \ fi; \ else \ |