diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-17 23:47:35 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-18 00:02:44 +0400 |
| commit | ad7044857660af7ffaaf8fbbccc77b817d1b938f (patch) | |
| tree | b77a7390dbbc1901e13d74c1738f327e5fa8154d /branch.c | |
| parent | 14a9c5f261bcc436b80700076257f02af0beec68 (diff) | |
| parent | 59556548230e617b837343c2c07e357e688e2ca4 (diff) | |
Merge branch 'cc/starts-n-ends-with'
Remove a few duplicate implementations of prefix/suffix comparison
functions, and rename them to starts_with and ends_with.
* cc/starts-n-ends-with:
replace {pre,suf}fixcmp() with {starts,ends}_with()
strbuf: introduce starts_with() and ends_with()
builtin/remote: remove postfixcmp() and use suffixcmp() instead
environment: normalize use of prefixcmp() by removing " != 0"
Diffstat (limited to 'branch.c')
| -rw-r--r-- | branch.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -50,7 +50,7 @@ static int should_setup_rebase(const char *origin) void install_branch_config(int flag, const char *local, const char *origin, const char *remote) { const char *shortname = remote + 11; - int remote_is_branch = !prefixcmp(remote, "refs/heads/"); + int remote_is_branch = starts_with(remote, "refs/heads/"); struct strbuf key = STRBUF_INIT; int rebasing = should_setup_rebase(origin); @@ -272,7 +272,7 @@ void create_branch(const char *head, break; case 1: /* Unique completion -- good, only if it is a real branch */ - if (prefixcmp(real_ref, "refs/heads/") && + if (!starts_with(real_ref, "refs/heads/") && validate_remote_tracking_branch(real_ref)) { if (explicit_tracking) die(_(upstream_not_branch), start_name); |