summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2009-02-28 12:56:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-28 14:09:46 -0800
commit272459a3b809db19d15131eb5df9dfe939af9c8c (patch)
tree8c4fa69a2b495b329898c86e24fdc8fdefb6d6a2 /builtin-merge.c
parentGIT 1.6.1 (diff)
downloadtgif-272459a3b809db19d15131eb5df9dfe939af9c8c.tar.xz
Ensure proper setup of git_dir for git-hash-object
Call setup_git_directory() before git_config() to make sure git_dir is set to the proper value. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions