diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/git.c | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/git.c')
| -rw-r--r-- | third_party/git/git.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/git/git.c b/third_party/git/git.c index 7be7ad34bd05..c1ee7124edcf 100644 --- a/third_party/git/git.c +++ b/third_party/git/git.c @@ -369,7 +369,8 @@ static int handle_alias(int *argcp, const char ***argv) die(_("alias '%s' changes environment variables.\n" "You can use '!git' in the alias to do this"), alias_command); - MOVE_ARRAY(new_argv - option_count, new_argv, count); + memmove(new_argv - option_count, new_argv, + count * sizeof(char *)); new_argv -= option_count; if (count < 1) @@ -384,7 +385,7 @@ static int handle_alias(int *argcp, const char ***argv) REALLOC_ARRAY(new_argv, count + *argcp); /* insert after command name */ - COPY_ARRAY(new_argv + count, *argv + 1, *argcp); + memcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp); trace2_cmd_alias(alias_command, new_argv); trace2_cmd_list_config(); @@ -572,7 +573,6 @@ static struct cmd_struct commands[] = { { "show-branch", cmd_show_branch, RUN_SETUP }, { "show-index", cmd_show_index }, { "show-ref", cmd_show_ref, RUN_SETUP }, - { "sparse-checkout", cmd_sparse_checkout, RUN_SETUP | NEED_WORK_TREE }, { "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE }, /* * NEEDSWORK: Until the builtin stash is thoroughly robust and no |