[Xfce4-commits] <xfce-git-hooks:master> hack to allow non-fast-forward merges per-repo (debugging only)

[Brian J. Tarricone]

Updating branch refs/heads/master
         to b0e25bc40e5730d4cad394e172251dc4d4a7dab0 (commit)
       from 1ed3b1f9a55fc1facb8d0470293fccb69841c15c (commit)

commit b0e25bc40e5730d4cad394e172251dc4d4a7dab0
Author: Brian J. Tarricone <brian at tarricone.org>
Date:   Sat Nov 21 19:05:13 2009 -0800

    hack to allow non-fast-forward merges per-repo (debugging only)

 hooks/update-01-history-integrity |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/hooks/update-01-history-integrity b/hooks/update-01-history-integrity
index abea04b..05e8cba 100755
--- a/hooks/update-01-history-integrity
+++ b/hooks/update-01-history-integrity
@@ -14,6 +14,10 @@ fi
 
 is_fast_forward()
 {
+
+  # allow non-fast-forward if the override option is set
+  [ "$(git config --get xfce.allow-nonff)" = "true" ] && return 0
+
   old=$(git rev-parse "$1" 2>/dev/null)
   new=$2