[PATCH] UBUNTU: [Debian] consider renames in gen-auto-reconstruct

Thadeu Lima de Souza Cascardo cascardo at canonical.com
Wed Dec 21 11:16:33 UTC 2016


Recent git versions have changed the rename detection to default when
using git-diff. Previous behavior would allow the reconstruct script to
remove the renamed files, which are added in the diff, but not removed.

Using --no-renames option will revert to the previous behavior when
using those recent git versions.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
---
 debian/scripts/misc/gen-auto-reconstruct | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/scripts/misc/gen-auto-reconstruct b/debian/scripts/misc/gen-auto-reconstruct
index 83c0428..a76e341 100755
--- a/debian/scripts/misc/gen-auto-reconstruct
+++ b/debian/scripts/misc/gen-auto-reconstruct
@@ -26,7 +26,7 @@ fi
 (
 	# Identify all new symlinks since the proffered tag.
 	echo "# Recreate any symlinks created since the orig."
-	git diff "$tag.." --raw | awk '(/^:000000 120000/ && $5 == "A") { print $NF }' | \
+	git diff "$tag.." --raw --no-renames | awk '(/^:000000 120000/ && $5 == "A") { print $NF }' | \
 	while read name
 	do
 		link=$( readlink "$name" )
@@ -36,7 +36,7 @@ fi
 
 	# Identify all removed files since the proffered tag.
 	echo "# Remove any files deleted from the orig."
-	git diff "$tag.." --raw | awk '(/^:/ && $5 == "D") { print $NF }' | \
+	git diff "$tag.." --raw --no-renames | awk '(/^:/ && $5 == "D") { print $NF }' | \
 	while read name
 	do
 		echo "rm -f '$name'"
@@ -49,7 +49,7 @@ fi
 (
 	# Identify all new symlinks since the proffered tag.
 	echo "# Ignore any symlinks created since the orig which are rebuilt by reconstruct."
-	git diff "$tag.." --raw | awk '(/^:000000 120000/ && $5 == "A") { print $NF }' | \
+	git diff "$tag.." --raw --no-renames | awk '(/^:000000 120000/ && $5 == "A") { print $NF }' | \
 	while read name
 	do
 		echo "extend-diff-ignore=$name"
-- 
2.9.3





More information about the kernel-team mailing list