diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-28 22:08:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-28 22:08:50 (GMT) |
| commit | 556de1a8e38ff03d31fd35751582447001f39d0c (patch) | |
| tree | 312f912aa8071e9011bb5ac96657192257dafb88 /revision.c | |
| parent | 0433d533f13671f4313c31e34707f0f5281a18e0 (diff) | |
| parent | 644eb60bd01a15f665b63774fd80e3b6316073a1 (diff) | |
| download | git-556de1a8e38ff03d31fd35751582447001f39d0c.zip git-556de1a8e38ff03d31fd35751582447001f39d0c.tar.gz git-556de1a8e38ff03d31fd35751582447001f39d0c.tar.bz2 | |
Merge branch 'sb/describe-blob'
"git describe" was taught to dig trees deeper to find a
<commit-ish>:<path> that refers to a given blob object.
* sb/describe-blob:
builtin/describe.c: describe a blob
builtin/describe.c: factor out describe_commit
builtin/describe.c: print debug statements earlier
builtin/describe.c: rename `oid` to avoid variable shadowing
revision.h: introduce blob/tree walking in order of the commits
list-objects.c: factor out traverse_trees_and_blobs
t6120: fix typo in test name
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1855,6 +1855,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->dense = 0; } else if (!strcmp(arg, "--show-all")) { revs->show_all = 1; + } else if (!strcmp(arg, "--in-commit-order")) { + revs->tree_blobs_in_commit_order = 1; } else if (!strcmp(arg, "--remove-empty")) { revs->remove_empty_trees = 1; } else if (!strcmp(arg, "--merges")) { |