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

strbuf_branchname(): a wrapper for branch name shorthands

Browse Source 
The function takes a user-supplied string that is supposed to be a branch
name, and puts it in a strbuf after expanding possible shorthand notation.

A handful of open coded sequence to do this in the existing code have been
changed to use this helper function.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2009-03-21 13:17:30 -07:00
parent 431b1969fc
commit a552de75eb
6 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin-merge.c
View File

@ -360,9 +360,8 @@ static void merge_name(const char *remote, struct strbuf *msg)
const char *ptr;
int len, early;
len = strlen(remote);
if (interpret_branch_name(remote, &bname) == len)
remote = bname.buf;
strbuf_branchname(&bname, remote);
remote = bname.buf;
memset(branch_head, 0, sizeof(branch_head));
remote_head = peel_to_type(remote, 0, NULL, OBJ_COMMIT);