projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] Use a temporary index file when we merge the common ancestors.
[git.git]
/
fsck-objects.c
diff --git
a/fsck-objects.c
b/fsck-objects.c
index
43d188a
..
0c5c430
100644
(file)
--- a/
fsck-objects.c
+++ b/
fsck-objects.c
@@
-392,7
+392,7
@@
static int fsck_head_link(void)
static char path[PATH_MAX], link[PATH_MAX];
const char *git_dir;
- git_dir = g
i
tenv(GIT_DIR_ENVIRONMENT);
+ git_dir = g
e
tenv(GIT_DIR_ENVIRONMENT);
if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
snprintf(path, sizeof(path), "%s/HEAD", git_dir);