diff: do not use null sha1 as a sentinel value
[git/git.git] / builtin / diff.c
CommitLineData
65056021
JH
1/*
2 * Builtin "git diff"
3 *
4 * Copyright (c) 2006 Junio C Hamano
5 */
6#include "cache.h"
6b2f2d98 7#include "color.h"
65056021
JH
8#include "commit.h"
9#include "blob.h"
10#include "tag.h"
11#include "diff.h"
12#include "diffcore.h"
13#include "revision.h"
14#include "log-tree.h"
15#include "builtin.h"
302ad7a9 16#include "submodule.h"
0041f09d 17#include "sha1-array.h"
65056021 18
65056021
JH
19struct blobinfo {
20 unsigned char sha1[20];
21 const char *name;
01618a3a 22 unsigned mode;
65056021
JH
23};
24
25static const char builtin_diff_usage[] =
9edb8a0f 26"git diff [<options>] [<commit> [<commit>]] [--] [<path>...]";
65056021 27
65056021
JH
28static void stuff_change(struct diff_options *opt,
29 unsigned old_mode, unsigned new_mode,
30 const unsigned char *old_sha1,
31 const unsigned char *new_sha1,
e5450100
JK
32 int old_sha1_valid,
33 int new_sha1_valid,
65056021
JH
34 const char *old_name,
35 const char *new_name)
36{
37 struct diff_filespec *one, *two;
38
0bef57ee 39 if (!is_null_sha1(old_sha1) && !is_null_sha1(new_sha1) &&
43342941 40 !hashcmp(old_sha1, new_sha1) && (old_mode == new_mode))
65056021
JH
41 return;
42
8f67f8ae 43 if (DIFF_OPT_TST(opt, REVERSE_DIFF)) {
65056021 44 unsigned tmp;
d92f1dc6 45 const unsigned char *tmp_u;
65056021
JH
46 const char *tmp_c;
47 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
48 tmp_u = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_u;
49 tmp_c = old_name; old_name = new_name; new_name = tmp_c;
50 }
cd676a51
JH
51
52 if (opt->prefix &&
53 (strncmp(old_name, opt->prefix, opt->prefix_length) ||
54 strncmp(new_name, opt->prefix, opt->prefix_length)))
55 return;
56
65056021
JH
57 one = alloc_filespec(old_name);
58 two = alloc_filespec(new_name);
e5450100
JK
59 fill_filespec(one, old_sha1, old_sha1_valid, old_mode);
60 fill_filespec(two, new_sha1, new_sha1_valid, new_mode);
65056021 61
65056021
JH
62 diff_queue(&diff_queued_diff, one, two);
63}
64
65static int builtin_diff_b_f(struct rev_info *revs,
66 int argc, const char **argv,
67 struct blobinfo *blob,
68 const char *path)
69{
70 /* Blob vs file in the working tree*/
71 struct stat st;
72
a610786f
TH
73 if (argc > 1)
74 usage(builtin_diff_usage);
75
65056021 76 if (lstat(path, &st))
54214529 77 die_errno(_("failed to stat '%s'"), path);
65056021 78 if (!(S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)))
54214529 79 die(_("'%s': not a regular file or symlink"), path);
01618a3a 80
a5a818ee
JH
81 diff_set_mnemonic_prefix(&revs->diffopt, "o/", "w/");
82
01618a3a
MK
83 if (blob[0].mode == S_IFINVALID)
84 blob[0].mode = canon_mode(st.st_mode);
85
65056021 86 stuff_change(&revs->diffopt,
01618a3a 87 blob[0].mode, canon_mode(st.st_mode),
65056021 88 blob[0].sha1, null_sha1,
e5450100 89 1, 0,
065e0b12 90 path, path);
65056021
JH
91 diffcore_std(&revs->diffopt);
92 diff_flush(&revs->diffopt);
93 return 0;
94}
95
96static int builtin_diff_blobs(struct rev_info *revs,
97 int argc, const char **argv,
98 struct blobinfo *blob)
99{
65056021
JH
100 unsigned mode = canon_mode(S_IFREG | 0644);
101
a610786f
TH
102 if (argc > 1)
103 usage(builtin_diff_usage);
104
01618a3a
MK
105 if (blob[0].mode == S_IFINVALID)
106 blob[0].mode = mode;
107
108 if (blob[1].mode == S_IFINVALID)
109 blob[1].mode = mode;
110
65056021 111 stuff_change(&revs->diffopt,
01618a3a 112 blob[0].mode, blob[1].mode,
f82cd3c6 113 blob[0].sha1, blob[1].sha1,
e5450100 114 1, 1,
53dd8a9c 115 blob[0].name, blob[1].name);
65056021
JH
116 diffcore_std(&revs->diffopt);
117 diff_flush(&revs->diffopt);
118 return 0;
119}
120
121static int builtin_diff_index(struct rev_info *revs,
122 int argc, const char **argv)
123{
124 int cached = 0;
125 while (1 < argc) {
126 const char *arg = argv[1];
2baf1850 127 if (!strcmp(arg, "--cached") || !strcmp(arg, "--staged"))
65056021 128 cached = 1;
65056021
JH
129 else
130 usage(builtin_diff_usage);
131 argv++; argc--;
132 }
4f38f6b5
NTND
133 if (!cached)
134 setup_work_tree();
65056021
JH
135 /*
136 * Make sure there is one revision (i.e. pending object),
137 * and there is no revision filtering parameters.
138 */
1f1e895f 139 if (revs->pending.nr != 1 ||
65056021
JH
140 revs->max_count != -1 || revs->min_age != -1 ||
141 revs->max_age != -1)
142 usage(builtin_diff_usage);
66f13625 143 if (read_cache_preload(revs->diffopt.pathspec.raw) < 0) {
671c9b7e 144 perror("read_cache_preload");
b4e1e4a7
JH
145 return -1;
146 }
65056021
JH
147 return run_diff_index(revs, cached);
148}
149
150static int builtin_diff_tree(struct rev_info *revs,
151 int argc, const char **argv,
1f1e895f 152 struct object_array_entry *ent)
65056021 153{
65056021 154 const unsigned char *(sha1[2]);
1f1e895f 155 int swap = 0;
a610786f
TH
156
157 if (argc > 1)
158 usage(builtin_diff_usage);
0fe7c1de
JH
159
160 /* We saw two trees, ent[0] and ent[1].
82e5a82f 161 * if ent[1] is uninteresting, they are swapped
0fe7c1de 162 */
1f1e895f
LT
163 if (ent[1].item->flags & UNINTERESTING)
164 swap = 1;
65056021
JH
165 sha1[swap] = ent[0].item->sha1;
166 sha1[1-swap] = ent[1].item->sha1;
167 diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt);
168 log_tree_diff_flush(revs);
169 return 0;
170}
171
0fe7c1de
JH
172static int builtin_diff_combined(struct rev_info *revs,
173 int argc, const char **argv,
1f1e895f 174 struct object_array_entry *ent,
0fe7c1de
JH
175 int ents)
176{
0041f09d 177 struct sha1_array parents = SHA1_ARRAY_INIT;
0fe7c1de
JH
178 int i;
179
a610786f
TH
180 if (argc > 1)
181 usage(builtin_diff_usage);
182
0fe7c1de
JH
183 if (!revs->dense_combined_merges && !revs->combine_merges)
184 revs->dense_combined_merges = revs->combine_merges = 1;
0041f09d
RS
185 for (i = 1; i < ents; i++)
186 sha1_array_append(&parents, ent[i].item->sha1);
187 diff_tree_combined(ent[0].item->sha1, &parents,
0fe7c1de 188 revs->dense_combined_merges, revs);
0041f09d 189 sha1_array_clear(&parents);
0fe7c1de
JH
190 return 0;
191}
192
aecbf914
JH
193static void refresh_index_quietly(void)
194{
195 struct lock_file *lock_file;
196 int fd;
197
198 lock_file = xcalloc(1, sizeof(struct lock_file));
199 fd = hold_locked_index(lock_file, 0);
200 if (fd < 0)
201 return;
202 discard_cache();
203 read_cache();
204 refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED);
ccdc4ec3 205 update_index_if_able(&the_index, lock_file);
aecbf914
JH
206}
207
0569e9b8
JH
208static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv)
209{
0569e9b8
JH
210 unsigned int options = 0;
211
212 while (1 < argc && argv[1][0] == '-') {
213 if (!strcmp(argv[1], "--base"))
214 revs->max_count = 1;
215 else if (!strcmp(argv[1], "--ours"))
216 revs->max_count = 2;
217 else if (!strcmp(argv[1], "--theirs"))
218 revs->max_count = 3;
219 else if (!strcmp(argv[1], "-q"))
220 options |= DIFF_SILENT_ON_REMOVED;
1c370ea4
MM
221 else if (!strcmp(argv[1], "-h"))
222 usage(builtin_diff_usage);
0569e9b8 223 else
54214529 224 return error(_("invalid option: %s"), argv[1]);
0569e9b8
JH
225 argv++; argc--;
226 }
227
903e09a3
JH
228 /*
229 * "diff --base" should not combine merges because it was not
230 * asked to. "diff -c" should not densify (if the user wants
231 * dense one, --cc can be explicitly asked for, or just rely
232 * on the default).
233 */
234 if (revs->max_count == -1 && !revs->combine_merges &&
0569e9b8
JH
235 (revs->diffopt.output_format & DIFF_FORMAT_PATCH))
236 revs->combine_merges = revs->dense_combined_merges = 1;
237
4f38f6b5 238 setup_work_tree();
66f13625 239 if (read_cache_preload(revs->diffopt.pathspec.raw) < 0) {
671c9b7e 240 perror("read_cache_preload");
0569e9b8
JH
241 return -1;
242 }
e7c3a59c 243 return run_diff_files(revs, options);
0569e9b8
JH
244}
245
a633fca0 246int cmd_diff(int argc, const char **argv, const char *prefix)
65056021 247{
1f1e895f 248 int i;
65056021 249 struct rev_info rev;
1f1e895f 250 struct object_array_entry ent[100];
65056021 251 int ents = 0, blobs = 0, paths = 0;
a633fca0 252 const char *path = NULL;
65056021 253 struct blobinfo blob[2];
af05d679 254 int nongit;
41bbf9d5 255 int result = 0;
65056021
JH
256
257 /*
258 * We could get N tree-ish in the rev.pending_objects list.
259 * Also there could be M blobs there, and P pathspecs.
260 *
261 * N=0, M=0:
262 * cache vs files (diff-files)
263 * N=0, M=2:
264 * compare two random blobs. P must be zero.
265 * N=0, M=1, P=1:
266 * compare a blob with a working tree file.
267 *
268 * N=1, M=0:
269 * tree vs cache (diff-index --cached)
270 *
271 * N=2, M=0:
272 * tree vs tree (diff-tree)
273 *
0569e9b8
JH
274 * N=0, M=0, P=2:
275 * compare two filesystem entities (aka --no-index).
276 *
65056021
JH
277 * Other cases are errors.
278 */
230f544e 279
d516c2d1 280 prefix = setup_git_directory_gently(&nongit);
302ad7a9 281 gitmodules_config();
ef90d6d4 282 git_config(git_diff_ui_config, NULL);
6b2f2d98 283
db6296a5 284 init_revisions(&rev, prefix);
0569e9b8
JH
285
286 /* If this is a no-index diff, just run it and exit there. */
287 diff_no_index(&rev, argc, argv, nongit, prefix);
288
289 /* Otherwise, we are doing the usual "git" diff */
aecbf914 290 rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;
65056021 291
5ec11af6 292 /* Default to let external and textconv be used */
61af494c 293 DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL);
5ec11af6 294 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
61af494c 295
0569e9b8 296 if (nongit)
54214529 297 die(_("Not a git repository"));
0569e9b8 298 argc = setup_revisions(argc, argv, &rev, NULL);
047fbe90 299 if (!rev.diffopt.output_format) {
c9b5ef99 300 rev.diffopt.output_format = DIFF_FORMAT_PATCH;
72ee96c0 301 if (diff_setup_done(&rev.diffopt) < 0)
54214529 302 die(_("diff_setup_done failed"));
047fbe90 303 }
61af494c 304
8f67f8ae 305 DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
c9b5ef99 306
da31b358
JH
307 /*
308 * If the user asked for our exit code then don't start a
89d07f75
RS
309 * pager or we would end up reporting its exit code instead.
310 */
8f0359f0
AR
311 if (!DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS) &&
312 check_pager_config("diff") != 0)
89d07f75
RS
313 setup_pager();
314
0569e9b8
JH
315 /*
316 * Do we have --cached and not have a pending object, then
65056021
JH
317 * default to HEAD by hand. Eek.
318 */
1f1e895f 319 if (!rev.pending.nr) {
65056021
JH
320 int i;
321 for (i = 1; i < argc; i++) {
322 const char *arg = argv[i];
323 if (!strcmp(arg, "--"))
324 break;
2baf1850
DS
325 else if (!strcmp(arg, "--cached") ||
326 !strcmp(arg, "--staged")) {
3384a2df 327 add_head_to_pending(&rev);
a2b7a3b3
NTND
328 if (!rev.pending.nr) {
329 struct tree *tree;
330 tree = lookup_tree((const unsigned char*)EMPTY_TREE_SHA1_BIN);
331 add_pending_object(&rev, &tree->object, "HEAD");
332 }
65056021
JH
333 break;
334 }
335 }
336 }
337
1f1e895f
LT
338 for (i = 0; i < rev.pending.nr; i++) {
339 struct object_array_entry *list = rev.pending.objects+i;
65056021
JH
340 struct object *obj = list->item;
341 const char *name = list->name;
342 int flags = (obj->flags & UNINTERESTING);
343 if (!obj->parsed)
344 obj = parse_object(obj->sha1);
345 obj = deref_tag(obj, NULL, 0);
346 if (!obj)
54214529 347 die(_("invalid object '%s' given."), name);
1974632c 348 if (obj->type == OBJ_COMMIT)
65056021 349 obj = &((struct commit *)obj)->tree->object;
1974632c 350 if (obj->type == OBJ_TREE) {
0fe7c1de 351 if (ARRAY_SIZE(ent) <= ents)
54214529 352 die(_("more than %d trees given: '%s'"),
334b506a 353 (int) ARRAY_SIZE(ent), name);
65056021
JH
354 obj->flags |= flags;
355 ent[ents].item = obj;
356 ent[ents].name = name;
357 ents++;
358 continue;
359 }
1974632c 360 if (obj->type == OBJ_BLOB) {
65056021 361 if (2 <= blobs)
54214529 362 die(_("more than two blobs given: '%s'"), name);
e702496e 363 hashcpy(blob[blobs].sha1, obj->sha1);
65056021 364 blob[blobs].name = name;
01618a3a 365 blob[blobs].mode = list->mode;
65056021
JH
366 blobs++;
367 continue;
230f544e 368
65056021 369 }
54214529 370 die(_("unhandled object '%s' given."), name);
65056021 371 }
afe069d1
NTND
372 if (rev.prune_data.nr) {
373 if (!path)
374 path = rev.prune_data.items[0].match;
375 paths += rev.prune_data.nr;
65056021
JH
376 }
377
378 /*
379 * Now, do the arguments look reasonable?
380 */
381 if (!ents) {
382 switch (blobs) {
383 case 0:
0569e9b8 384 result = builtin_diff_files(&rev, argc, argv);
65056021
JH
385 break;
386 case 1:
387 if (paths != 1)
388 usage(builtin_diff_usage);
41bbf9d5 389 result = builtin_diff_b_f(&rev, argc, argv, blob, path);
65056021
JH
390 break;
391 case 2:
0fe7c1de
JH
392 if (paths)
393 usage(builtin_diff_usage);
41bbf9d5 394 result = builtin_diff_blobs(&rev, argc, argv, blob);
65056021
JH
395 break;
396 default:
397 usage(builtin_diff_usage);
398 }
399 }
400 else if (blobs)
401 usage(builtin_diff_usage);
402 else if (ents == 1)
41bbf9d5 403 result = builtin_diff_index(&rev, argc, argv);
65056021 404 else if (ents == 2)
41bbf9d5 405 result = builtin_diff_tree(&rev, argc, argv, ent);
c008c0ff 406 else if (ent[0].item->flags & UNINTERESTING) {
c008c0ff
JH
407 /*
408 * diff A...B where there is at least one merge base
409 * between A and B. We have ent[0] == merge-base,
410 * ent[ents-2] == A, and ent[ents-1] == B. Show diff
411 * between the base and B. Note that we pick one
412 * merge base at random if there are more than one.
413 */
414 ent[1] = ent[ents-1];
41bbf9d5 415 result = builtin_diff_tree(&rev, argc, argv, ent);
c008c0ff 416 } else
41bbf9d5 417 result = builtin_diff_combined(&rev, argc, argv,
c008c0ff 418 ent, ents);
da31b358 419 result = diff_result_code(&rev.diffopt, result);
aecbf914
JH
420 if (1 < rev.diffopt.skip_stat_unmatch)
421 refresh_index_quietly();
41bbf9d5 422 return result;
65056021 423}