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

Merge branch 'di/fast-import-tagging'

Browse Source 
* di/fast-import-tagging:
  fast-import: allow to tag newly created objects
  fast-import: add tests for tagging blobs
This commit is contained in:
Junio C Hamano
2011-08-28 21:18:48 -07:00
parent 05d88e6f7e 6c447f633c
commit 0dc691a4f3
2 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fast-import.c
View File

@ -2726,13 +2726,13 @@ static void parse_new_tag(void)
type = oe->type;
hashcpy(sha1, oe->idx.sha1);
} else if (!get_sha1(from, sha1)) {
unsigned long size;
char *buf;
buf = read_sha1_file(sha1, &type, &size);
if (!buf || size < 46)
die("Not a valid commit: %s", from);
free(buf);
struct object_entry *oe = find_object(sha1);
if (!oe) {
type = sha1_object_info(sha1, NULL);
if (type < 0)
die("Not a valid object: %s", from);
} else
type = oe->type;
} else
die("Invalid ref name or SHA1 expression: %s", from);
read_next_command();