undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try_remove_empty_parents(): don't trash argument contents

Browse Source 
It's bad manners and surprising and therefore error-prone.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2017-01-06 17:22:41 +01:00 committed by Junio C Hamano
parent 730e034286
commit 8bdaecb402
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
refs/files-backend.c
View File

@ -2282,13 +2282,15 @@ static int pack_if_possible_fn(struct ref_entry *entry, void *cb_data)
/*
* Remove empty parents, but spare refs/ and immediate subdirs.
* Note: munges *refname.
*/
static void try_remove_empty_parents(char *refname)
static void try_remove_empty_parents(const char *refname)
{
struct strbuf buf = STRBUF_INIT;
char *p, *q;
int i;
p = refname;
strbuf_addstr(&buf, refname);
p = buf.buf;
for (i = 0; i < 2; i++) { /* refs/{heads,tags,...}/ */
while (*p && *p != '/')
p++;
@ -2296,8 +2298,7 @@ static void try_remove_empty_parents(char *refname)
while (*p == '/')
p++;
}
for (q = p; *q; q++)
;
q = buf.buf + buf.len;
while (1) {
while (q > p && *q != '/')
q--;
@ -2305,10 +2306,11 @@ static void try_remove_empty_parents(char *refname)
q--;
if (q == p)
break;
*q = '\0';
if (rmdir(git_path("%s", refname)))
strbuf_setlen(&buf, q - buf.buf);
if (rmdir(git_path("%s", buf.buf)))
break;
}
strbuf_release(&buf);
}
/* make sure nobody touched the ref, and unlink */