bekucera/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-09-10 22:44:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/pass-repo-to-builtins'

Browse Source 
The convention to calling into built-in command implementation has
been updated to pass the repository, if known, together with the
prefix value.

* jc/pass-repo-to-builtins:
  add: pass in repo variable instead of global the_repository
  builtin: remove USE_THE_REPOSITORY for those without the_repository
  builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h
  builtin: add a repository parameter for builtin functions
This commit is contained in:
Junio C Hamano
2024-09-23 10:35:09 -07:00
parent 0f41fd28f9 836474560b
commit b8e318ea58
128 changed files with 903 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/difftool.c
View File

@@ -11,8 +11,9 @@
*
* Copyright (C) 2016 Johannes Schindelin
*/
#define USE_THE_REPOSITORY_VARIABLE
#include "builtin.h"
#include "abspath.h"
#include "config.h"
#include "copy.h"
@@ -691,7 +692,10 @@ static int run_file_diff(int prompt, const char *prefix,
return run_command(child);
}
int cmd_difftool(int argc, const char **argv, const char *prefix)
int cmd_difftool(int argc,
const char **argv,
const char *prefix,
struct repository *repo UNUSED)
{
int use_gui_tool = -1, dir_diff = 0, prompt = -1, symlinks = 0,
tool_help = 0, no_index = 0;