diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:15:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:15:04 -0700 |
| commit | e867110340c236d2ba977d2c4bf1274a297f4e21 (patch) | |
| tree | 9fbb0b5d2dd64c2753d1232ff23fe776c862703f /builtin | |
| parent | Merge branch 'ar/doc-libera-chat-in-my-first-contrib' (diff) | |
| parent | builtins + test helpers: use return instead of exit() in cmd_* (diff) | |
| download | tgif-e867110340c236d2ba977d2c4bf1274a297f4e21.tar.xz | |
Merge branch 'ab/cmd-foo-should-return'
Code clean-up.
* ab/cmd-foo-should-return:
builtins + test helpers: use return instead of exit() in cmd_*
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/difftool.c | 5 | ||||
| -rw-r--r-- | builtin/merge-ours.c | 4 | ||||
| -rw-r--r-- | builtin/mktree.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/builtin/difftool.c b/builtin/difftool.c index 89334b77fb..6a9242a803 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -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) diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index 4594507420..3583cff71c 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -28,6 +28,6 @@ int cmd_merge_ours(int argc, const char **argv, const char *prefix) if (read_cache() < 0) die_errno("read_cache failed"); if (index_differs_from(the_repository, "HEAD", NULL, 0)) - exit(2); - exit(0); + return 2; + return 0; } diff --git a/builtin/mktree.c b/builtin/mktree.c index 891991b00d..ae78ca1c02 100644 --- a/builtin/mktree.c +++ b/builtin/mktree.c @@ -189,5 +189,5 @@ int cmd_mktree(int ac, const char **av, const char *prefix) used=0; /* reset tree entry buffer for re-use in batch mode */ } strbuf_release(&sb); - exit(0); + return 0; } |