diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2020-05-03 12:36:07 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-05-03 12:36:07 -0700 |
| commit | 1a20f687df5a5a194a182ca1b1ee4ef148beaba3 (patch) | |
| tree | eb48b9570216516a7ed9aecc7259613a99f74690 | |
| parent | b68ee268a341a9418fa2a9d5fd2b0f56e47b6d2c (diff) | |
| download | dotfiles-1a20f687df5a5a194a182ca1b1ee4ef148beaba3.tar.gz | |
add an autoci command for ~/lib/nmbugs-spw
Unconditional `nmbug commit` might wipe out git when notmuch db
contains no spw:: tags.
| -rw-r--r-- | .mrconfig.in | 8 | ||||
| -rwxr-xr-x | bin/movemymail | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/.mrconfig.in b/.mrconfig.in index 42496941..288a21f5 100644 --- a/.mrconfig.in +++ b/.mrconfig.in @@ -627,6 +627,14 @@ status = --simplify-by-decoration --decorate --oneline log = nmbug-spw log commit = nmbug-spw commit +# Should be safe to commit a small number of local changes. We're +# trying to avoid: +# - wiping out git because db contains no spw:: tags (`nmbug +# checkout` needed) +# - doing any committing when there are known remote changes. +autoci = + nmbug-spw status | perl -ne'/^.[a-z]\s/ || $. > 10 and exit 1' \ + && nmbug-spw commit skip = ! [ -e "$HOME/local/auth/fmailsyncpass" ] # --- my personal documents. Override my global update command back diff --git a/bin/movemymail b/bin/movemymail index ef13cb4a..1b92e820 100755 --- a/bin/movemymail +++ b/bin/movemymail @@ -9,7 +9,7 @@ fi # if using notmuch on this machine, sync its database to maildir & git if [ -f "$HOME/.fmail/.notmuch/xapian/iamglass" ]; then - nmbug-spw commit + mr -d "$HOME/lib/nmbug-spw" autoci # ensure all drafts are in the drafts folder floating_drafts=$(notmuch search --output=files -- tag:draft and not folder:drafts and not tag:deleted) |