mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/cmd-foo-should-return'

Browse Source 
Code clean-up.

* ab/cmd-foo-should-return:
  builtins + test helpers: use return instead of exit() in cmd_*
This commit is contained in:
Junio C Hamano
2021-07-08 13:15:04 -07:00
parent 11819cb741 338abb0f04
commit e867110340
9 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/difftool.c
View File

@ -675,7 +675,7 @@ static int run_file_diff(int prompt, const char *prefix,
"GIT_PAGER=", "GIT_EXTERNAL_DIFF=git-difftool--helper", NULL,
NULL
};
int ret = 0, i;
int i;
if (prompt > 0)
env[2] = "GIT_DIFFTOOL_PROMPT=true";
@ -686,8 +686,7 @@ static int run_file_diff(int prompt, const char *prefix,
strvec_push(&args, "diff");
for (i = 0; i < argc; i++)
strvec_push(&args, argv[i]);
ret = run_command_v_opt_cd_env(args.v, RUN_GIT_CMD, prefix, env);
exit(ret);
return run_command_v_opt_cd_env(args.v, RUN_GIT_CMD, prefix, env);
}
int cmd_difftool(int argc, const char **argv, const char *prefix)