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

Merge branch 'lt/xsha1' into next

Browse Source 
* lt/xsha1:
  get_sha1() shorthands for blob/tree objects
  Fix uninteresting tags in new revision parsing
This commit is contained in:
Junio C Hamano 2006-04-18 22:02:04 -07:00
commit 7de4473f6a
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
revision.c
View File

@ -152,6 +152,7 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object
if (parse_commit(commit) < 0)
die("unable to parse commit %s", name);
if (flags & UNINTERESTING) {
commit->object.flags |= UNINTERESTING;
mark_parents_uninteresting(commit);
revs->limited = 1;
}

67
sha1_name.c
View File

@ -3,6 +3,7 @@
#include "commit.h"
#include "tree.h"
#include "blob.h"
#include "diff.h"
static int find_short_object_filename(int len, const char *name, unsigned char *sha1)
{
@ -449,12 +450,76 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1)
return get_short_sha1(name, len, sha1, 0);
}
static int get_tree_entry(const unsigned char *, const char *, unsigned char *);
static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char *result)
{
int namelen = strlen(name);
while (t->size) {
const char *entry;
const unsigned char *sha1;
int entrylen, cmp;
unsigned mode;
sha1 = tree_entry_extract(t, &entry, &mode);
update_tree_entry(t);
entrylen = strlen(entry);
if (entrylen > namelen)
continue;
cmp = memcmp(name, entry, entrylen);
if (cmp > 0)
continue;
if (cmp < 0)
break;
if (entrylen == namelen) {
memcpy(result, sha1, 20);
return 0;
}
if (name[entrylen] != '/')
continue;
if (!S_ISDIR(mode))
break;
if (++entrylen == namelen) {
memcpy(result, sha1, 20);
return 0;
}
return get_tree_entry(sha1, name + entrylen, result);
}
return -1;
}
static int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned char *sha1)
{
int retval;
void *tree;
struct tree_desc t;
tree = read_object_with_reference(tree_sha1, tree_type, &t.size, NULL);
if (!tree)
return -1;
t.buf = tree;
retval = find_tree_entry(&t, name, sha1);
free(tree);
return retval;
}
/*
* This is like "get_sha1_basic()", except it allows "sha1 expressions",
* notably "xyz^" for "parent of xyz"
*/
int get_sha1(const char *name, unsigned char *sha1)
{
int ret;
prepare_alt_odb();
return get_sha1_1(name, strlen(name), sha1);
ret = get_sha1_1(name, strlen(name), sha1);
if (ret < 0) {
const char *cp = strchr(name, ':');
if (cp) {
unsigned char tree_sha1[20];
if (!get_sha1_1(name, cp-name, tree_sha1))
return get_tree_entry(tree_sha1, cp+1, sha1);
}
}
return ret;
}