diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2023-02-16 17:51:22 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2023-02-16 17:51:24 -0700 |
| commit | f631e2ab49f73c365817a5f7c3f0f9f84c9d0cee (patch) | |
| tree | c83917f41c82e2346b264ac48de13454d42bb2b5 | |
| parent | e842cacb4096f174ae454dcf3099df6f6dc7c736 (diff) | |
| download | dotfiles-f631e2ab49f73c365817a5f7c3f0f9f84c9d0cee.tar.gz | |
use 'git annex add' instead of 'git update-index'
It should be harmless to add current versions of the files to the annex, and
the 'git update-index' command would fail whenever Gnus created new files.
| -rw-r--r-- | .emacs.d/init.el | 4 | ||||
| -rw-r--r-- | lib-src/mr/config | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 9f9664de..84db077b 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -3178,8 +3178,8 @@ mutt's review view, after exiting EDITOR." (let ((repo (expand-file-name "~/src/athpriv/")) (news (expand-file-name "~/src/athpriv/News/"))) (when (file-directory-p news) - (apply #'call-process "git" nil nil nil "-C" news "update-index" - "-q" "--refresh" (directory-files news nil "^[^.]")) + (apply #'call-process "git" nil nil nil "-C" news "annex" "add" + (directory-files news nil "^[^.]")) ;; We want Gnus running on just one machine at once to avoid conflicts ;; in automatic updates to score files. If there are no uncommitted ;; changes then it might be that Gnus is already running somewhere else. diff --git a/lib-src/mr/config b/lib-src/mr/config index 5a54d143..d099a32e 100644 --- a/lib-src/mr/config +++ b/lib-src/mr/config @@ -193,7 +193,7 @@ pre_update = on athena || git annex sync origin athenah pre_push = on athena || git annex sync --content origin athenah post_update = hstow restow ~/src/athpriv post_checkout = hstow stow ~/src/athpriv -pre_status = git update-index -q --refresh News/*.ADAPT News/*.SCORE +pre_status = git annex add News/*.ADAPT News/*.SCORE skip = ! mine post_checkout = |