diff options
author | Junio C Hamano <junkio@cox.net> | 2007-05-20 19:58:03 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-05-20 19:58:03 -0700 |
commit | 738a1154db190c75a7454da85d85be68ad7db065 (patch) | |
tree | 4abf7c8e14e98a6c0301cb34ad5acd8b42dcfe14 /diff.c | |
parent | Merge branch 'dh/pack' (diff) | |
parent | Merge branch 'maint-1.5.1' into maint (diff) | |
download | tgif-738a1154db190c75a7454da85d85be68ad7db065.tar.xz |
Merge branch 'maint'
* maint:
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.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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) |