diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:18:11 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:18:12 +0900 |
| commit | 583c6a229571e1aa3bfb773427c67807ec1b8c21 (patch) | |
| tree | cccec4bac43427c42b061aedb6a95e5e7c884eec /builtin/cat-file.c | |
| parent | 711a11c301dafe84389624f009a2abfb7da5d83f (diff) | |
| parent | bd481de713cb59a57f5f988b9bc46550c954dc45 (diff) | |
| download | git-583c6a229571e1aa3bfb773427c67807ec1b8c21.tar.gz | |
Merge branch 'js/blame-lib'
The internal logic used in "git blame" has been libified to make it
easier to use by cgit.
* js/blame-lib: (29 commits)
blame: move entry prepend to libgit
blame: move scoreboard setup to libgit
blame: move scoreboard-related methods to libgit
blame: move fake-commit-related methods to libgit
blame: move origin-related methods to libgit
blame: move core structures to header
blame: create entry prepend function
blame: create scoreboard setup function
blame: create scoreboard init function
blame: rework methods that determine 'final' commit
blame: wrap blame_sort and compare_blame_final
blame: move progress updates to a scoreboard callback
blame: make sanity_check use a callback in scoreboard
blame: move no_whole_file_rename flag to scoreboard
blame: move xdl_opts flags to scoreboard
blame: move show_root flag to scoreboard
blame: move reverse flag to scoreboard
blame: move contents_from to scoreboard
blame: move copy/move thresholds to scoreboard
blame: move stat counters to scoreboard
...
Diffstat (limited to 'builtin/cat-file.c')
| -rw-r--r-- | builtin/cat-file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 73c81f0cb1..4bffd7a2d8 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -5,6 +5,7 @@ */ #include "cache.h" #include "builtin.h" +#include "diff.h" #include "parse-options.h" #include "userdiff.h" #include "streaming.h" |