diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-11-12 21:28:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-13 04:20:44 (GMT) |
| commit | eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4 (patch) | |
| tree | 9042f094bd1f12d1249d714fdd177fcbe4fbf2a4 /notes-merge.c | |
| parent | 78a6766802ef32b82e6062e8e6ac5621894cc4a2 (diff) | |
| download | git-eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4.zip git-eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4.tar.gz git-eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4.tar.bz2 | |
Switch empty tree and blob lookups to use hash abstraction
Switch the uses of empty_tree_oid and empty_blob_oid to use the
current_hash abstraction that represents the current hash algorithm in
use.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c index 4a83b0e..0f6573c 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -595,7 +595,7 @@ int notes_merge(struct notes_merge_options *o, bases = get_merge_bases(local, remote); if (!bases) { base_oid = &null_oid; - base_tree_oid = &empty_tree_oid; + base_tree_oid = the_hash_algo->empty_tree; if (o->verbosity >= 4) printf("No merge base found; doing history-less merge\n"); } else if (!bases->next) { |