From afe5995276527606dc5ed731862a0891a9537a19 Mon Sep 17 00:00:00 2001
From: vg <vgm+dev@devys.org>
Date: Sat, 23 Nov 2019 13:19:45 +0100
Subject: new git-sync version failing in case of conflicts

---
 scripts/git-sync | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100755 scripts/git-sync

diff --git a/scripts/git-sync b/scripts/git-sync
new file mode 100755
index 0000000..a9f07ac
--- /dev/null
+++ b/scripts/git-sync
@@ -0,0 +1,27 @@
+#!/bin/bash
+set -eu
+
+if [ -d "$(git rev-parse --git-dir)/annex" ]; then
+    echo 'Sync: using git annex'
+    exec git annex sync "$@"
+    exit 1 # if attained, this is an error
+fi
+
+branch_name=$(git symbolic-ref -q --short HEAD)
+
+if [ "$(git config --get --bool branch.${branch_name}.sync)" != "true" ]; then
+    echo "Branch is not configured to accept git-sync, maybe you can do:" >&2
+    echo "    git config --bool branch.${branch_name}.sync true" >&2
+    exit 1
+fi
+
+git fetch --all --quiet
+
+git add -A "./$(git rev-parse --show-cdup)"
+if ! git diff --cached --quiet; then
+    git status --short
+    git commit -m "git-sync on ${HOSTNAME}"
+fi
+
+git merge --ff-only
+git push --quiet
-- 
cgit v1.2.3