@matheusbsbs / matheus-bagliano / commits / c6d75bc17a

alias: add support for aliases of an alias

Aliases can only contain non-alias git commands and their arguments, not other user-defined aliases. Resolving further (nested) aliases is prevented by breaking the loop after the first alias was processed. Git then fails with a command-not-found error. Allow resolving nested aliases by not breaking the loop in run_argv() after the first alias was processed. Instead, continue the loop until `handle_alias()` fails, which means that there are no further aliases that can be processed. Prevent looping aliases by storing substituted commands in `cmd_list` and checking if a command has been substituted previously. While we're at it, fix a styling issue just below the added code. Signed-off-by: Tim Schumacher <timschumi@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Tim Schumacher committed Sep 16, 2018 at 09:50 UTC c6d75bc17a045af8cadd2dce982f5737a5ca38bb
1 file changed +12 -3
git.c
+12 -3
@@ -674,6 +674,7 @@ static void execv_dashed_external(const char **argv)
674 static int run_argv(int *argcp, const char ***argv)
675 {
676 int done_alias = 0;
677 + struct string_list cmd_list = STRING_LIST_INIT_NODUP;
678
679 while (1) {
680 /*
@@ -691,17 +692,25 @@ static int run_argv(int *argcp, const char ***argv)
692 /* .. then try the external ones */
693 execv_dashed_external(*argv);
694
694 - /* It could be an alias -- this works around the insanity
695 + if (unsorted_string_list_has_string(&cmd_list, *argv[0])) {
696 + die(_("alias loop detected: expansion of '%s' does"
697 + " not terminate"), cmd_list.items[0].string);
698 + }
699 +
700 + string_list_append(&cmd_list, *argv[0]);
701 +
702 + /*
703 + * It could be an alias -- this works around the insanity
704 * of overriding "git log" with "git show" by having
705 * alias.log = show
706 */
698 - if (done_alias)
699 - break;
707 if (!handle_alias(argcp, argv))
708 break;
709 done_alias = 1;
710 }
711
712 + string_list_clear(&cmd_list, 0);
713 +
714 return done_alias;
715 }
716