Skip to content
Navigation Menu
Toggle navigation
Sign in
In this repository
All GitHub Enterprise
↵
Jump to
↵
No suggested jump to results
In this repository
All GitHub Enterprise
↵
Jump to
↵
In this organization
All GitHub Enterprise
↵
Jump to
↵
In this repository
All GitHub Enterprise
↵
Jump to
↵
Sign in
Reseting focus
You signed in with another tab or window.
Reload
to refresh your session.
You signed out in another tab or window.
Reload
to refresh your session.
You switched accounts on another tab or window.
Reload
to refresh your session.
Dismiss alert
{{ message }}
git-mirror
/
git
Public
Notifications
You must be signed in to change notification settings
Fork
0
Star
0
Code
Issues
0
Pull requests
0
Actions
Projects
0
Security
Insights
Additional navigation options
Code
Issues
Pull requests
Actions
Projects
Security
Insights
Files
0fe7c1d
Documentation
arm
compat
contrib
mozilla-sha1
ppc
t
templates
xdiff
.gitignore
COPYING
GIT-VERSION-GEN
INSTALL
Makefile
README
apply.c
blame.c
blob.c
blob.h
builtin-diff.c
builtin-help.c
builtin-log.c
builtin.h
cache.h
cat-file.c
check-ref-format.c
checkout-index.c
clone-pack.c
combine-diff.c
commit-tree.c
commit.c
commit.h
config.c
connect.c
convert-objects.c
copy.c
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
delta.h
describe.c
diff-delta.c
diff-files.c
diff-index.c
diff-lib.c
diff-stages.c
diff-tree.c
diff.c
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
entry.c
environment.c
exec_cmd.c
exec_cmd.h
fetch-clone.c
fetch-pack.c
fetch.c
fetch.h
fsck-objects.c
generate-cmdlist.sh
get-tar-commit-id.c
git-add.sh
git-am.sh
git-annotate.perl
git-applymbox.sh
git-applypatch.sh
git-archimport.perl
git-bisect.sh
git-branch.sh
git-checkout.sh
git-cherry.sh
git-clean.sh
git-clone.sh
git-commit.sh
git-compat-util.h
git-count-objects.sh
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-diff.sh
git-fetch.sh
git-fmt-merge-msg.perl
git-format-patch.sh
git-grep.sh
git-lost-found.sh
git-ls-remote.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-ours.sh
git-merge-recursive.py
git-merge-resolve.sh
git-merge-stupid.sh
git-merge.sh
git-mv.perl
git-parse-remote.sh
git-prune.sh
git-pull.sh
git-push.sh
git-rebase.sh
git-relink.perl
git-repack.sh
git-request-pull.sh
git-rerere.perl
git-reset.sh
git-resolve.sh
git-revert.sh
git-rm.sh
git-send-email.perl
git-sh-setup.sh
git-shortlog.perl
git-svnimport.perl
git-tag.sh
git-verify-tag.sh
git-whatchanged.sh
git.c
git.spec.in
gitMergeCommon.py
gitk
hash-object.c
http-fetch.c
http-push.c
http.c
http.h
ident.c
imap-send.c
index-pack.c
index.c
init-db.c
local-fetch.c
log-tree.c
log-tree.h
ls-files.c
ls-tree.c
mailinfo.c
mailsplit.c
merge-base.c
merge-index.c
merge-tree.c
mktag.c
mktree.c
name-rev.c
object.c
object.h
pack-check.c
pack-objects.c
pack-redundant.c
pack.h
pager.c
patch-delta.c
patch-id.c
path.c
peek-remote.c
pkt-line.c
pkt-line.h
prune-packed.c
quote.c
quote.h
read-cache.c
read-tree.c
receive-pack.c
refs.c
refs.h
repo-config.c
rev-list.c
rev-parse.c
revision.c
revision.h
rsh.c
rsh.h
run-command.c
run-command.h
send-pack.c
server-info.c
setup.c
sha1_file.c
sha1_name.c
shell.c
show-branch.c
show-index.c
ssh-fetch.c
ssh-pull.c
ssh-push.c
ssh-upload.c
strbuf.c
strbuf.h
stripspace.c
symbolic-ref.c
tag.c
tag.h
tar-tree.c
tar.h
test-date.c
test-delta.c
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unpack-file.c
unpack-objects.c
update-index.c
update-ref.c
update-server-info.c
upload-pack.c
usage.c
var.c
verify-pack.c
write-tree.c
xdiff-interface.c
xdiff-interface.h
Breadcrumbs
git
/
builtin-diff.c
Blame
Blame
Latest commit
History
History
369 lines (345 loc) · 9.15 KB
Breadcrumbs
git
/
builtin-diff.c
Top
File metadata and controls
Code
Blame
369 lines (345 loc) · 9.15 KB
Raw
/* * Builtin "git diff" * * Copyright (c) 2006 Junio C Hamano */ #include "cache.h" #include "commit.h" #include "blob.h" #include "tag.h" #include "diff.h" #include "diffcore.h" #include "revision.h" #include "log-tree.h" #include "builtin.h" /* NEEDSWORK: struct object has place for name but we _do_ * know mode when we extracted the blob out of a tree, which * we currently lose. */ struct blobinfo { unsigned char sha1[20]; const char *name; }; static const char builtin_diff_usage[] = "diff <options> <rev>{0,2} -- <path>*"; static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv) { int silent = 0; while (1 < argc) { const char *arg = argv[1]; if (!strcmp(arg, "--base")) revs->max_count = 1; else if (!strcmp(arg, "--ours")) revs->max_count = 2; else if (!strcmp(arg, "--theirs")) revs->max_count = 3; else if (!strcmp(arg, "-q")) silent = 1; else if (!strcmp(arg, "--raw")) revs->diffopt.output_format = DIFF_FORMAT_RAW; else usage(builtin_diff_usage); argv++; argc--; } /* * Make sure there are NO revision (i.e. pending object) parameter, * specified rev.max_count is reasonable (0 <= n <= 3), and * there is no other revision filtering parameter. */ if (revs->pending_objects || revs->min_age != -1 || revs->max_age != -1 || 3 < revs->max_count) usage(builtin_diff_usage); if (revs->max_count < 0 && (revs->diffopt.output_format == DIFF_FORMAT_PATCH)) revs->combine_merges = revs->dense_combined_merges = 1; /* * Backward compatibility wart - "diff-files -s" used to * defeat the common diff option "-s" which asked for * DIFF_FORMAT_NO_OUTPUT. */ if (revs->diffopt.output_format == DIFF_FORMAT_NO_OUTPUT) revs->diffopt.output_format = DIFF_FORMAT_RAW; return run_diff_files(revs, silent); } static void stuff_change(struct diff_options *opt, unsigned old_mode, unsigned new_mode, const unsigned char *old_sha1, const unsigned char *new_sha1, const char *old_name, const char *new_name) { struct diff_filespec *one, *two; if (memcmp(null_sha1, old_sha1, 20) && memcmp(null_sha1, new_sha1, 20) && !memcmp(old_sha1, new_sha1, 20)) return; if (opt->reverse_diff) { unsigned tmp; const const unsigned char *tmp_u; const char *tmp_c; tmp = old_mode; old_mode = new_mode; new_mode = tmp; tmp_u = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_u; tmp_c = old_name; old_name = new_name; new_name = tmp_c; } one = alloc_filespec(old_name); two = alloc_filespec(new_name); fill_filespec(one, old_sha1, old_mode); fill_filespec(two, new_sha1, new_mode); /* NEEDSWORK: shouldn't this part of diffopt??? */ diff_queue(&diff_queued_diff, one, two); } static int builtin_diff_b_f(struct rev_info *revs, int argc, const char **argv, struct blobinfo *blob, const char *path) { /* Blob vs file in the working tree*/ struct stat st; while (1 < argc) { const char *arg = argv[1]; if (!strcmp(arg, "--raw")) revs->diffopt.output_format = DIFF_FORMAT_RAW; else usage(builtin_diff_usage); argv++; argc--; } if (lstat(path, &st)) die("'%s': %s", path, strerror(errno)); if (!(S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))) die("'%s': not a regular file or symlink", path); stuff_change(&revs->diffopt, canon_mode(st.st_mode), canon_mode(st.st_mode), blob[0].sha1, null_sha1, blob[0].name, path); diffcore_std(&revs->diffopt); diff_flush(&revs->diffopt); return 0; } static int builtin_diff_blobs(struct rev_info *revs, int argc, const char **argv, struct blobinfo *blob) { /* Blobs */ unsigned mode = canon_mode(S_IFREG | 0644); while (1 < argc) { const char *arg = argv[1]; if (!strcmp(arg, "--raw")) revs->diffopt.output_format = DIFF_FORMAT_RAW; else usage(builtin_diff_usage); argv++; argc--; } stuff_change(&revs->diffopt, mode, mode, blob[0].sha1, blob[1].sha1, blob[1].name, blob[1].name); diffcore_std(&revs->diffopt); diff_flush(&revs->diffopt); return 0; } static int builtin_diff_index(struct rev_info *revs, int argc, const char **argv) { int cached = 0; while (1 < argc) { const char *arg = argv[1]; if (!strcmp(arg, "--cached")) cached = 1; else if (!strcmp(arg, "--raw")) revs->diffopt.output_format = DIFF_FORMAT_RAW; else usage(builtin_diff_usage); argv++; argc--; } /* * Make sure there is one revision (i.e. pending object), * and there is no revision filtering parameters. */ if (!revs->pending_objects || revs->pending_objects->next || revs->max_count != -1 || revs->min_age != -1 || revs->max_age != -1) usage(builtin_diff_usage); return run_diff_index(revs, cached); } static int builtin_diff_tree(struct rev_info *revs, int argc, const char **argv, struct object_list *ent) { const unsigned char *(sha1[2]); int swap = 1; while (1 < argc) { const char *arg = argv[1]; if (!strcmp(arg, "--raw")) revs->diffopt.output_format = DIFF_FORMAT_RAW; else usage(builtin_diff_usage); argv++; argc--; } /* We saw two trees, ent[0] and ent[1]. * unless ent[0] is unintesting, they are swapped */ if (ent[0].item->flags & UNINTERESTING) swap = 0; sha1[swap] = ent[0].item->sha1; sha1[1-swap] = ent[1].item->sha1; diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt); log_tree_diff_flush(revs); return 0; } static int builtin_diff_combined(struct rev_info *revs, int argc, const char **argv, struct object_list *ent, int ents) { const unsigned char (*parent)[20]; int i; while (1 < argc) { const char *arg = argv[1]; if (!strcmp(arg, "--raw")) revs->diffopt.output_format = DIFF_FORMAT_RAW; else usage(builtin_diff_usage); argv++; argc--; } if (!revs->dense_combined_merges && !revs->combine_merges) revs->dense_combined_merges = revs->combine_merges = 1; parent = xmalloc(ents * sizeof(*parent)); /* Again, the revs are all reverse */ for (i = 0; i < ents; i++) memcpy(parent + i, ent[ents - 1 - i].item->sha1, 20); diff_tree_combined(parent[0], parent + 1, ents - 1, revs->dense_combined_merges, revs); return 0; } static void add_head(struct rev_info *revs) { unsigned char sha1[20]; struct object *obj; if (get_sha1("HEAD", sha1)) return; obj = parse_object(sha1); if (!obj) return; add_object(obj, &revs->pending_objects, NULL, "HEAD"); } int cmd_diff(int argc, const char **argv, char **envp) { struct rev_info rev; struct object_list *list, ent[100]; int ents = 0, blobs = 0, paths = 0; const char *path = NULL; struct blobinfo blob[2]; /* * We could get N tree-ish in the rev.pending_objects list. * Also there could be M blobs there, and P pathspecs. * * N=0, M=0: * cache vs files (diff-files) * N=0, M=2: * compare two random blobs. P must be zero. * N=0, M=1, P=1: * compare a blob with a working tree file. * * N=1, M=0: * tree vs cache (diff-index --cached) * * N=2, M=0: * tree vs tree (diff-tree) * * Other cases are errors. */ git_config(git_diff_config); init_revisions(&rev); rev.diffopt.output_format = DIFF_FORMAT_PATCH; argc = setup_revisions(argc, argv, &rev, NULL); /* Do we have --cached and not have a pending object, then * default to HEAD by hand. Eek. */ if (!rev.pending_objects) { int i; for (i = 1; i < argc; i++) { const char *arg = argv[i]; if (!strcmp(arg, "--")) break; else if (!strcmp(arg, "--cached")) { add_head(&rev); break; } } } for (list = rev.pending_objects; list; list = list->next) { struct object *obj = list->item; const char *name = list->name; int flags = (obj->flags & UNINTERESTING); if (!obj->parsed) obj = parse_object(obj->sha1); obj = deref_tag(obj, NULL, 0); if (!obj) die("invalid object '%s' given.", name); if (!strcmp(obj->type, commit_type)) obj = &((struct commit *)obj)->tree->object; if (!strcmp(obj->type, tree_type)) { if (ARRAY_SIZE(ent) <= ents) die("more than %d trees given: '%s'", ARRAY_SIZE(ent), name); obj->flags |= flags; ent[ents].item = obj; ent[ents].name = name; ents++; continue; } if (!strcmp(obj->type, blob_type)) { if (2 <= blobs) die("more than two blobs given: '%s'", name); memcpy(blob[blobs].sha1, obj->sha1, 20); blob[blobs].name = name; blobs++; continue; } die("unhandled object '%s' given.", name); } if (rev.prune_data) { const char **pathspec = rev.prune_data; while (*pathspec) { if (!path) path = *pathspec; paths++; pathspec++; } } /* * Now, do the arguments look reasonable? */ if (!ents) { switch (blobs) { case 0: return builtin_diff_files(&rev, argc, argv); break; case 1: if (paths != 1) usage(builtin_diff_usage); return builtin_diff_b_f(&rev, argc, argv, blob, path); break; case 2: if (paths) usage(builtin_diff_usage); return builtin_diff_blobs(&rev, argc, argv, blob); break; default: usage(builtin_diff_usage); } } else if (blobs) usage(builtin_diff_usage); else if (ents == 1) return builtin_diff_index(&rev, argc, argv); else if (ents == 2) return builtin_diff_tree(&rev, argc, argv, ent); else return builtin_diff_combined(&rev, argc, argv, ent, ents); usage(builtin_diff_usage); }
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
You can’t perform that action at this time.