Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
travis-ci: record and skip successfully built trees
[gitweb.git]
/
builtin
/
merge-index.c
diff --git
a/builtin/merge-index.c
b/builtin/merge-index.c
index 2d1b6db6bd7a33f838a50deceb108ee1ad468db1..c99443b095bd8abbe02d4ea87a452d916681c53f 100644
(file)
--- a/
builtin/merge-index.c
+++ b/
builtin/merge-index.c
@@
-9,7
+9,7
@@
static int merge_entry(int pos, const char *path)
{
int found;
const char *arguments[] = { pgm, "", "", "", path, "", "", "", NULL };
- char hexbuf[4][GIT_
SHA1
_HEXSZ + 1];
+ char hexbuf[4][GIT_
MAX
_HEXSZ + 1];
char ownbuf[4][60];
if (pos >= active_nr)