]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tb/commit-graph-object-dir'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:54:24 +0000 (12:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:54:24 +0000 (12:54 -0800)
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'

1  2 
builtin/commit.c
builtin/fetch.c
t/t5318-commit-graph.sh

Simple merge
diff --cc builtin/fetch.c
Simple merge
Simple merge