diff options
Diffstat (limited to 'notes-merge.c')
-rw-r--r-- | notes-merge.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/notes-merge.c b/notes-merge.c index 01d596920e..b4cc594a79 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -113,6 +113,7 @@ static struct notes_merge_pair *find_notes_merge_pair_pos( } static struct object_id uninitialized = { + .hash = "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" \ "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" }; @@ -175,7 +176,6 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o, oid_to_hex(&mp->remote)); } diff_flush(&opt); - clear_pathspec(&opt.pathspec); *num_changes = len; return changes; @@ -261,7 +261,6 @@ static void diff_tree_local(struct notes_merge_options *o, oid_to_hex(&mp->local)); } diff_flush(&opt); - clear_pathspec(&opt.pathspec); } static void check_notes_merge_worktree(struct notes_merge_options *o) |