summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-11-09 12:51:06 -0500
committerJeff King <peff@peff.net>2012-11-09 12:51:06 -0500
commit19fb61369583410a4f79dbc065b4dc8125236c0b (patch)
tree7f7498d204f8df97ddc0cd6726154a0ce5fa5bb7 /builtin/diff.c
parent9d91c0e3d5d1bf9339a31ecbd5f6defdac8540d0 (diff)
parent745f7a8cacae55df3e00507344d8db2a31eb57e8 (diff)
downloadgit-19fb61369583410a4f79dbc065b4dc8125236c0b.tar.gz
Merge branch 'nd/builtin-to-libgit'
Code cleanups so that libgit.a does not depend on anything in the builtin/ directory. * nd/builtin-to-libgit: fetch-pack: move core code to libgit.a fetch-pack: remove global (static) configuration variable "args" send-pack: move core code to libgit.a Move setup_diff_pager to libgit.a Move print_commit_list to libgit.a Move estimate_bisect_steps to libgit.a Move try_merge_command and checkout_fast_forward to libgit.a
Diffstat (limited to 'builtin/diff.c')
-rw-r--r--builtin/diff.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/builtin/diff.c b/builtin/diff.c
index 9650be2c50..9c70e40809 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -418,19 +418,3 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
refresh_index_quietly();
return result;
}
-
-void setup_diff_pager(struct diff_options *opt)
-{
- /*
- * If the user asked for our exit code, then either they want --quiet
- * or --exit-code. We should definitely not bother with a pager in the
- * former case, as we will generate no output. Since we still properly
- * report our exit code even when a pager is run, we _could_ run a
- * pager with --exit-code. But since we have not done so historically,
- * and because it is easy to find people oneline advising "git diff
- * --exit-code" in hooks and other scripts, we do not do so.
- */
- if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
- check_pager_config("diff") != 0)
- setup_pager();
-}