Merge branch 'cc/starts-n-ends-with-endgame'

prefixcmp/suffixcmp are gone.
This commit is contained in:
Junio C Hamano
2014-03-07 15:18:17 -08:00
3 changed files with 1 additions and 21 deletions

View File

@ -58,7 +58,7 @@ static const char *map_refspec(const char *ref,
}
if (push_default == PUSH_DEFAULT_UPSTREAM &&
!prefixcmp(matched->name, "refs/heads/")) {
starts_with(matched->name, "refs/heads/")) {
struct branch *branch = branch_get(matched->name + 11);
if (branch->merge_nr == 1 && branch->merge[0]->src) {
struct strbuf buf = STRBUF_INIT;