summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-05-11 23:31:14 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2010-05-11 23:31:30 +0200
commit7a0619cbe81bf17edfb429e67e0d6691081dca27 (patch)
tree0bc18e161109b5729ea0adac3f04b927033af06d
parentfdb446fa2e3cb236e73667cc2ac4dc68feed4a82 (diff)
downloadorg-mode-7a0619cbe81bf17edfb429e67e0d6691081dca27.tar.gz
Fix bug in org-git-link.el
-rw-r--r--contrib/ChangeLog5
-rw-r--r--contrib/lisp/org-git-link.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index d9b9ac5..44db137 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-11 Carsten Dominik <carsten.dominik@gmail.com>
+
+ * lisp/org-git-link.el (org-git-open)
+ (org-git-create-git-link): expand file name.
+
2010-04-20 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-toc.el (org-toc-cycle-subtree)
diff --git a/contrib/lisp/org-git-link.el b/contrib/lisp/org-git-link.el
index 4596e41..195bf9b 100644
--- a/contrib/lisp/org-git-link.el
+++ b/contrib/lisp/org-git-link.el
@@ -96,7 +96,7 @@
(let* ((strlist (org-git-split-string str))
(filepath (first strlist))
(commit (second strlist))
- (dirlist (org-git-find-gitdir filepath))
+ (dirlist (org-git-find-gitdir (file-truename filepath)))
(gitdir (first dirlist))
(relpath (second dirlist)))
(org-git-open-file-internal gitdir (concat commit ":" relpath))))
@@ -168,7 +168,7 @@
(defun org-git-create-git-link (file)
"Create git link part to file at specific time"
(interactive "FFile: ")
- (let* ((gitdir (first (org-git-find-gitdir file)))
+ (let* ((gitdir (first (org-git-find-gitdir (file-truename file))))
(branchname (org-git-get-current-branch gitdir))
(timestring (format-time-string "%Y-%m-%d" (current-time))))
(org-make-link "git:" file "::" (org-git-create-searchstring branchname timestring))))