diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-01-02 22:00:07 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-01-02 22:00:07 +0000 |
| commit | 5e39b98a2965ba20a68fd98aecb780f4d6246219 (patch) | |
| tree | f0deb307d80d661cd883387ebb7f19c6b684f730 /lisp/vc-arch.el | |
| parent | 50292b6e31336aa5029def435ec7c317b729d15c (diff) | |
| download | emacs-5e39b98a2965ba20a68fd98aecb780f4d6246219.tar.gz | |
(vc-arch-workfile-version): Handle the empty-branch case.
Diffstat (limited to 'lisp/vc-arch.el')
| -rw-r--r-- | lisp/vc-arch.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el index 70dbdcc85f2..3ea023b41cb 100644 --- a/lisp/vc-arch.el +++ b/lisp/vc-arch.el @@ -1,6 +1,6 @@ ;;; vc-arch.el --- VC backend for the Arch version-control system -;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) @@ -270,7 +270,7 @@ Return non-nil if FILE is unchanged." (defun vc-arch-workfile-version (file) (let* ((root (expand-file-name "{arch}" (vc-arch-root file))) (defbranch (vc-arch-default-version file))) - (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*\\)--.*\\)--.*\\)\\'" defbranch)) + (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*\\)\\(--.*\\)?\\)--.*\\)\\'" defbranch)) (let* ((archive (match-string 1 defbranch)) (category (match-string 4 defbranch)) (branch (match-string 3 defbranch)) |