summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-21 02:57:00 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-21 02:57:00 (GMT)
commit7df6ddf51ea71d81874ecfa34f670f50a3d45103 (patch)
tree479b8f75453017af3076f9e246facdb5f9b7917b /diff.c
parentaba170cdb4874b72dd619e6f7bbc13c33295f831 (diff)
parent5b6dedd6a0b7566f7e8466b6aefe8f019c52f5d3 (diff)
downloadgit-7df6ddf51ea71d81874ecfa34f670f50a3d45103.zip
git-7df6ddf51ea71d81874ecfa34f670f50a3d45103.tar.gz
git-7df6ddf51ea71d81874ecfa34f670f50a3d45103.tar.bz2
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1: annotate: make it work from subdirectories. git-config: Correct asciidoc documentation for --int/--bool t1300: Add tests for git-config --bool --get unpack-trees.c: verify_uptodate: remove dead code Use PATH_MAX instead of TEMPFILE_PATH_LEN branch: fix segfault when resolving an invalid HEAD
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/diff.c b/diff.c
index 33297aa..b23e190 100644
--- a/diff.c
+++ b/diff.c
@@ -186,13 +186,11 @@ static const char *external_diff(void)
return external_diff_cmd;
}
-#define TEMPFILE_PATH_LEN 50
-
static struct diff_tempfile {
const char *name; /* filename external diff should read from */
char hex[41];
char mode[10];
- char tmp_path[TEMPFILE_PATH_LEN];
+ char tmp_path[PATH_MAX];
} diff_temp[2];
static int count_lines(const char *data, int size)
@@ -1561,7 +1559,7 @@ static void prep_temp_blob(struct diff_tempfile *temp,
{
int fd;
- fd = git_mkstemp(temp->tmp_path, TEMPFILE_PATH_LEN, ".diff_XXXXXX");
+ fd = git_mkstemp(temp->tmp_path, PATH_MAX, ".diff_XXXXXX");
if (fd < 0)
die("unable to create temp-file");
if (write_in_full(fd, blob, size) != size)