Merge branch 'jc/a-commands-without-the-repo'
Commands that can also work outside Git have learned to take the repository instance "repo" when we know we are in a repository, and NULL when we are not, in a parameter. The uses of the_repository variable in a few of them have been removed using the new calling convention. * jc/a-commands-without-the-repo: archive: remove the_repository global variable annotate: remove usage of the_repository global git: pass in repo to builtin based on setup_git_directory_gently
This commit is contained in:
@ -4,7 +4,6 @@
|
||||
* Copyright (C) 2006 Ryan Anderson
|
||||
*/
|
||||
|
||||
#define USE_THE_REPOSITORY_VARIABLE
|
||||
#include "git-compat-util.h"
|
||||
#include "builtin.h"
|
||||
#include "strvec.h"
|
||||
@ -12,7 +11,7 @@
|
||||
int cmd_annotate(int argc,
|
||||
const char **argv,
|
||||
const char *prefix,
|
||||
struct repository *repo UNUSED)
|
||||
struct repository *repo)
|
||||
{
|
||||
struct strvec args = STRVEC_INIT;
|
||||
const char **args_copy;
|
||||
@ -29,7 +28,7 @@ int cmd_annotate(int argc,
|
||||
CALLOC_ARRAY(args_copy, args.nr + 1);
|
||||
COPY_ARRAY(args_copy, args.v, args.nr);
|
||||
|
||||
ret = cmd_blame(args.nr, args_copy, prefix, the_repository);
|
||||
ret = cmd_blame(args.nr, args_copy, prefix, repo);
|
||||
|
||||
strvec_clear(&args);
|
||||
free(args_copy);
|
||||
|
Reference in New Issue
Block a user