From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 14 Apr 2021 17:05:34 +0000 (-0700)
Subject: Commit Debian 3.0 (quilt) metadata
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~92
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d285eabb490c3d92771d7d359e0f6ad20d16baa2;p=git-annex.git

Commit Debian 3.0 (quilt) metadata

[dgit (9.13) quilt-fixup]
---

diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index f926aa1d41..3e17d913d4 100644
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -49,6 +49,65 @@ A single combined diff, containing all the changes, follows.
  License: BSD-2-clause
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
+--- git-annex-8.20210223.orig/Git/Tree.hs
++++ git-annex-8.20210223/Git/Tree.hs
+@@ -300,43 +300,43 @@ graftTree'
+ 	-> Repo
+ 	-> MkTreeHandle
+ 	-> IO Sha
+-graftTree' subtree graftloc basetree repo hdl = go basetree graftdirs
++graftTree' subtree graftloc basetree repo hdl = go basetree subdirs graftdirs
+   where
+-	go tsha (topmostgraphdir:restgraphdirs) = do
++	go tsha (subdir:restsubdirs) (topmostgraphdir:restgraphdirs) = do
+ 		Tree t <- getTree LsTree.LsTreeNonRecursive tsha repo
+-		t' <- case partition isabovegraft t of
++		let abovegraftpoint i = gitPath i == gitPath subdir
++		t' <- case partition abovegraftpoint t of
++			-- the graft point is not already in the tree,
++			-- so graft it in, keeping the existing tree
++			-- content
+ 			([], _) -> do
+ 				graft <- graftin (topmostgraphdir:restgraphdirs)
+ 				return (graft:t)
+-			-- normally there can only be one matching item
+-			-- in the tree, but it's theoretically possible
+-			-- for a git tree to have multiple items with the
+-			-- same name, so process them all
+ 			(matching, rest) -> do
+ 				newshas <- forM matching $ \case
+ 					RecordedSubTree tloc tsha' _
+ 						| null restgraphdirs -> return $
+ 							RecordedSubTree tloc subtree []
+ 						| otherwise -> do
+-							tsha'' <- go tsha' restgraphdirs
++							tsha'' <- go tsha' restsubdirs restgraphdirs
+ 							return $ RecordedSubTree tloc tsha'' []
+ 					_ -> graftin (topmostgraphdir:restgraphdirs)
+ 				return (newshas ++ rest)
+ 		mkTree hdl t'
+-	go _ [] = return subtree
+-
+-	isabovegraft i = beneathSubTree i graftloc || gitPath i == gitPath graftloc
++	go _ _ [] = return subtree
+ 	
+ 	graftin t = recordSubTree hdl $ graftin' t
+ 	graftin' [] = RecordedSubTree graftloc subtree []
+ 	graftin' (d:rest) 
+ 		| d == graftloc = graftin' []
+ 		| otherwise = NewSubTree d [graftin' rest]
+-	
++
++	subdirs = splitDirectories $ gitPath graftloc
++
+ 	-- For a graftloc of "foo/bar/baz", this generates
+ 	-- ["foo", "foo/bar", "foo/bar/baz"]
+ 	graftdirs = map (asTopFilePath . toInternalGitPath . encodeBS) $
+-		mkpaths [] $ splitDirectories $ gitPath graftloc
++		mkpaths [] subdirs
+ 	mkpaths _ [] = []
+ 	mkpaths base (d:rest) = (joinPath base </> d) : mkpaths (base ++ [d]) rest
+ 
 --- git-annex-8.20210223.orig/git-annex.cabal
 +++ git-annex-8.20210223/git-annex.cabal
 @@ -322,7 +322,7 @@ Executable git-annex