Merge branch 'ap/prune'
* ap/prune: Typefix builtin-prune.c::prune_object() Improve git-prune -n output
This commit is contained in:
commit
f3307deeec
@ -16,8 +16,15 @@ static struct rev_info revs;
|
||||
|
||||
static int prune_object(char *path, const char *filename, const unsigned char *sha1)
|
||||
{
|
||||
char buf[20];
|
||||
const char *type;
|
||||
|
||||
if (show_only) {
|
||||
printf("would prune %s/%s\n", path, filename);
|
||||
if (sha1_object_info(sha1, buf, NULL))
|
||||
type = "unknown";
|
||||
else
|
||||
type = buf;
|
||||
printf("%s %s\n", sha1_to_hex(sha1), type);
|
||||
return 0;
|
||||
}
|
||||
unlink(mkpath("%s/%s", path, filename));
|
||||
|
Loading…
Reference in New Issue
Block a user