From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Feb 2020 20:54:24 +0000 (-0800)
Subject: Merge branch 'tb/commit-graph-object-dir'
X-Git-Tag: v2.26.0-rc0~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53c3be2c29b97a68145d42b413df2f8c070a2084;p=thirdparty%2Fgit.git

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'
---

53c3be2c29b97a68145d42b413df2f8c070a2084