diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 23:54:24 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 23:54:24 +0300 |
| commit | 53c3be2c29b97a68145d42b413df2f8c070a2084 (patch) | |
| tree | 18f6572a288c4146d21149fe935810dcd41083d3 /Documentation | |
| parent | 7b029ebaefd945b2315281fcdf9c35843641623b (diff) | |
| parent | a7df60cac834cb7f91c3463205c2b6ba5e694200 (diff) | |
Merge branch 'tb/commit-graph-object-dir'
The code to compute the commit-graph has been taught to use a more
robust way to tell if two object directories refer to the same
thing.
* tb/commit-graph-object-dir:
commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
commit-graph.c: remove path normalization, comparison
commit-graph.h: store object directory in 'struct commit_graph'
commit-graph.h: store an odb in 'struct write_commit_graph_context'
t5318: don't pass non-object directory to '--object-dir'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-commit-graph.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt index bcd85c1976..28d1fee505 100644 --- a/Documentation/git-commit-graph.txt +++ b/Documentation/git-commit-graph.txt @@ -26,7 +26,10 @@ OPTIONS file. This parameter exists to specify the location of an alternate that only has the objects directory, not a full `.git` directory. The commit-graph file is expected to be in the `<dir>/info` directory and - the packfiles are expected to be in `<dir>/pack`. + the packfiles are expected to be in `<dir>/pack`. If the directory + could not be made into an absolute path, or does not match any known + object directory, `git commit-graph ...` will exit with non-zero + status. --[no-]progress:: Turn progress on/off explicitly. If neither is specified, progress is |