added 'git-update' - the transparent auto-torifying git pull

2 files changed, 49 insertions, 1 deletions

diff --git a/dev-vcs/gitprivacy/files/git-update b/dev-vcs/gitprivacy/files/git-update
new file mode 100755
index 0000000..afb0496
--- /dev/null
+++ b/dev-vcs/gitprivacy/files/git-update
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# A variant of git pull which operates over Tor and
+#   - figures out when 'torify' needs to be used
+#   - shows the changes that were made to the repository
+#   - before attempting to merge
+#       --lynX & heldensaga, 2017
+#
+# I recommend piping the output into
+#       vim -R "+set syntax=diff"
+# but since that isn't everybody's choice of editor
+# I won't work it into this script...
+
+# would be more elegant to tell you how to 
+# configure this in your .git/config?
+gitdiff="git diff -b -M77% --minimal"
+
+# 'resolve' has served me well as default strategy
+gitmerge="git merge -s resolve"
+
+branch="$*"
+if test x"$*" = x; then
+        branch="origin"
+fi
+# echo $branch
+
+url=`git remote get-url $branch`
+if test x"$url" = x; then
+        exit
+fi
+# echo $url
+
+case $url in
+http*)
+        torify=""
+        echo "*** Fetching from $url via web proxy"
+        ;;
+*)
+        torify="torsocks"
+        echo "*** Fetching from $url via torsocks"
+esac
+# echo $torify
+
+$torify git fetch $branch \
+&& $gitdiff master..$branch/master \
+&& exec $gitmerge $branch/master
+
diff --git a/dev-vcs/gitprivacy/gitprivacy-1.0.ebuild b/dev-vcs/gitprivacy/gitprivacy-1.1.ebuild
index 33ba4b8..b2adbe5 100644
--- a/dev-vcs/gitprivacy/gitprivacy-1.0.ebuild
+++ b/dev-vcs/gitprivacy/gitprivacy-1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-DESCRIPTION="git commit command that preserves the privacy of working habits"
+DESCRIPTION="git commands that preserve the privacy of working habits"
 
 LICENSE="AGPL"
 SLOT="0"
@@ -17,5 +17,6 @@ S="$WORKDIR"
 src_install() {
         exeinto /usr/bin
         doexe "${FILESDIR}"/git-commit-private
+        doexe "${FILESDIR}"/git-update
 }