Linus Torvalds | 8bc9a0c | 2005-04-07 15:16:10 -0700 | [diff] [blame] | 1 | /* |
| 2 | * GIT - The information manager from hell |
| 3 | * |
| 4 | * Copyright (C) Linus Torvalds, 2005 |
| 5 | */ |
Nguyễn Thái Ngọc Duy | f8adbec | 2019-01-24 15:29:12 +0700 | [diff] [blame] | 6 | #define USE_THE_INDEX_COMPATIBILITY_MACROS |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 7 | #include "cache.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 8 | #include "config.h" |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 9 | #include "diff.h" |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 10 | #include "commit.h" |
| 11 | #include "revision.h" |
Peter Eriksen | e8cc9cd | 2006-05-23 14:15:36 +0200 | [diff] [blame] | 12 | #include "builtin.h" |
Jens Lehmann | 302ad7a | 2010-08-06 00:40:48 +0200 | [diff] [blame] | 13 | #include "submodule.h" |
Christopher Li | c0fb976 | 2005-04-12 02:04:44 -0700 | [diff] [blame] | 14 | |
Petr Baudis | 4d1f119 | 2005-07-29 11:01:26 +0200 | [diff] [blame] | 15 | static const char diff_files_usage[] = |
Alex Henrie | 9c9b4f2 | 2015-01-13 00:44:47 -0700 | [diff] [blame] | 16 | "git diff-files [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]" |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 17 | COMMON_DIFF_OPTIONS_HELP; |
Junio C Hamano | b8f8092 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 18 | |
Linus Torvalds | a633fca | 2006-07-28 22:44:25 -0700 | [diff] [blame] | 19 | int cmd_diff_files(int argc, const char **argv, const char *prefix) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 20 | { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 21 | struct rev_info rev; |
Alex Riesen | 41bbf9d | 2007-03-14 01:17:04 +0100 | [diff] [blame] | 22 | int result; |
Junio C Hamano | 6304c29 | 2008-05-23 18:15:03 -0700 | [diff] [blame] | 23 | unsigned options = 0; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 24 | |
Junio C Hamano | 5a88f97 | 2017-06-01 13:38:16 +0900 | [diff] [blame] | 25 | if (argc == 2 && !strcmp(argv[1], "-h")) |
| 26 | usage(diff_files_usage); |
| 27 | |
Marc Branchaud | 37590ce | 2017-05-08 12:03:37 -0400 | [diff] [blame] | 28 | git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ |
Nguyễn Thái Ngọc Duy | 2abf350 | 2018-09-21 17:57:38 +0200 | [diff] [blame] | 29 | repo_init_revisions(the_repository, &rev, prefix); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 30 | rev.abbrev = 0; |
Srinidhi Kaushik | feea694 | 2020-06-20 22:08:45 +0530 | [diff] [blame] | 31 | |
| 32 | /* |
| 33 | * Consider "intent-to-add" files as new by default, unless |
| 34 | * explicitly specified in the command line or anywhere else. |
| 35 | */ |
| 36 | rev.diffopt.ita_invisible_in_index = 1; |
| 37 | |
Alexander Rinass | 90a78b8 | 2016-05-13 22:41:02 +0200 | [diff] [blame] | 38 | precompose_argv(argc, argv); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 39 | |
Junio C Hamano | 6304c29 | 2008-05-23 18:15:03 -0700 | [diff] [blame] | 40 | argc = setup_revisions(argc, argv, &rev, NULL); |
| 41 | while (1 < argc && argv[1][0] == '-') { |
| 42 | if (!strcmp(argv[1], "--base")) |
| 43 | rev.max_count = 1; |
| 44 | else if (!strcmp(argv[1], "--ours")) |
| 45 | rev.max_count = 2; |
| 46 | else if (!strcmp(argv[1], "--theirs")) |
| 47 | rev.max_count = 3; |
| 48 | else if (!strcmp(argv[1], "-q")) |
| 49 | options |= DIFF_SILENT_ON_REMOVED; |
| 50 | else |
| 51 | usage(diff_files_usage); |
| 52 | argv++; argc--; |
| 53 | } |
Timo Hirvonen | c9b5ef9 | 2006-06-24 20:24:14 +0300 | [diff] [blame] | 54 | if (!rev.diffopt.output_format) |
| 55 | rev.diffopt.output_format = DIFF_FORMAT_RAW; |
Junio C Hamano | 6304c29 | 2008-05-23 18:15:03 -0700 | [diff] [blame] | 56 | |
| 57 | /* |
| 58 | * Make sure there are NO revision (i.e. pending object) parameter, |
| 59 | * rev.max_count is reasonable (0 <= n <= 3), and |
| 60 | * there is no other revision filtering parameters. |
| 61 | */ |
| 62 | if (rev.pending.nr || |
| 63 | rev.min_age != -1 || rev.max_age != -1 || |
| 64 | 3 < rev.max_count) |
| 65 | usage(diff_files_usage); |
| 66 | |
Junio C Hamano | 903e09a | 2008-09-18 00:32:37 -0700 | [diff] [blame] | 67 | /* |
| 68 | * "diff-files --base -p" should not combine merges because it |
| 69 | * was not asked to. "diff-files -c -p" should not densify |
| 70 | * (the user should ask with "diff-files --cc" explicitly). |
| 71 | */ |
| 72 | if (rev.max_count == -1 && !rev.combine_merges && |
Junio C Hamano | 6304c29 | 2008-05-23 18:15:03 -0700 | [diff] [blame] | 73 | (rev.diffopt.output_format & DIFF_FORMAT_PATCH)) |
| 74 | rev.combine_merges = rev.dense_combined_merges = 1; |
| 75 | |
Nguyễn Thái Ngọc Duy | 5ab2a2d | 2013-07-14 15:35:49 +0700 | [diff] [blame] | 76 | if (read_cache_preload(&rev.diffopt.pathspec) < 0) { |
Linus Torvalds | 671c9b7 | 2008-11-13 16:36:30 -0800 | [diff] [blame] | 77 | perror("read_cache_preload"); |
Junio C Hamano | 6304c29 | 2008-05-23 18:15:03 -0700 | [diff] [blame] | 78 | return -1; |
| 79 | } |
| 80 | result = run_diff_files(&rev, options); |
Junio C Hamano | da31b35 | 2007-12-13 23:40:27 -0800 | [diff] [blame] | 81 | return diff_result_code(&rev.diffopt, result); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 82 | } |