mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-18 01:56:15 +02:00
Code

Merge branch 'fixes'

This commit is contained in:
Junio C Hamano 2005-09-24 23:50:36 -07:00
parent a55797672d fbaf834de1
commit dbc3743868
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-grep.sh
View File

@ -40,4 +40,4 @@ while : ; do
shift
done
git-ls-files -z "${git_flags[@]}" "$@" |
xargs -0 grep "${flags[@]}" "$pattern"
xargs -0 grep "${flags[@]}" -e "$pattern"

15
show-branch.c
View File

@ -138,7 +138,20 @@ static void name_commits(struct commit_list *list,
nth++;
if (p->object.util)
continue;
sprintf(newname, "%s^%d", n->head_name, nth);
switch (n->generation) {
case 0:
sprintf(newname, "%s^%d",
n->head_name, nth);
break;
case 1:
sprintf(newname, "%s^^%d",
n->head_name, nth);
break;
default:
sprintf(newname, "%s~%d^%d",
n->head_name, n->generation,
nth);
}
name_commit(p, strdup(newname), 0);
i++;
name_first_parent_chain(p);