X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=builtin-send-pack.c;h=bb9c33a6506290edad096acaa52330dd48df6135;hb=7f0475c308625fb9e4cbbad8dc665983571cc5cf;hp=b0cfae83fc4dcdd8f58e29b87fd8aa4b6af0f6c0;hpb=992221d05e42ad9f65a88318ca6339aa1c39fc79;p=git.git diff --git a/builtin-send-pack.c b/builtin-send-pack.c index b0cfae83f..bb9c33a65 100644 --- a/builtin-send-pack.c +++ b/builtin-send-pack.c @@ -264,9 +264,7 @@ static void print_ref_status(char flag, const char *summary, struct ref *to, str static const char *status_abbrev(unsigned char sha1[20]) { - const char *abbrev; - abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV); - return abbrev ? abbrev : sha1_to_hex(sha1); + return find_unique_abbrev(sha1, DEFAULT_ABBREV); } static void print_ok_ref_status(struct ref *ref) @@ -539,7 +537,7 @@ static void verify_remote_names(int nr_heads, const char **heads) int i; for (i = 0; i < nr_heads; i++) { - const char *remote = strchr(heads[i], ':'); + const char *remote = strrchr(heads[i], ':'); remote = remote ? (remote + 1) : heads[i]; switch (check_ref_format(remote)) {