6 #include "xdiff-interface.h"
10 #include "notes-merge.h"
13 struct notes_merge_pair
{
14 unsigned char obj
[20], base
[20], local
[20], remote
[20];
17 void init_notes_merge_options(struct notes_merge_options
*o
)
19 memset(o
, 0, sizeof(struct notes_merge_options
));
20 strbuf_init(&(o
->commit_msg
), 0);
21 o
->verbosity
= NOTES_MERGE_VERBOSITY_DEFAULT
;
24 static int path_to_sha1(const char *path
, unsigned char *sha1
)
28 while (*path
&& i
< 40) {
30 hex_sha1
[i
++] = *path
;
35 return get_sha1_hex(hex_sha1
, sha1
);
38 static int verify_notes_filepair(struct diff_filepair
*p
, unsigned char *sha1
)
41 case DIFF_STATUS_MODIFIED
:
42 assert(p
->one
->mode
== p
->two
->mode
);
43 assert(!is_null_sha1(p
->one
->sha1
));
44 assert(!is_null_sha1(p
->two
->sha1
));
46 case DIFF_STATUS_ADDED
:
47 assert(is_null_sha1(p
->one
->sha1
));
49 case DIFF_STATUS_DELETED
:
50 assert(is_null_sha1(p
->two
->sha1
));
55 assert(!strcmp(p
->one
->path
, p
->two
->path
));
56 return path_to_sha1(p
->one
->path
, sha1
);
59 static struct notes_merge_pair
*find_notes_merge_pair_pos(
60 struct notes_merge_pair
*list
, int len
, unsigned char *obj
,
61 int insert_new
, int *occupied
)
64 * Both diff_tree_remote() and diff_tree_local() tend to process
65 * merge_pairs in ascending order. Therefore, cache last returned
66 * index, and search sequentially from there until the appropriate
69 * Since inserts only happen from diff_tree_remote() (which mainly
70 * _appends_), we don't care that inserting into the middle of the
71 * list is expensive (using memmove()).
73 static int last_index
;
74 int i
= last_index
< len
? last_index
: len
- 1;
75 int prev_cmp
= 0, cmp
= -1;
76 while (i
>= 0 && i
< len
) {
77 cmp
= hashcmp(obj
, list
[i
].obj
);
78 if (!cmp
) /* obj belongs @ i */
80 else if (cmp
< 0 && prev_cmp
<= 0) /* obj belongs < i */
82 else if (cmp
< 0) /* obj belongs between i-1 and i */
84 else if (cmp
> 0 && prev_cmp
>= 0) /* obj belongs > i */
86 else /* if (cmp > 0) */ { /* obj belongs between i and i+1 */
94 /* obj belongs at, or immediately preceding, index i (0 <= i <= len) */
100 if (insert_new
&& i
< len
) {
101 memmove(list
+ i
+ 1, list
+ i
,
102 (len
- i
) * sizeof(struct notes_merge_pair
));
103 memset(list
+ i
, 0, sizeof(struct notes_merge_pair
));
110 static unsigned char uninitialized
[20] =
111 "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" \
112 "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff";
114 static struct notes_merge_pair
*diff_tree_remote(struct notes_merge_options
*o
,
115 const unsigned char *base
,
116 const unsigned char *remote
,
119 struct diff_options opt
;
120 struct notes_merge_pair
*changes
;
123 trace_printf("\tdiff_tree_remote(base = %.7s, remote = %.7s)\n",
124 sha1_to_hex(base
), sha1_to_hex(remote
));
127 DIFF_OPT_SET(&opt
, RECURSIVE
);
128 opt
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
129 diff_setup_done(&opt
);
130 diff_tree_sha1(base
, remote
, "", &opt
);
133 changes
= xcalloc(diff_queued_diff
.nr
, sizeof(struct notes_merge_pair
));
135 for (i
= 0; i
< diff_queued_diff
.nr
; i
++) {
136 struct diff_filepair
*p
= diff_queued_diff
.queue
[i
];
137 struct notes_merge_pair
*mp
;
139 unsigned char obj
[20];
141 if (verify_notes_filepair(p
, obj
)) {
142 trace_printf("\t\tCannot merge entry '%s' (%c): "
143 "%.7s -> %.7s. Skipping!\n", p
->one
->path
,
144 p
->status
, sha1_to_hex(p
->one
->sha1
),
145 sha1_to_hex(p
->two
->sha1
));
148 mp
= find_notes_merge_pair_pos(changes
, len
, obj
, 1, &occupied
);
150 /* We've found an addition/deletion pair */
151 assert(!hashcmp(mp
->obj
, obj
));
152 if (is_null_sha1(p
->one
->sha1
)) { /* addition */
153 assert(is_null_sha1(mp
->remote
));
154 hashcpy(mp
->remote
, p
->two
->sha1
);
155 } else if (is_null_sha1(p
->two
->sha1
)) { /* deletion */
156 assert(is_null_sha1(mp
->base
));
157 hashcpy(mp
->base
, p
->one
->sha1
);
159 assert(!"Invalid existing change recorded");
161 hashcpy(mp
->obj
, obj
);
162 hashcpy(mp
->base
, p
->one
->sha1
);
163 hashcpy(mp
->local
, uninitialized
);
164 hashcpy(mp
->remote
, p
->two
->sha1
);
167 trace_printf("\t\tStored remote change for %s: %.7s -> %.7s\n",
168 sha1_to_hex(mp
->obj
), sha1_to_hex(mp
->base
),
169 sha1_to_hex(mp
->remote
));
172 diff_tree_release_paths(&opt
);
178 static void diff_tree_local(struct notes_merge_options
*o
,
179 struct notes_merge_pair
*changes
, int len
,
180 const unsigned char *base
,
181 const unsigned char *local
)
183 struct diff_options opt
;
186 trace_printf("\tdiff_tree_local(len = %i, base = %.7s, local = %.7s)\n",
187 len
, sha1_to_hex(base
), sha1_to_hex(local
));
190 DIFF_OPT_SET(&opt
, RECURSIVE
);
191 opt
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
192 diff_setup_done(&opt
);
193 diff_tree_sha1(base
, local
, "", &opt
);
196 for (i
= 0; i
< diff_queued_diff
.nr
; i
++) {
197 struct diff_filepair
*p
= diff_queued_diff
.queue
[i
];
198 struct notes_merge_pair
*mp
;
200 unsigned char obj
[20];
202 if (verify_notes_filepair(p
, obj
)) {
203 trace_printf("\t\tCannot merge entry '%s' (%c): "
204 "%.7s -> %.7s. Skipping!\n", p
->one
->path
,
205 p
->status
, sha1_to_hex(p
->one
->sha1
),
206 sha1_to_hex(p
->two
->sha1
));
209 mp
= find_notes_merge_pair_pos(changes
, len
, obj
, 0, &match
);
211 trace_printf("\t\tIgnoring local-only change for %s: "
212 "%.7s -> %.7s\n", sha1_to_hex(obj
),
213 sha1_to_hex(p
->one
->sha1
),
214 sha1_to_hex(p
->two
->sha1
));
218 assert(!hashcmp(mp
->obj
, obj
));
219 if (is_null_sha1(p
->two
->sha1
)) { /* deletion */
221 * Either this is a true deletion (1), or it is part
222 * of an A/D pair (2), or D/A pair (3):
224 * (1) mp->local is uninitialized; set it to null_sha1
225 * (2) mp->local is not uninitialized; don't touch it
226 * (3) mp->local is uninitialized; set it to null_sha1
227 * (will be overwritten by following addition)
229 if (!hashcmp(mp
->local
, uninitialized
))
231 } else if (is_null_sha1(p
->one
->sha1
)) { /* addition */
233 * Either this is a true addition (1), or it is part
234 * of an A/D pair (2), or D/A pair (3):
236 * (1) mp->local is uninitialized; set to p->two->sha1
237 * (2) mp->local is uninitialized; set to p->two->sha1
238 * (3) mp->local is null_sha1; set to p->two->sha1
240 assert(is_null_sha1(mp
->local
) ||
241 !hashcmp(mp
->local
, uninitialized
));
242 hashcpy(mp
->local
, p
->two
->sha1
);
243 } else { /* modification */
245 * This is a true modification. p->one->sha1 shall
246 * match mp->base, and mp->local shall be uninitialized.
247 * Set mp->local to p->two->sha1.
249 assert(!hashcmp(p
->one
->sha1
, mp
->base
));
250 assert(!hashcmp(mp
->local
, uninitialized
));
251 hashcpy(mp
->local
, p
->two
->sha1
);
253 trace_printf("\t\tStored local change for %s: %.7s -> %.7s\n",
254 sha1_to_hex(mp
->obj
), sha1_to_hex(mp
->base
),
255 sha1_to_hex(mp
->local
));
258 diff_tree_release_paths(&opt
);
261 static void check_notes_merge_worktree(struct notes_merge_options
*o
)
263 if (!o
->has_worktree
) {
265 * Must establish NOTES_MERGE_WORKTREE.
266 * Abort if NOTES_MERGE_WORKTREE already exists
268 if (file_exists(git_path(NOTES_MERGE_WORKTREE
))) {
269 if (advice_resolve_conflict
)
270 die("You have not concluded your previous "
271 "notes merge (%s exists).\nPlease, use "
272 "'git notes merge --commit' or 'git notes "
273 "merge --abort' to commit/abort the "
274 "previous merge before you start a new "
275 "notes merge.", git_path("NOTES_MERGE_*"));
277 die("You have not concluded your notes merge "
278 "(%s exists).", git_path("NOTES_MERGE_*"));
281 if (safe_create_leading_directories(git_path(
282 NOTES_MERGE_WORKTREE
"/.test")))
283 die_errno("unable to create directory %s",
284 git_path(NOTES_MERGE_WORKTREE
));
286 } else if (!file_exists(git_path(NOTES_MERGE_WORKTREE
)))
287 /* NOTES_MERGE_WORKTREE should already be established */
288 die("missing '%s'. This should not happen",
289 git_path(NOTES_MERGE_WORKTREE
));
292 static void write_buf_to_worktree(const unsigned char *obj
,
293 const char *buf
, unsigned long size
)
296 char *path
= git_path(NOTES_MERGE_WORKTREE
"/%s", sha1_to_hex(obj
));
297 if (safe_create_leading_directories(path
))
298 die_errno("unable to create directory for '%s'", path
);
299 if (file_exists(path
))
300 die("found existing file at '%s'", path
);
302 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, 0666);
304 die_errno("failed to open '%s'", path
);
307 long ret
= write_in_full(fd
, buf
, size
);
312 die_errno("notes-merge");
314 die("notes-merge: disk full?");
323 static void write_note_to_worktree(const unsigned char *obj
,
324 const unsigned char *note
)
326 enum object_type type
;
328 void *buf
= read_sha1_file(note
, &type
, &size
);
331 die("cannot read note %s for object %s",
332 sha1_to_hex(note
), sha1_to_hex(obj
));
333 if (type
!= OBJ_BLOB
)
334 die("blob expected in note %s for object %s",
335 sha1_to_hex(note
), sha1_to_hex(obj
));
336 write_buf_to_worktree(obj
, buf
, size
);
340 static int ll_merge_in_worktree(struct notes_merge_options
*o
,
341 struct notes_merge_pair
*p
)
343 mmbuffer_t result_buf
;
344 mmfile_t base
, local
, remote
;
347 read_mmblob(&base
, p
->base
);
348 read_mmblob(&local
, p
->local
);
349 read_mmblob(&remote
, p
->remote
);
351 status
= ll_merge(&result_buf
, sha1_to_hex(p
->obj
), &base
, NULL
,
352 &local
, o
->local_ref
, &remote
, o
->remote_ref
, NULL
);
358 if ((status
< 0) || !result_buf
.ptr
)
359 die("Failed to execute internal merge");
361 write_buf_to_worktree(p
->obj
, result_buf
.ptr
, result_buf
.size
);
362 free(result_buf
.ptr
);
367 static int merge_one_change_manual(struct notes_merge_options
*o
,
368 struct notes_merge_pair
*p
,
369 struct notes_tree
*t
)
371 const char *lref
= o
->local_ref
? o
->local_ref
: "local version";
372 const char *rref
= o
->remote_ref
? o
->remote_ref
: "remote version";
374 trace_printf("\t\t\tmerge_one_change_manual(obj = %.7s, base = %.7s, "
375 "local = %.7s, remote = %.7s)\n",
376 sha1_to_hex(p
->obj
), sha1_to_hex(p
->base
),
377 sha1_to_hex(p
->local
), sha1_to_hex(p
->remote
));
379 /* add "Conflicts:" section to commit message first time through */
380 if (!o
->has_worktree
)
381 strbuf_addstr(&(o
->commit_msg
), "\n\nConflicts:\n");
383 strbuf_addf(&(o
->commit_msg
), "\t%s\n", sha1_to_hex(p
->obj
));
385 if (o
->verbosity
>= 2)
386 printf("Auto-merging notes for %s\n", sha1_to_hex(p
->obj
));
387 check_notes_merge_worktree(o
);
388 if (is_null_sha1(p
->local
)) {
389 /* D/F conflict, checkout p->remote */
390 assert(!is_null_sha1(p
->remote
));
391 if (o
->verbosity
>= 1)
392 printf("CONFLICT (delete/modify): Notes for object %s "
393 "deleted in %s and modified in %s. Version from %s "
395 sha1_to_hex(p
->obj
), lref
, rref
, rref
);
396 write_note_to_worktree(p
->obj
, p
->remote
);
397 } else if (is_null_sha1(p
->remote
)) {
398 /* D/F conflict, checkout p->local */
399 assert(!is_null_sha1(p
->local
));
400 if (o
->verbosity
>= 1)
401 printf("CONFLICT (delete/modify): Notes for object %s "
402 "deleted in %s and modified in %s. Version from %s "
404 sha1_to_hex(p
->obj
), rref
, lref
, lref
);
405 write_note_to_worktree(p
->obj
, p
->local
);
407 /* "regular" conflict, checkout result of ll_merge() */
408 const char *reason
= "content";
409 if (is_null_sha1(p
->base
))
411 assert(!is_null_sha1(p
->local
));
412 assert(!is_null_sha1(p
->remote
));
413 if (o
->verbosity
>= 1)
414 printf("CONFLICT (%s): Merge conflict in notes for "
415 "object %s\n", reason
, sha1_to_hex(p
->obj
));
416 ll_merge_in_worktree(o
, p
);
419 trace_printf("\t\t\tremoving from partial merge result\n");
420 remove_note(t
, p
->obj
);
425 static int merge_one_change(struct notes_merge_options
*o
,
426 struct notes_merge_pair
*p
, struct notes_tree
*t
)
429 * Return 0 if change is successfully resolved (stored in notes_tree).
430 * Return 1 is change results in a conflict (NOT stored in notes_tree,
431 * but instead written to NOTES_MERGE_WORKTREE with conflict markers).
433 switch (o
->strategy
) {
434 case NOTES_MERGE_RESOLVE_MANUAL
:
435 return merge_one_change_manual(o
, p
, t
);
436 case NOTES_MERGE_RESOLVE_OURS
:
437 if (o
->verbosity
>= 2)
438 printf("Using local notes for %s\n",
439 sha1_to_hex(p
->obj
));
442 case NOTES_MERGE_RESOLVE_THEIRS
:
443 if (o
->verbosity
>= 2)
444 printf("Using remote notes for %s\n",
445 sha1_to_hex(p
->obj
));
446 if (add_note(t
, p
->obj
, p
->remote
, combine_notes_overwrite
))
447 die("BUG: combine_notes_overwrite failed");
449 case NOTES_MERGE_RESOLVE_UNION
:
450 if (o
->verbosity
>= 2)
451 printf("Concatenating local and remote notes for %s\n",
452 sha1_to_hex(p
->obj
));
453 if (add_note(t
, p
->obj
, p
->remote
, combine_notes_concatenate
))
454 die("failed to concatenate notes "
455 "(combine_notes_concatenate)");
457 case NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ
:
458 if (o
->verbosity
>= 2)
459 printf("Concatenating unique lines in local and remote "
460 "notes for %s\n", sha1_to_hex(p
->obj
));
461 if (add_note(t
, p
->obj
, p
->remote
, combine_notes_cat_sort_uniq
))
462 die("failed to concatenate notes "
463 "(combine_notes_cat_sort_uniq)");
466 die("Unknown strategy (%i).", o
->strategy
);
469 static int merge_changes(struct notes_merge_options
*o
,
470 struct notes_merge_pair
*changes
, int *num_changes
,
471 struct notes_tree
*t
)
473 int i
, conflicts
= 0;
475 trace_printf("\tmerge_changes(num_changes = %i)\n", *num_changes
);
476 for (i
= 0; i
< *num_changes
; i
++) {
477 struct notes_merge_pair
*p
= changes
+ i
;
478 trace_printf("\t\t%.7s: %.7s -> %.7s/%.7s\n",
479 sha1_to_hex(p
->obj
), sha1_to_hex(p
->base
),
480 sha1_to_hex(p
->local
), sha1_to_hex(p
->remote
));
482 if (!hashcmp(p
->base
, p
->remote
)) {
483 /* no remote change; nothing to do */
484 trace_printf("\t\t\tskipping (no remote change)\n");
485 } else if (!hashcmp(p
->local
, p
->remote
)) {
486 /* same change in local and remote; nothing to do */
487 trace_printf("\t\t\tskipping (local == remote)\n");
488 } else if (!hashcmp(p
->local
, uninitialized
) ||
489 !hashcmp(p
->local
, p
->base
)) {
490 /* no local change; adopt remote change */
491 trace_printf("\t\t\tno local change, adopted remote\n");
492 if (add_note(t
, p
->obj
, p
->remote
,
493 combine_notes_overwrite
))
494 die("BUG: combine_notes_overwrite failed");
496 /* need file-level merge between local and remote */
497 trace_printf("\t\t\tneed content-level merge\n");
498 conflicts
+= merge_one_change(o
, p
, t
);
505 static int merge_from_diffs(struct notes_merge_options
*o
,
506 const unsigned char *base
,
507 const unsigned char *local
,
508 const unsigned char *remote
, struct notes_tree
*t
)
510 struct notes_merge_pair
*changes
;
511 int num_changes
, conflicts
;
513 trace_printf("\tmerge_from_diffs(base = %.7s, local = %.7s, "
514 "remote = %.7s)\n", sha1_to_hex(base
), sha1_to_hex(local
),
515 sha1_to_hex(remote
));
517 changes
= diff_tree_remote(o
, base
, remote
, &num_changes
);
518 diff_tree_local(o
, changes
, num_changes
, base
, local
);
520 conflicts
= merge_changes(o
, changes
, &num_changes
, t
);
523 if (o
->verbosity
>= 4)
524 printf("Merge result: %i unmerged notes and a %s notes tree\n",
525 conflicts
, t
->dirty
? "dirty" : "clean");
527 return conflicts
? -1 : 1;
530 void create_notes_commit(struct notes_tree
*t
, struct commit_list
*parents
,
531 const struct strbuf
*msg
, unsigned char *result_sha1
)
533 unsigned char tree_sha1
[20];
535 assert(t
->initialized
);
537 if (write_notes_tree(t
, tree_sha1
))
538 die("Failed to write notes tree to database");
541 /* Deduce parent commit from t->ref */
542 unsigned char parent_sha1
[20];
543 if (!read_ref(t
->ref
, parent_sha1
)) {
544 struct commit
*parent
= lookup_commit(parent_sha1
);
545 if (!parent
|| parse_commit(parent
))
546 die("Failed to find/parse commit %s", t
->ref
);
547 commit_list_insert(parent
, &parents
);
549 /* else: t->ref points to nothing, assume root/orphan commit */
552 if (commit_tree(msg
, tree_sha1
, parents
, result_sha1
, NULL
, NULL
))
553 die("Failed to commit notes tree to database");
556 int notes_merge(struct notes_merge_options
*o
,
557 struct notes_tree
*local_tree
,
558 unsigned char *result_sha1
)
560 unsigned char local_sha1
[20], remote_sha1
[20];
561 struct commit
*local
, *remote
;
562 struct commit_list
*bases
= NULL
;
563 const unsigned char *base_sha1
, *base_tree_sha1
;
566 assert(o
->local_ref
&& o
->remote_ref
);
567 assert(!strcmp(o
->local_ref
, local_tree
->ref
));
568 hashclr(result_sha1
);
570 trace_printf("notes_merge(o->local_ref = %s, o->remote_ref = %s)\n",
571 o
->local_ref
, o
->remote_ref
);
573 /* Dereference o->local_ref into local_sha1 */
574 if (read_ref_full(o
->local_ref
, local_sha1
, 0, NULL
))
575 die("Failed to resolve local notes ref '%s'", o
->local_ref
);
576 else if (!check_refname_format(o
->local_ref
, 0) &&
577 is_null_sha1(local_sha1
))
578 local
= NULL
; /* local_sha1 == null_sha1 indicates unborn ref */
579 else if (!(local
= lookup_commit_reference(local_sha1
)))
580 die("Could not parse local commit %s (%s)",
581 sha1_to_hex(local_sha1
), o
->local_ref
);
582 trace_printf("\tlocal commit: %.7s\n", sha1_to_hex(local_sha1
));
584 /* Dereference o->remote_ref into remote_sha1 */
585 if (get_sha1(o
->remote_ref
, remote_sha1
)) {
587 * Failed to get remote_sha1. If o->remote_ref looks like an
588 * unborn ref, perform the merge using an empty notes tree.
590 if (!check_refname_format(o
->remote_ref
, 0)) {
591 hashclr(remote_sha1
);
594 die("Failed to resolve remote notes ref '%s'",
597 } else if (!(remote
= lookup_commit_reference(remote_sha1
))) {
598 die("Could not parse remote commit %s (%s)",
599 sha1_to_hex(remote_sha1
), o
->remote_ref
);
601 trace_printf("\tremote commit: %.7s\n", sha1_to_hex(remote_sha1
));
603 if (!local
&& !remote
)
604 die("Cannot merge empty notes ref (%s) into empty notes ref "
605 "(%s)", o
->remote_ref
, o
->local_ref
);
607 /* result == remote commit */
608 hashcpy(result_sha1
, remote_sha1
);
612 /* result == local commit */
613 hashcpy(result_sha1
, local_sha1
);
616 assert(local
&& remote
);
618 /* Find merge bases */
619 bases
= get_merge_bases(local
, remote
, 1);
621 base_sha1
= null_sha1
;
622 base_tree_sha1
= EMPTY_TREE_SHA1_BIN
;
623 if (o
->verbosity
>= 4)
624 printf("No merge base found; doing history-less merge\n");
625 } else if (!bases
->next
) {
626 base_sha1
= bases
->item
->object
.sha1
;
627 base_tree_sha1
= bases
->item
->tree
->object
.sha1
;
628 if (o
->verbosity
>= 4)
629 printf("One merge base found (%.7s)\n",
630 sha1_to_hex(base_sha1
));
632 /* TODO: How to handle multiple merge-bases? */
633 base_sha1
= bases
->item
->object
.sha1
;
634 base_tree_sha1
= bases
->item
->tree
->object
.sha1
;
635 if (o
->verbosity
>= 3)
636 printf("Multiple merge bases found. Using the first "
637 "(%.7s)\n", sha1_to_hex(base_sha1
));
640 if (o
->verbosity
>= 4)
641 printf("Merging remote commit %.7s into local commit %.7s with "
642 "merge-base %.7s\n", sha1_to_hex(remote
->object
.sha1
),
643 sha1_to_hex(local
->object
.sha1
),
644 sha1_to_hex(base_sha1
));
646 if (!hashcmp(remote
->object
.sha1
, base_sha1
)) {
647 /* Already merged; result == local commit */
648 if (o
->verbosity
>= 2)
649 printf("Already up-to-date!\n");
650 hashcpy(result_sha1
, local
->object
.sha1
);
653 if (!hashcmp(local
->object
.sha1
, base_sha1
)) {
654 /* Fast-forward; result == remote commit */
655 if (o
->verbosity
>= 2)
656 printf("Fast-forward\n");
657 hashcpy(result_sha1
, remote
->object
.sha1
);
661 result
= merge_from_diffs(o
, base_tree_sha1
, local
->tree
->object
.sha1
,
662 remote
->tree
->object
.sha1
, local_tree
);
664 if (result
!= 0) { /* non-trivial merge (with or without conflicts) */
665 /* Commit (partial) result */
666 struct commit_list
*parents
= NULL
;
667 commit_list_insert(remote
, &parents
); /* LIFO order */
668 commit_list_insert(local
, &parents
);
669 create_notes_commit(local_tree
, parents
, &o
->commit_msg
,
674 free_commit_list(bases
);
675 strbuf_release(&(o
->commit_msg
));
676 trace_printf("notes_merge(): result = %i, result_sha1 = %.7s\n",
677 result
, sha1_to_hex(result_sha1
));
681 int notes_merge_commit(struct notes_merge_options
*o
,
682 struct notes_tree
*partial_tree
,
683 struct commit
*partial_commit
,
684 unsigned char *result_sha1
)
687 * Iterate through files in .git/NOTES_MERGE_WORKTREE and add all
688 * found notes to 'partial_tree'. Write the updates notes tree to
689 * the DB, and commit the resulting tree object while reusing the
690 * commit message and parents from 'partial_commit'.
691 * Finally store the new commit object SHA1 into 'result_sha1'.
693 struct dir_struct dir
;
694 char *path
= xstrdup(git_path(NOTES_MERGE_WORKTREE
"/"));
695 int path_len
= strlen(path
), i
;
696 char *msg
= strstr(partial_commit
->buffer
, "\n\n");
697 struct strbuf sb_msg
= STRBUF_INIT
;
699 if (o
->verbosity
>= 3)
700 printf("Committing notes in notes merge worktree at %.*s\n",
703 if (!msg
|| msg
[2] == '\0')
704 die("partial notes commit has empty message");
707 memset(&dir
, 0, sizeof(dir
));
708 read_directory(&dir
, path
, path_len
, NULL
);
709 for (i
= 0; i
< dir
.nr
; i
++) {
710 struct dir_entry
*ent
= dir
.entries
[i
];
712 const char *relpath
= ent
->name
+ path_len
;
713 unsigned char obj_sha1
[20], blob_sha1
[20];
715 if (ent
->len
- path_len
!= 40 || get_sha1_hex(relpath
, obj_sha1
)) {
716 if (o
->verbosity
>= 3)
717 printf("Skipping non-SHA1 entry '%s'\n",
722 /* write file as blob, and add to partial_tree */
723 if (stat(ent
->name
, &st
))
724 die_errno("Failed to stat '%s'", ent
->name
);
725 if (index_path(blob_sha1
, ent
->name
, &st
, HASH_WRITE_OBJECT
))
726 die("Failed to write blob object from '%s'", ent
->name
);
727 if (add_note(partial_tree
, obj_sha1
, blob_sha1
, NULL
))
728 die("Failed to add resolved note '%s' to notes tree",
730 if (o
->verbosity
>= 4)
731 printf("Added resolved note for object %s: %s\n",
732 sha1_to_hex(obj_sha1
), sha1_to_hex(blob_sha1
));
735 strbuf_attach(&sb_msg
, msg
, strlen(msg
), strlen(msg
) + 1);
736 create_notes_commit(partial_tree
, partial_commit
->parents
, &sb_msg
,
738 if (o
->verbosity
>= 4)
739 printf("Finalized notes merge commit: %s\n",
740 sha1_to_hex(result_sha1
));
745 int notes_merge_abort(struct notes_merge_options
*o
)
747 /* Remove .git/NOTES_MERGE_WORKTREE directory and all files within */
748 struct strbuf buf
= STRBUF_INIT
;
751 strbuf_addstr(&buf
, git_path(NOTES_MERGE_WORKTREE
));
752 if (o
->verbosity
>= 3)
753 printf("Removing notes merge worktree at %s\n", buf
.buf
);
754 ret
= remove_dir_recursively(&buf
, 0);
755 strbuf_release(&buf
);