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 !is_empty_dir(git_path(NOTES_MERGE_WORKTREE))) {
270 if (advice_resolve_conflict)
271 die("You have not concluded your previous "
272 "notes merge (%s exists).\nPlease, use "
273 "'git notes merge --commit' or 'git notes "
274 "merge --abort' to commit/abort the "
275 "previous merge before you start a new "
276 "notes merge.", git_path("NOTES_MERGE_*"));
278 die("You have not concluded your notes merge "
279 "(%s exists).", git_path("NOTES_MERGE_*"));
282 if (safe_create_leading_directories(git_path(
283 NOTES_MERGE_WORKTREE "/.test")))
284 die_errno("unable to create directory %s",
285 git_path(NOTES_MERGE_WORKTREE));
287 } else if (!file_exists(git_path(NOTES_MERGE_WORKTREE)))
288 /* NOTES_MERGE_WORKTREE should already be established */
289 die("missing '%s'. This should not happen",
290 git_path(NOTES_MERGE_WORKTREE));
293 static void write_buf_to_worktree(const unsigned char *obj,
294 const char *buf, unsigned long size)
297 char *path = git_path(NOTES_MERGE_WORKTREE "/%s", sha1_to_hex(obj));
298 if (safe_create_leading_directories(path))
299 die_errno("unable to create directory for '%s'", path);
300 if (file_exists(path))
301 die("found existing file at '%s'", path);
303 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0666);
305 die_errno("failed to open '%s'", path);
308 long ret = write_in_full(fd, buf, size);
313 die_errno("notes-merge");
315 die("notes-merge: disk full?");
324 static void write_note_to_worktree(const unsigned char *obj,
325 const unsigned char *note)
327 enum object_type type;
329 void *buf = read_sha1_file(note, &type, &size);
332 die("cannot read note %s for object %s",
333 sha1_to_hex(note), sha1_to_hex(obj));
334 if (type != OBJ_BLOB)
335 die("blob expected in note %s for object %s",
336 sha1_to_hex(note), sha1_to_hex(obj));
337 write_buf_to_worktree(obj, buf, size);
341 static int ll_merge_in_worktree(struct notes_merge_options *o,
342 struct notes_merge_pair *p)
344 mmbuffer_t result_buf;
345 mmfile_t base, local, remote;
348 read_mmblob(&base, p->base);
349 read_mmblob(&local, p->local);
350 read_mmblob(&remote, p->remote);
352 status = ll_merge(&result_buf, sha1_to_hex(p->obj), &base, NULL,
353 &local, o->local_ref, &remote, o->remote_ref, NULL);
359 if ((status < 0) || !result_buf.ptr)
360 die("Failed to execute internal merge");
362 write_buf_to_worktree(p->obj, result_buf.ptr, result_buf.size);
363 free(result_buf.ptr);
368 static int merge_one_change_manual(struct notes_merge_options *o,
369 struct notes_merge_pair *p,
370 struct notes_tree *t)
372 const char *lref = o->local_ref ? o->local_ref : "local version";
373 const char *rref = o->remote_ref ? o->remote_ref : "remote version";
375 trace_printf("\t\t\tmerge_one_change_manual(obj = %.7s, base = %.7s, "
376 "local = %.7s, remote = %.7s)\n",
377 sha1_to_hex(p->obj), sha1_to_hex(p->base),
378 sha1_to_hex(p->local), sha1_to_hex(p->remote));
380 /* add "Conflicts:" section to commit message first time through */
381 if (!o->has_worktree)
382 strbuf_addstr(&(o->commit_msg), "\n\nConflicts:\n");
384 strbuf_addf(&(o->commit_msg), "\t%s\n", sha1_to_hex(p->obj));
386 if (o->verbosity >= 2)
387 printf("Auto-merging notes for %s\n", sha1_to_hex(p->obj));
388 check_notes_merge_worktree(o);
389 if (is_null_sha1(p->local)) {
390 /* D/F conflict, checkout p->remote */
391 assert(!is_null_sha1(p->remote));
392 if (o->verbosity >= 1)
393 printf("CONFLICT (delete/modify): Notes for object %s "
394 "deleted in %s and modified in %s. Version from %s "
396 sha1_to_hex(p->obj), lref, rref, rref);
397 write_note_to_worktree(p->obj, p->remote);
398 } else if (is_null_sha1(p->remote)) {
399 /* D/F conflict, checkout p->local */
400 assert(!is_null_sha1(p->local));
401 if (o->verbosity >= 1)
402 printf("CONFLICT (delete/modify): Notes for object %s "
403 "deleted in %s and modified in %s. Version from %s "
405 sha1_to_hex(p->obj), rref, lref, lref);
406 write_note_to_worktree(p->obj, p->local);
408 /* "regular" conflict, checkout result of ll_merge() */
409 const char *reason = "content";
410 if (is_null_sha1(p->base))
412 assert(!is_null_sha1(p->local));
413 assert(!is_null_sha1(p->remote));
414 if (o->verbosity >= 1)
415 printf("CONFLICT (%s): Merge conflict in notes for "
416 "object %s\n", reason, sha1_to_hex(p->obj));
417 ll_merge_in_worktree(o, p);
420 trace_printf("\t\t\tremoving from partial merge result\n");
421 remove_note(t, p->obj);
426 static int merge_one_change(struct notes_merge_options *o,
427 struct notes_merge_pair *p, struct notes_tree *t)
430 * Return 0 if change is successfully resolved (stored in notes_tree).
431 * Return 1 is change results in a conflict (NOT stored in notes_tree,
432 * but instead written to NOTES_MERGE_WORKTREE with conflict markers).
434 switch (o->strategy) {
435 case NOTES_MERGE_RESOLVE_MANUAL:
436 return merge_one_change_manual(o, p, t);
437 case NOTES_MERGE_RESOLVE_OURS:
438 if (o->verbosity >= 2)
439 printf("Using local notes for %s\n",
440 sha1_to_hex(p->obj));
443 case NOTES_MERGE_RESOLVE_THEIRS:
444 if (o->verbosity >= 2)
445 printf("Using remote notes for %s\n",
446 sha1_to_hex(p->obj));
447 if (add_note(t, p->obj, p->remote, combine_notes_overwrite))
448 die("BUG: combine_notes_overwrite failed");
450 case NOTES_MERGE_RESOLVE_UNION:
451 if (o->verbosity >= 2)
452 printf("Concatenating local and remote notes for %s\n",
453 sha1_to_hex(p->obj));
454 if (add_note(t, p->obj, p->remote, combine_notes_concatenate))
455 die("failed to concatenate notes "
456 "(combine_notes_concatenate)");
458 case NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ:
459 if (o->verbosity >= 2)
460 printf("Concatenating unique lines in local and remote "
461 "notes for %s\n", sha1_to_hex(p->obj));
462 if (add_note(t, p->obj, p->remote, combine_notes_cat_sort_uniq))
463 die("failed to concatenate notes "
464 "(combine_notes_cat_sort_uniq)");
467 die("Unknown strategy (%i).", o->strategy);
470 static int merge_changes(struct notes_merge_options *o,
471 struct notes_merge_pair *changes, int *num_changes,
472 struct notes_tree *t)
474 int i, conflicts = 0;
476 trace_printf("\tmerge_changes(num_changes = %i)\n", *num_changes);
477 for (i = 0; i < *num_changes; i++) {
478 struct notes_merge_pair *p = changes + i;
479 trace_printf("\t\t%.7s: %.7s -> %.7s/%.7s\n",
480 sha1_to_hex(p->obj), sha1_to_hex(p->base),
481 sha1_to_hex(p->local), sha1_to_hex(p->remote));
483 if (!hashcmp(p->base, p->remote)) {
484 /* no remote change; nothing to do */
485 trace_printf("\t\t\tskipping (no remote change)\n");
486 } else if (!hashcmp(p->local, p->remote)) {
487 /* same change in local and remote; nothing to do */
488 trace_printf("\t\t\tskipping (local == remote)\n");
489 } else if (!hashcmp(p->local, uninitialized) ||
490 !hashcmp(p->local, p->base)) {
491 /* no local change; adopt remote change */
492 trace_printf("\t\t\tno local change, adopted remote\n");
493 if (add_note(t, p->obj, p->remote,
494 combine_notes_overwrite))
495 die("BUG: combine_notes_overwrite failed");
497 /* need file-level merge between local and remote */
498 trace_printf("\t\t\tneed content-level merge\n");
499 conflicts += merge_one_change(o, p, t);
506 static int merge_from_diffs(struct notes_merge_options *o,
507 const unsigned char *base,
508 const unsigned char *local,
509 const unsigned char *remote, struct notes_tree *t)
511 struct notes_merge_pair *changes;
512 int num_changes, conflicts;
514 trace_printf("\tmerge_from_diffs(base = %.7s, local = %.7s, "
515 "remote = %.7s)\n", sha1_to_hex(base), sha1_to_hex(local),
516 sha1_to_hex(remote));
518 changes = diff_tree_remote(o, base, remote, &num_changes);
519 diff_tree_local(o, changes, num_changes, base, local);
521 conflicts = merge_changes(o, changes, &num_changes, t);
524 if (o->verbosity >= 4)
525 printf("Merge result: %i unmerged notes and a %s notes tree\n",
526 conflicts, t->dirty ? "dirty" : "clean");
528 return conflicts ? -1 : 1;
531 void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
532 const struct strbuf *msg, unsigned char *result_sha1)
534 unsigned char tree_sha1[20];
536 assert(t->initialized);
538 if (write_notes_tree(t, tree_sha1))
539 die("Failed to write notes tree to database");
542 /* Deduce parent commit from t->ref */
543 unsigned char parent_sha1[20];
544 if (!read_ref(t->ref, parent_sha1)) {
545 struct commit *parent = lookup_commit(parent_sha1);
546 if (!parent || parse_commit(parent))
547 die("Failed to find/parse commit %s", t->ref);
548 commit_list_insert(parent, &parents);
550 /* else: t->ref points to nothing, assume root/orphan commit */
553 if (commit_tree(msg, tree_sha1, parents, result_sha1, NULL, NULL))
554 die("Failed to commit notes tree to database");
557 int notes_merge(struct notes_merge_options *o,
558 struct notes_tree *local_tree,
559 unsigned char *result_sha1)
561 unsigned char local_sha1[20], remote_sha1[20];
562 struct commit *local, *remote;
563 struct commit_list *bases = NULL;
564 const unsigned char *base_sha1, *base_tree_sha1;
567 assert(o->local_ref && o->remote_ref);
568 assert(!strcmp(o->local_ref, local_tree->ref));
569 hashclr(result_sha1);
571 trace_printf("notes_merge(o->local_ref = %s, o->remote_ref = %s)\n",
572 o->local_ref, o->remote_ref);
574 /* Dereference o->local_ref into local_sha1 */
575 if (read_ref_full(o->local_ref, local_sha1, 0, NULL))
576 die("Failed to resolve local notes ref '%s'", o->local_ref);
577 else if (!check_refname_format(o->local_ref, 0) &&
578 is_null_sha1(local_sha1))
579 local = NULL; /* local_sha1 == null_sha1 indicates unborn ref */
580 else if (!(local = lookup_commit_reference(local_sha1)))
581 die("Could not parse local commit %s (%s)",
582 sha1_to_hex(local_sha1), o->local_ref);
583 trace_printf("\tlocal commit: %.7s\n", sha1_to_hex(local_sha1));
585 /* Dereference o->remote_ref into remote_sha1 */
586 if (get_sha1(o->remote_ref, remote_sha1)) {
588 * Failed to get remote_sha1. If o->remote_ref looks like an
589 * unborn ref, perform the merge using an empty notes tree.
591 if (!check_refname_format(o->remote_ref, 0)) {
592 hashclr(remote_sha1);
595 die("Failed to resolve remote notes ref '%s'",
598 } else if (!(remote = lookup_commit_reference(remote_sha1))) {
599 die("Could not parse remote commit %s (%s)",
600 sha1_to_hex(remote_sha1), o->remote_ref);
602 trace_printf("\tremote commit: %.7s\n", sha1_to_hex(remote_sha1));
604 if (!local && !remote)
605 die("Cannot merge empty notes ref (%s) into empty notes ref "
606 "(%s)", o->remote_ref, o->local_ref);
608 /* result == remote commit */
609 hashcpy(result_sha1, remote_sha1);
613 /* result == local commit */
614 hashcpy(result_sha1, local_sha1);
617 assert(local && remote);
619 /* Find merge bases */
620 bases = get_merge_bases(local, remote, 1);
622 base_sha1 = null_sha1;
623 base_tree_sha1 = EMPTY_TREE_SHA1_BIN;
624 if (o->verbosity >= 4)
625 printf("No merge base found; doing history-less merge\n");
626 } else if (!bases->next) {
627 base_sha1 = bases->item->object.sha1;
628 base_tree_sha1 = bases->item->tree->object.sha1;
629 if (o->verbosity >= 4)
630 printf("One merge base found (%.7s)\n",
631 sha1_to_hex(base_sha1));
633 /* TODO: How to handle multiple merge-bases? */
634 base_sha1 = bases->item->object.sha1;
635 base_tree_sha1 = bases->item->tree->object.sha1;
636 if (o->verbosity >= 3)
637 printf("Multiple merge bases found. Using the first "
638 "(%.7s)\n", sha1_to_hex(base_sha1));
641 if (o->verbosity >= 4)
642 printf("Merging remote commit %.7s into local commit %.7s with "
643 "merge-base %.7s\n", sha1_to_hex(remote->object.sha1),
644 sha1_to_hex(local->object.sha1),
645 sha1_to_hex(base_sha1));
647 if (!hashcmp(remote->object.sha1, base_sha1)) {
648 /* Already merged; result == local commit */
649 if (o->verbosity >= 2)
650 printf("Already up-to-date!\n");
651 hashcpy(result_sha1, local->object.sha1);
654 if (!hashcmp(local->object.sha1, base_sha1)) {
655 /* Fast-forward; result == remote commit */
656 if (o->verbosity >= 2)
657 printf("Fast-forward\n");
658 hashcpy(result_sha1, remote->object.sha1);
662 result = merge_from_diffs(o, base_tree_sha1, local->tree->object.sha1,
663 remote->tree->object.sha1, local_tree);
665 if (result != 0) { /* non-trivial merge (with or without conflicts) */
666 /* Commit (partial) result */
667 struct commit_list *parents = NULL;
668 commit_list_insert(remote, &parents); /* LIFO order */
669 commit_list_insert(local, &parents);
670 create_notes_commit(local_tree, parents, &o->commit_msg,
675 free_commit_list(bases);
676 strbuf_release(&(o->commit_msg));
677 trace_printf("notes_merge(): result = %i, result_sha1 = %.7s\n",
678 result, sha1_to_hex(result_sha1));
682 int notes_merge_commit(struct notes_merge_options *o,
683 struct notes_tree *partial_tree,
684 struct commit *partial_commit,
685 unsigned char *result_sha1)
688 * Iterate through files in .git/NOTES_MERGE_WORKTREE and add all
689 * found notes to 'partial_tree'. Write the updated notes tree to
690 * the DB, and commit the resulting tree object while reusing the
691 * commit message and parents from 'partial_commit'.
692 * Finally store the new commit object SHA1 into 'result_sha1'.
696 struct strbuf path = STRBUF_INIT;
697 char *msg = strstr(partial_commit->buffer, "\n\n");
698 struct strbuf sb_msg = STRBUF_INIT;
701 strbuf_addstr(&path, git_path(NOTES_MERGE_WORKTREE));
702 if (o->verbosity >= 3)
703 printf("Committing notes in notes merge worktree at %s\n",
706 if (!msg || msg[2] == '\0')
707 die("partial notes commit has empty message");
710 dir = opendir(path.buf);
712 die_errno("could not open %s", path.buf);
714 strbuf_addch(&path, '/');
716 while ((e = readdir(dir)) != NULL) {
718 unsigned char obj_sha1[20], blob_sha1[20];
720 if (is_dot_or_dotdot(e->d_name))
723 if (strlen(e->d_name) != 40 || get_sha1_hex(e->d_name, obj_sha1)) {
724 if (o->verbosity >= 3)
725 printf("Skipping non-SHA1 entry '%s%s'\n",
726 path.buf, e->d_name);
730 strbuf_addstr(&path, e->d_name);
731 /* write file as blob, and add to partial_tree */
732 if (stat(path.buf, &st))
733 die_errno("Failed to stat '%s'", path.buf);
734 if (index_path(blob_sha1, path.buf, &st, HASH_WRITE_OBJECT))
735 die("Failed to write blob object from '%s'", path.buf);
736 if (add_note(partial_tree, obj_sha1, blob_sha1, NULL))
737 die("Failed to add resolved note '%s' to notes tree",
739 if (o->verbosity >= 4)
740 printf("Added resolved note for object %s: %s\n",
741 sha1_to_hex(obj_sha1), sha1_to_hex(blob_sha1));
742 strbuf_setlen(&path, baselen);
745 strbuf_attach(&sb_msg, msg, strlen(msg), strlen(msg) + 1);
746 create_notes_commit(partial_tree, partial_commit->parents, &sb_msg,
748 if (o->verbosity >= 4)
749 printf("Finalized notes merge commit: %s\n",
750 sha1_to_hex(result_sha1));
751 strbuf_release(&path);
756 int notes_merge_abort(struct notes_merge_options *o)
759 * Remove all files within .git/NOTES_MERGE_WORKTREE. We do not remove
760 * the .git/NOTES_MERGE_WORKTREE directory itself, since it might be
761 * the current working directory of the user.
763 struct strbuf buf = STRBUF_INIT;
766 strbuf_addstr(&buf, git_path(NOTES_MERGE_WORKTREE));
767 if (o->verbosity >= 3)
768 printf("Removing notes merge worktree at %s/*\n", buf.buf);
769 ret = remove_dir_recursively(&buf, REMOVE_DIR_KEEP_TOPLEVEL);
770 strbuf_release(&buf);