Fix "test: unexpected operator" on bsd

[git.git] / show-branch.c

diff --git a/show-branch.c b/show-branch.c
index d06e577..511fd3b 100644 (file)
--- a/show-branch.c
+++ b/show-branch.c
@@ -258,7 +258,7 @@ static void show_one_commit(struct commit *commit, int no_name)
        char pretty[256], *cp;
        struct commit_name *name = commit->object.util;
        if (commit->object.parsed)
-               pretty_print_commit(CMIT_FMT_ONELINE, commit->buffer, ~0,
+               pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
                                    pretty, sizeof(pretty), 0);
        else
                strcpy(pretty, "(unavailable)");
@@ -548,8 +548,8 @@ int main(int ac, char **av)
        int with_current_branch = 0;
        int head_at = -1;
 
-       git_config(git_show_branch_config);
        setup_git_directory();
+       git_config(git_show_branch_config);
 
        /* If nothing is specified, try the default first */
        if (ac == 1 && default_num) {