X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=nogit;h=68420025c8dea9e6457e518c3b2b7bc4a01a93b4;hb=5834bcd7aebd13aa85167932053a535126de3fcb;hp=16cd18f9460024ba770d5fdff27a44a27adcb851;hpb=9b145387ae0b95534b48ccf89080fc26d73e839c;p=nogit

diff --git a/nogit b/nogit
index 16cd18f..6842002 100755
--- a/nogit
+++ b/nogit
@@ -59,7 +59,13 @@ nogit_clone()
     url="$1"
 
     if [ -e $NOGIT_DIR ]; then
-        echo "Error: .nogit already exists. Cowardly refusing to re-clone."
+        echo "Error: $NOGIT_DIR already exists. Cowardly refusing to re-clone."
+        return 1
+    fi
+
+    if [ -e $NOGIT_DIR_TMP ]; then
+        echo "Error: $NOGIT_DIR_TMP already exists. Was a previous clone interrupted?"
+        echo "You'll want to clean that up before trying again."
         return 1
     fi
 
@@ -91,6 +97,12 @@ nogit_clone()
         false
     fi
 
+    # Install the info/atttributes file that forces the "union" merge
+    # driver for all files, giving us the semantics of "keep both sides
+    # of all conflicts" that is at the heart of nogit.
+    mkdir -p tmp/.git/info
+    echo '* merge=union' > tmp/.git/info/attributes
+
     # Now that we've passed the sanity check, install the cloned .git
     # object store into $NOGIT_DIR, cleanup our temporary files, and
     # checkout the (known to not be conflicting) files.