[DRE-commits] [diaspora] 01/02: skip git checks

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora.

commit 37e0b2a6d02167e353de1171b25ea1ee88796836
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Aug 6 23:42:50 2015 +0530

    skip git checks
---
 debian/patches/043-dont-do-git-checks.patch | 37 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 2 files changed, 38 insertions(+)

diff --git a/debian/patches/043-dont-do-git-checks.patch b/debian/patches/043-dont-do-git-checks.patch
new file mode 100644
index 0000000..dcd8713
--- /dev/null
+++ b/debian/patches/043-dont-do-git-checks.patch
@@ -0,0 +1,37 @@
+Index: diaspora/script/server
+===================================================================
+--- diaspora.orig/script/server
++++ diaspora/script/server
+@@ -61,18 +61,21 @@ then
+   fatal "config/diaspora.yml is missing! Copy over config/diaspora.yml.example to config/diaspora.yml and edit it properly!"
+ fi
+ 
+-command -v git > /dev/null 2>&1
+-if [ $? -eq 0 ]; then
+-  # Check if git merge is in progress
+-  if [ -f .git/MERGE_MODE ]; then
+-    fatal "A git merge is in progress!"
+-  fi
++# Check if we are using git
++if [ -f .git/config ]; then
++  command -v git > /dev/null 2>&1
++  if [ $? -eq 0 ]; then
++    # Check if git merge is in progress
++    if [ -f .git/MERGE_MODE ]; then
++      fatal "A git merge is in progress!"
++    fi
+ 
+-  # Check if detached head state
+-  git_branch_name="$(git symbolic-ref HEAD 2>/dev/null)"
+-  if [ -z "$git_branch_name" ];
+-  then
+-    warning "You are in detached HEAD state!"
++    # Check if detached head state
++    git_branch_name="$(git symbolic-ref HEAD 2>/dev/null)"
++    if [ -z "$git_branch_name" ];
++    then
++      warning "You are in detached HEAD state!"
++    fi
+   fi
+ fi
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 970b97c..3cc35fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 031-embedded-gems.patch
 040-disable-raise_in_transactional_callbacks.patch
 041-require-foreigner.patch
+043-dont-do-git-checks.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git