From 1f9ce0b0bf31d54542e61c03b03b9c865a455d04 Mon Sep 17 00:00:00 2001 From: Junyi Du Date: Sun, 20 Mar 2022 23:51:25 +0800 Subject: [PATCH] fix: always trigger removing file of separate git dir --- .gitignore | 3 ++- src/electron/electron/git.cljs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e77b9ccc11..f559a2cd8f 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ strings.csv .calva resources/electron.js .clj-kondo/.cache +.clj-kondo/babashka/sci .lsp/ /libs/dist/ charlie/ @@ -38,4 +39,4 @@ charlie/ /.preprocessor-cljs docker android/app/src/main/assets/capacitor.plugin.json -ios/App/App/capacitor.config.json \ No newline at end of file +ios/App/App/capacitor.config.json diff --git a/src/electron/electron/git.cljs b/src/electron/electron/git.cljs index cc0121aa58..f8a7aa3985 100644 --- a/src/electron/electron/git.cljs +++ b/src/electron/electron/git.cljs @@ -51,7 +51,7 @@ p (.join path graph-path ".git")] (when (and (fs/existsSync p) (.isFile (fs/statSync p))) - (let [content (.toString (fs/readFileSync p)) + (let [content (string/trim (.toString (fs/readFileSync p))) dir-path (string/replace content "gitdir: " "")] (when (and content (string/starts-with? content "gitdir:")