mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Browse source
This commit is contained in:
grond66@79ca29ba964cd0d8e2f352871d54452e4a9dad88 2021-01-15 13:07:28 +00:00 • committed by admin
parent 33f9edbd0f
commit 75988a790e
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/bugs/__91__PATCH__93___incorrect_behaviour_in_expandTilde.mdwn
View file

@ -69,7 +69,7 @@ All that needs to be done is to add an equation for `expandt` to handle the case
See the following patch: See the following patch:
``` ```
From 4d8febfd5ec64516d3f77577a498f96b87ec9c9c Mon Sep 17 00:00:00 2001 From 680873923197f5eec15365b3e47e3fa05b9573be Mon Sep 17 00:00:00 2001
From: Grond <grond66@riseup.net> From: Grond <grond66@riseup.net>
Date: Thu, 14 Jan 2021 18:16:31 -0800 Date: Thu, 14 Jan 2021 18:16:31 -0800
Subject: [PATCH] Fix expandTilde so that it can handle tildes at the end of Subject: [PATCH] Fix expandTilde so that it can handle tildes at the end of
@ -80,14 +80,14 @@ Subject: [PATCH] Fix expandTilde so that it can handle tildes at the end of
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/Git/Construct.hs b/Git/Construct.hs diff --git a/Git/Construct.hs b/Git/Construct.hs
index 8b63ac480..b7f018944 100644 index 8b63ac480..a369bc4a6 100644
--- a/Git/Construct.hs --- a/Git/Construct.hs
+++ b/Git/Construct.hs +++ b/Git/Construct.hs
@@ -187,6 +187,7 @@ expandTilde = expandt True @@ -187,6 +187,7 @@ expandTilde = expandt True
expandt True ('~':'/':cs) = do expandt True ('~':'/':cs) = do
h <- myHomeDir h <- myHomeDir
return $ h </> cs return $ h </> cs
+ expandt True "~" = myHomeDir + expandt True "~" = myHomeDir
expandt True ('~':cs) = do expandt True ('~':cs) = do
let (name, rest) = findname "" cs let (name, rest) = findname "" cs
u <- getUserEntryForName name u <- getUserEntryForName name