diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-30 14:07:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-30 14:07:16 -0700 |
| commit | 42e1cc517b2a57fa2fad6cc41238bfdbc3f4b9d7 (patch) | |
| tree | 30bfc05a903be4375b5330d374ffdefc48686a9a /sha1_name.c | |
| parent | Merge branch 'ab/doc-submitting' (diff) | |
| parent | rev-parse: match @{upstream}, @{u} and @{push} case-insensitively (diff) | |
| download | tgif-42e1cc517b2a57fa2fad6cc41238bfdbc3f4b9d7.tar.xz | |
Merge branch 'ab/case-insensitive-upstream-and-push-marker'
On many keyboards, typing "@{" involves holding down SHIFT key and
one can easily end up with "@{Up..." when typing "@{upstream}". As
the upstream/push keywords do not appear anywhere else in the syntax,
we can safely accept them case insensitively without introducing
ambiguity or confusion to solve this.
* ab/case-insensitive-upstream-and-push-marker:
rev-parse: match @{upstream}, @{u} and @{push} case-insensitively
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c index cda9e49b12..d9d1b2fce8 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -549,7 +549,7 @@ static inline int at_mark(const char *string, int len, for (i = 0; i < nr; i++) { int suffix_len = strlen(suffix[i]); if (suffix_len <= len - && !memcmp(string, suffix[i], suffix_len)) + && !strncasecmp(string, suffix[i], suffix_len)) return suffix_len; } return 0; |