diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-21 13:17:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-22 23:44:08 -0700 |
| commit | a552de75eb01f78046feaf7dc88e5e4833624ad5 (patch) | |
| tree | d069272f15dc3876743f24ed75c43f4209c004b4 /builtin-branch.c | |
| parent | 431b1969fcde69959a23355fba6894fb69c8fa0c (diff) | |
| download | git-a552de75eb01f78046feaf7dc88e5e4833624ad5.tar.gz git-a552de75eb01f78046feaf7dc88e5e4833624ad5.tar.xz | |
strbuf_branchname(): a wrapper for branch name shorthands
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>
Diffstat (limited to 'builtin-branch.c')
| -rw-r--r-- | builtin-branch.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index cacd7daae..7452db13c 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -121,11 +121,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds) die("Couldn't look up commit object for HEAD"); } for (i = 0; i < argc; i++, strbuf_release(&bname)) { - int len = strlen(argv[i]); - - if (interpret_branch_name(argv[i], &bname) != len) - strbuf_add(&bname, argv[i], len); - + strbuf_branchname(&bname, argv[i]); if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) { error("Cannot delete the branch '%s' " "which you are currently on.", bname.buf); |