diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-13 16:51:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-13 16:51:21 -0800 |
| commit | 429608fc365d4e6e0db9dee72a0b103dce578722 (patch) | |
| tree | 2d4488d7bdeae0afab713557f7edfd888c973e68 /name-rev.c | |
| parent | b42934d611054400de86e559577b421677b3f1ae (diff) | |
| parent | 59617ebb746b67921856c00a63f943d43b0abeea (diff) | |
| download | git-429608fc365d4e6e0db9dee72a0b103dce578722.tar.gz | |
Merge fixes up to GIT 1.1.2
Diffstat (limited to 'name-rev.c')
| -rw-r--r-- | name-rev.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/name-rev.c b/name-rev.c index 65333d4166..bbadb91aa0 100644 --- a/name-rev.c +++ b/name-rev.c @@ -93,10 +93,11 @@ static int name_ref(const char *path, const unsigned char *sha1) } if (o && o->type == commit_type) { struct commit *commit = (struct commit *)o; - const char *p; - while ((p = strchr(path, '/'))) - path = p+1; + if (!strncmp(path, "refs/heads/", 11)) + path = path + 11; + else if (!strncmp(path, "refs/", 5)) + path = path + 5; name_rev(commit, strdup(path), 0, 0, deref); } |
