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

Sync with 2.2.3

Browse Source
This commit is contained in:
Junio C Hamano
2015-09-04 10:29:28 -07:00
parent 9a3d637541 441c4a4017
commit 8267cd11d6
6 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
notes.c
View File

@ -362,13 +362,14 @@ static int non_note_cmp(const struct non_note *a, const struct non_note *b)
return strcmp(a->path, b->path);
}
static void add_non_note(struct notes_tree *t, const char *path,
/* note: takes ownership of path string */
static void add_non_note(struct notes_tree *t, char *path,
unsigned int mode, const unsigned char *sha1)
{
struct non_note *p = t->prev_non_note, *n;
n = (struct non_note *) xmalloc(sizeof(struct non_note));
n->next = NULL;
n->path = xstrdup(path);
n->path = path;
n->mode = mode;
hashcpy(n->sha1, sha1);
t->prev_non_note = n;
@ -482,17 +483,17 @@ handle_non_note:
* component.
*/
{
char non_note_path[PATH_MAX];
char *p = non_note_path;
struct strbuf non_note_path = STRBUF_INIT;
const char *q = sha1_to_hex(subtree->key_sha1);
int i;
for (i = 0; i < prefix_len; i++) {
*p++ = *q++;
*p++ = *q++;
*p++ = '/';
strbuf_addch(&non_note_path, *q++);
strbuf_addch(&non_note_path, *q++);
strbuf_addch(&non_note_path, '/');
}
strcpy(p, entry.path);
add_non_note(t, non_note_path, entry.mode, entry.sha1);
strbuf_addstr(&non_note_path, entry.path);
add_non_note(t, strbuf_detach(&non_note_path, NULL),
entry.mode, entry.sha1);
}
}
free(buf);