From e55ea9eb7ae27a41bb3a53f3ee124e5dc653f9c1 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Dec 06 2017 08:56:06 +0000 Subject: make-rhat-patches.sh - Ignore submodules when generating diff Fixes: File policy/modules/contrib is not a regular file -- refusing to patch 1 out of 1 hunk ignored -- saving rejects to file policy/modules/contrib.rej --- diff --git a/make-rhat-patches.sh b/make-rhat-patches.sh index eaf82da..7131ed3 100755 --- a/make-rhat-patches.sh +++ b/make-rhat-patches.sh @@ -17,7 +17,7 @@ git clone git@github.com:projectatomic/container-selinux.git -q pushd selinux-policy > /dev/null # prepare policy patches against upstream commits matching the last upstream merge -git rev-parse --verify origin/${FEDORA_VERSION}; git diff eb4512f6eb13792c76ff8d3e6f2df3a7155db577 origin/${FEDORA_VERSION} > policy-${FEDORA_VERSION}-base.patch +git rev-parse --verify origin/${FEDORA_VERSION}; git diff --ignore-submodules eb4512f6eb13792c76ff8d3e6f2df3a7155db577 origin/${FEDORA_VERSION} > policy-${FEDORA_VERSION}-base.patch popd > /dev/null pushd selinux-policy-contrib > /dev/null