Skip to content

Commit af0c222

Browse files
committed
Merge branch 'CamelCased-aliases'
This topic branch fixes a regression introduced with Git v2.13.3, where CamelCased aliases no longer resolved correctly all of a sudden. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2 parents 1224201 + eeb37a1 commit af0c222

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

alias.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ static int config_alias_cb(const char *key, const char *value, void *d)
1111
struct config_alias_data *data = d;
1212
const char *p;
1313

14-
if (skip_prefix(key, "alias.", &p) && !strcmp(p, data->alias))
14+
if (skip_prefix(key, "alias.", &p) && !strcasecmp(p, data->alias))
1515
return git_config_string((const char **)&data->v, key, value);
1616

1717
return 0;

t/t1300-repo-config.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,6 +1075,13 @@ test_expect_success 'git -c works with aliases of builtins' '
10751075
test_cmp expect actual
10761076
'
10771077

1078+
test_expect_success 'aliases can be CamelCased' '
1079+
test_config alias.CamelCased "rev-parse HEAD" &&
1080+
git CamelCased >out &&
1081+
git rev-parse HEAD >expect &&
1082+
test_cmp expect out
1083+
'
1084+
10781085
test_expect_success 'git -c does not split values on equals' '
10791086
echo "value with = in it" >expect &&
10801087
git -c core.foo="value with = in it" config core.foo >actual &&

0 commit comments

Comments
 (0)