use --no-abbrev instead of --abbrev=40
This avoids hardcoding the sha size, so when git uses sha256, it will output the full sha256 and not a truncation to 40 characters. I reviewed git's history, and while there have been some bugs with commands not supporting --no-abbrev (eg git diff --no-index --no-abbrev was broken in git 2.1), none of the commands git-annex uses will be impacted by those old bugs.
This commit is contained in:
parent
5e4deb3620
commit
6db4aee7df
3 changed files with 4 additions and 4 deletions
|
@ -77,14 +77,14 @@ diffFiles = getdiff (Param "diff-files")
|
|||
- is adjusted to be the same as diff-tree --raw._-}
|
||||
diffLog :: [CommandParam] -> Repo -> IO ([DiffTreeItem], IO Bool)
|
||||
diffLog params = getdiff (Param "log")
|
||||
(Param "-n1" : Param "--abbrev=40" : Param "--pretty=format:" : params)
|
||||
(Param "-n1" : Param "--no-abbrev" : Param "--pretty=format:" : params)
|
||||
|
||||
{- Uses git show to get the changes made by a commit.
|
||||
-
|
||||
- Does not support merge commits, and will fail on them. -}
|
||||
commitDiff :: Sha -> Repo -> IO ([DiffTreeItem], IO Bool)
|
||||
commitDiff ref = getdiff (Param "show")
|
||||
[ Param "--abbrev=40", Param "--pretty=", Param "--raw", Param (fromRef ref) ]
|
||||
[ Param "--no-abbrev", Param "--pretty=", Param "--raw", Param (fromRef ref) ]
|
||||
|
||||
getdiff :: CommandParam -> [CommandParam] -> Repo -> IO ([DiffTreeItem], IO Bool)
|
||||
getdiff command params repo = do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue