Do not rely on / file separator in eshell git prompt
This commit is contained in:
parent
263d1af073
commit
2b7960d427
|
@ -80,7 +80,7 @@ git repository."
|
||||||
(save-match-data
|
(save-match-data
|
||||||
(let* ((git-branch (string-trim
|
(let* ((git-branch (string-trim
|
||||||
(shell-command-to-string "git rev-parse --abbrev-ref HEAD")))
|
(shell-command-to-string "git rev-parse --abbrev-ref HEAD")))
|
||||||
(base-dir (file-name-nondirectory (string-trim-right repo-dir "/?")))
|
(base-dir (file-name-nondirectory (directory-file-name repo-dir)))
|
||||||
state-list)
|
state-list)
|
||||||
|
|
||||||
(when (file-exists-p (file-name-concat repo-dir ".git" "MERGE_HEAD"))
|
(when (file-exists-p (file-name-concat repo-dir ".git" "MERGE_HEAD"))
|
||||||
|
|
Loading…
Reference in New Issue