summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-12-05 07:22:41 -0800
committerGitHub <noreply@github.com>2019-12-05 07:22:41 -0800
commitae839dad5add84b5b6ffd4260987d08441196986 (patch)
tree33feff61c9fa36190a49df42b17d2f188cb72a3a /Makefile
parent813b00e439c4cb200dc02f57ebcf889c6f5afe5b (diff)
parentb8ac3f143be8ee8ad29d9fa5586cca5767776584 (diff)
downloadpodman-ae839dad5add84b5b6ffd4260987d08441196986.tar.gz
podman-ae839dad5add84b5b6ffd4260987d08441196986.tar.bz2
podman-ae839dad5add84b5b6ffd4260987d08441196986.zip
Merge pull request #4638 from ssbarnea/fix/detach
Avoid git warnings by using detach on checkout
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8795dd5ff..6822048eb 100644
--- a/Makefile
+++ b/Makefile
@@ -476,7 +476,7 @@ endef
if [ ! -x "$(GOBIN)/gometalinter" ]; then \
$(call go-get,github.com/alecthomas/gometalinter); \
cd $(FIRST_GOPATH)/src/github.com/alecthomas/gometalinter; \
- git checkout e8d801238da6f0dfd14078d68f9b53fa50a7eeb5; \
+ git checkout --detach e8d801238da6f0dfd14078d68f9b53fa50a7eeb5; \
$(GO) install github.com/alecthomas/gometalinter; \
$(GOBIN)/gometalinter --install; \
fi
@@ -498,7 +498,7 @@ varlink_api_generate: .gopathok API.md
install.libseccomp.sudo:
rm -rf ../../seccomp/libseccomp
git clone https://github.com/seccomp/libseccomp ../../seccomp/libseccomp
- cd ../../seccomp/libseccomp && git checkout $(LIBSECCOMP_COMMIT) && ./autogen.sh && ./configure --prefix=/usr && make all && make install
+ cd ../../seccomp/libseccomp && git checkout --detach $(LIBSECCOMP_COMMIT) && ./autogen.sh && ./configure --prefix=/usr && make all && make install
cmd/podman/varlink/iopodman.go: cmd/podman/varlink/io.podman.varlink