aboutsummaryrefslogtreecommitdiff
path: root/blame.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-29 01:54:54 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-29 01:54:54 -0700
commit7061cf0f205e86613c3a3306fdfedf2a5dcc8a65 (patch)
treee0595e44fc820032fd5ee942a031439f2e6da3b1 /blame.c
parentac64a722072bb348476a8a029de9a82073e07fba (diff)
parenta633fca0c056aa221d23493c276d3713191621b3 (diff)
downloadgit-7061cf0f205e86613c3a3306fdfedf2a5dcc8a65.tar.gz
git-7061cf0f205e86613c3a3306fdfedf2a5dcc8a65.tar.xz
Merge branch 'lt/setup' into __/setup-n-mv
This merges the new built-in calling convention code into Johannes's builtin-mv topic in order to resolve their conflicts early on. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'blame.c')
-rw-r--r--blame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/blame.c b/blame.c
index b04b8f58a..76712b596 100644
--- a/blame.c
+++ b/blame.c
@@ -834,7 +834,7 @@ int main(int argc, const char **argv)
}
- init_revisions(&rev);
+ init_revisions(&rev, setup_git_directory());
rev.remove_empty_trees = 1;
rev.topo_order = 1;
rev.prune_fn = simplify_commit;