Merge branch 'jc/fixdiff'

* jc/fixdiff:
diff-tree: do not default to -c

diff --git a/git-pull.sh b/git-pull.sh
index 0991d5f14cd6d903572a041cfbfe3cde219c738f..6caf1aad471bbf8f894ea20a80c3be082012648b 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -70,21 +70,21 @@ case "$merge_head" in
        exit 0
        ;;
 ?*' '?*)
-       var=`git-var -l | sed -ne 's/^pull\.octopus=/-s /p'`
+       var=`git repo-config --get pull.octopus`
        if test '' = "$var"
        then
                strategy_default_args='-s octopus'
        else
-               strategy_default_args=$var
+               strategy_default_args="-s $var"
        fi
        ;;
 *)
-       var=`git-var -l | sed -ne 's/^pull\.twohead=/-s /p'`
+       var=`git repo-config --get pull.twohead`
        if test '' = "$var"
        then
                strategy_default_args='-s recursive'
        else
-               strategy_default_args=$var
+               strategy_default_args="-s $var"
        fi
        ;;
 esac

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 1e638e493d51c9216e3d2e93aad5657cdf9793b4..157c7e4d6ce470191ca4207aaf1ecbf5cd4c7d75 100755 (executable)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -41,7 +41,11 @@ then
        : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
 
        # Make sure we are in a valid repository of a vintage we understand.
-       GIT_DIR="$GIT_DIR" git-var GIT_AUTHOR_IDENT >/dev/null || exit
+       GIT_DIR="$GIT_DIR" git repo-config --get core.nosuch >/dev/null
+       if test $? == 128
+       then
+           exit
+       fi
 else
        GIT_DIR=$(git-rev-parse --git-dir) || exit
 fi