Package: git-dpm
Version: 0.10.0-1
Severity: wishlist
Tags: patch
Use --full-index when generating patches
This is needed to ensure that output is reproducible across git repositories
containing different numbers of objects. Otherwise, different length
abbreviations will be output, resulting in unnecessary diff churn.
>From 82f5a56fc62c9f4ad7a4528a34c787f8c7bef5e9 Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <[email protected]>
Date: Fri, 7 Jun 2019 15:01:11 +0100
Subject: [PATCH] Use --full-index when generating patches
This is needed to ensure that output is reproducible across git repositories
containing different numbers of objects. Otherwise, different length
abbreviations will be output, resulting in unnecessary diff churn.
---
git-dpm.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-dpm.sh b/git-dpm.sh
index
ba1aa6fefacbb7fd84a37c62b30aa0b26be27ac0..be7826fe4780ef28987ef9679f5202066aac6df1
100755
--- a/git-dpm.sh
+++ b/git-dpm.sh
@@ -1435,7 +1435,7 @@ function update_patches() {
debugout "Check if new patched branch contains no debian/ changes..."
checkpatched || return 1
- gitcmd format-patch --no-signature --no-numbered -k -o
"$gitdir/dpm/newpatches" "${upstreamrev}".."${patchedrev}" >
"$gitdir/dpm/newpatches.list" || return 1
+ gitcmd format-patch --no-signature --no-numbered --full-index -k -o
"$gitdir/dpm/newpatches" "${upstreamrev}".."${patchedrev}" >
"$gitdir/dpm/newpatches.list" || return 1
LC_ALL=C sed -e 's#.*/##' -i "$gitdir/dpm/newpatches.list" || return 1
rm -f -- "$gitdir/dpm/patchmods" || return 1
--
2.11.0
