~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stgit.el: Bugfix moving symlinks to/from index
[stgit]
/
contrib
/
stgit.el
diff --git
a/contrib/stgit.el
b/contrib/stgit.el
index
65fe68a
..
c4ed958
100644
(file)
--- a/
contrib/stgit.el
+++ b/
contrib/stgit.el
@@
-878,7
+878,8
@@
If PATCHSYM is a keyword, returns PATCHSYM unmodified."
(defun stgit-move-change-to-index (file)
"Copies the workspace state of FILE to index, using git add or git rm"
(defun stgit-move-change-to-index (file)
"Copies the workspace state of FILE to index, using git add or git rm"
- (let ((op (if (file-exists-p file) '("add") '("rm" "-q"))))
+ (let ((op (if (or (file-exists-p file) (file-symlink-p file))
+ '("add") '("rm" "-q"))))
(stgit-capture-output "*git output*"
(apply 'stgit-run-git (append op '("--") (list file))))))
(stgit-capture-output "*git output*"
(apply 'stgit-run-git (append op '("--") (list file))))))