From 5bd256590d5c5bad2b6441709727beca73ebd052 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon, 12 Jun 2023 15:36:08 +0100
Subject: mr pre_status actions: use 'git annex restage'

---
 lib-src/mr/config | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'lib-src')

diff --git a/lib-src/mr/config b/lib-src/mr/config
index 5dbbe2c4..48d83a58 100644
--- a/lib-src/mr/config
+++ b/lib-src/mr/config
@@ -160,8 +160,7 @@ checkout = git clone athenag:libpriv.git priv
 update = git annex sync --content cloud origin
 push = git annex sync --content cloud origin
 sync = mr autoci && git annex sync --no-commit --content cloud origin
-pre_status = git update-index -q --refresh \
-    .passwddb.pet .labbook.gpg .gnupg/pubring.kbx
+pre_status = git annex restage
 fixups =
     chmod 600 \
         .passwddb.pet .gnupg/*.kbx .gnupg/private-keys-v1.d/*.key .ssh/id_*
@@ -193,14 +192,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
-# Deal with phantom modifications because git-annex couldn't update the index.
-# Avoid calling git-update-index(1) on other score files (including those
-# we've already called it on since the last commit) so as to avoid continually
-# annexing intermediate versions of score files.
-pre_status = git status -s -- News/*.SCORE News/*.ADAPT \
-    | perl -MGit=unquote_path,command \
-	   -wlne'/^ M / and push @up, unquote_path $'"'"';
-		 END { @up and command qw(update-index -q --refresh), @up }'
+pre_status = git annex restage
 skip = ! mine
 
 post_checkout =
-- 
cgit v1.2.3