mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint-1.5.1' into maint

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2007-05-20 19:57:00 -07:00
parent aba170cdb4 5b6dedd6a0
commit 7df6ddf51e
6 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
diff.c
View File

@ -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)