Merge branch 'pb/repo'

* pb/repo:
  Add support for explicit type specifiers when calling git-repo-config

diff --git a/diff-tree.c b/diff-tree.c
index b170b03..f55a35a 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -6,7 +6,7 @@ static int show_root_diff = 0;
 static int no_commit_id = 0;
 static int verbose_header = 0;
 static int ignore_merges = 1;
-static int combine_merges = 1;
+static int combine_merges = 0;
 static int dense_combined_merges = 0;
 static int read_stdin = 0;
 static int always_show_header = 0;
@@ -248,7 +248,7 @@ int main(int argc, const char **argv)
                        continue;
                }
                if (!strcmp(arg, "-m")) {
-                       combine_merges = ignore_merges = 0;
+                       ignore_merges = 0;
                        continue;
                }
                if (!strcmp(arg, "-c")) {

diff --git a/git-pull.sh b/git-pull.sh
index 0991d5f..6caf1aa 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 1e638e4..157c7e4 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

diff --git a/git-whatchanged.sh b/git-whatchanged.sh
index 574fc35..1fb9feb 100755 (executable)
--- a/git-whatchanged.sh
+++ b/git-whatchanged.sh
@@ -10,7 +10,7 @@ case "$0" in
        count=
        test -z "$diff_tree_flags" &&
                diff_tree_flags=$(git-repo-config --get whatchanged.difftree)
-       diff_tree_default_flags='-M --abbrev' ;;
+       diff_tree_default_flags='-c -M --abbrev' ;;
 *show)
        count=-n1
        test -z "$diff_tree_flags" &&