[Bps-public-commit] SD branch, master, updated. 5027d6850e3e2ddb77b6c8b57a0960101981434a

[jesse]

The branch, master has been updated
       via  5027d6850e3e2ddb77b6c8b57a0960101981434a (commit)
       via  5c7f66ab8426ad14118ef3f3689688815daaa22c (commit)
       via  4f13565efd1d31cf612540c407684d89c4f6aaac (commit)
       via  6797ae93e8b1777acfaef1bc269b18f458ebe5a8 (commit)
       via  848ae5fd396868fd6c5cf47a78dff4a1e165d490 (commit)
       via  127405ff6ba255d0420ad9fc5783e5c0be3dafb6 (commit)
      from  d423043e603b2a3c044999f18640dacb5461d235 (commit)

Summary of changes:
 bin/git-sd |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

- Log -----------------------------------------------------------------
commit 127405ff6ba255d0420ad9fc5783e5c0be3dafb6
Author: Alec Clews <alec.clews at voga.com.au>
Date:   Thu Jun 4 19:07:08 2009 +1000

    Added support to use $GIT_DIR for sd database

diff --git a/bin/git-sd b/bin/git-sd
index 9369f1b..e1b2305 100755
--- a/bin/git-sd
+++ b/bin/git-sd
@@ -1,7 +1,8 @@
 #!/bin/sh
+
 replica=`git config --get sd.local-replica`
-if [ "fnord$replica" = "fnord" ]; then
-    # TODO: respect GIT_DIR
+if [ -z $replica ]; then
+    if [ -z $GIT_DIR ] ; then # respect GIT_DIR
     gitdir=`pwd`
     while ! [ -e "$gitdir/.git" ]; do
         if [ "$gitdir" = "/" ]; then
@@ -11,6 +12,9 @@ if [ "fnord$replica" = "fnord" ]; then
         fi
         gitdir=`dirname $gitdir`
     done
+    else
+        gitdir=$GIT_DIR
+    fi
     replica=$gitdir/.git/sd
     echo "You don't appear to have an sd.local-replica defined in your .git/config"
     echo "Setting it to '$replica':"

commit 848ae5fd396868fd6c5cf47a78dff4a1e165d490
Author: Alec Clews <alec.clews at voga.com.au>
Date:   Thu Jun 4 19:41:25 2009 +1000

    Added better comments for GIT_DIR support

diff --git a/bin/git-sd b/bin/git-sd
index e1b2305..c433d28 100755
--- a/bin/git-sd
+++ b/bin/git-sd
@@ -2,7 +2,7 @@
 
 replica=`git config --get sd.local-replica`
 if [ -z $replica ]; then
-    if [ -z $GIT_DIR ] ; then # respect GIT_DIR
+    if [ -z $GIT_DIR ] ; then # GIT_DIR Not defined
     gitdir=`pwd`
     while ! [ -e "$gitdir/.git" ]; do
         if [ "$gitdir" = "/" ]; then

commit 6797ae93e8b1777acfaef1bc269b18f458ebe5a8
Merge: 848ae5f... 150a456...
Author: Alec Clews <alec.clews at voga.com.au>
Date:   Thu Jun 4 21:43:50 2009 +1000

    Merge branch 'master' of git://github.com/obra/sd


commit 4f13565efd1d31cf612540c407684d89c4f6aaac
Author: Alec Clews <alec.clews at voga.com.au>
Date:   Fri Jun 5 07:28:20 2009 +1000

    Reformatted code correctly (GIT_DIR support)

diff --git a/bin/git-sd b/bin/git-sd
index c433d28..026a135 100755
--- a/bin/git-sd
+++ b/bin/git-sd
@@ -3,18 +3,19 @@
 replica=`git config --get sd.local-replica`
 if [ -z $replica ]; then
     if [ -z $GIT_DIR ] ; then # GIT_DIR Not defined
-    gitdir=`pwd`
-    while ! [ -e "$gitdir/.git" ]; do
-        if [ "$gitdir" = "/" ]; then
-            echo "Can't find a .git directory anywhere in your current directory"
-            echo "or any higher directories."
-            exit 1;
-        fi
-        gitdir=`dirname $gitdir`
-    done
+        gitdir=`pwd`
+        while ! [ -e "$gitdir/.git" ]; do
+            if [ "$gitdir" = "/" ]; then
+                echo "Can't find a .git directory anywhere in your current directory"
+                echo "or any higher directories."
+                exit 1;
+            fi
+            gitdir=`dirname $gitdir`
+        done
     else
         gitdir=$GIT_DIR
     fi
+
     replica=$gitdir/.git/sd
     echo "You don't appear to have an sd.local-replica defined in your .git/config"
     echo "Setting it to '$replica':"
@@ -22,4 +23,5 @@ if [ -z $replica ]; then
     echo "  git config --add sd.local-replica $replica"
     git config --add sd.local-replica $replica
 fi
+
 SD_REPO=$replica exec sd $@

commit 5c7f66ab8426ad14118ef3f3689688815daaa22c
Merge: 4f13565... adb203d...
Author: Alec Clews <alec.clews at voga.com.au>
Date:   Fri Jun 5 07:29:26 2009 +1000

    Merge branch 'master' of git://github.com/obra/sd


commit 5027d6850e3e2ddb77b6c8b57a0960101981434a
Merge: d423043... 5c7f66a...
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Mon Jun 8 08:55:47 2009 -0400

    Merge branch 'master' of git://github.com/alecthegeek/sd
    
    * 'master' of git://github.com/alecthegeek/sd:
      Reformatted code correctly (GIT_DIR support)
      Added better comments for GIT_DIR support
      Added support to use $GIT_DIR for sd database


-----------------------------------------------------------------------