git.oblomov.eu Git - git/blob - notes-merge.c

   1 #include "cache.h"
   2 #include "commit.h"
   3 #include "refs.h"
   4 #include "object-store.h"
   5 #include "repository.h"
   6 #include "diff.h"
   7 #include "diffcore.h"
   8 #include "xdiff-interface.h"
   9 #include "ll-merge.h"
  10 #include "dir.h"
  11 #include "notes.h"
  12 #include "notes-merge.h"
  13 #include "strbuf.h"
  14 #include "notes-utils.h"
  15 #include "commit-reach.h"
  16
  17 struct notes_merge_pair {
  18         struct object_id obj, base, local, remote;
  19 };
  20
  21 void init_notes_merge_options(struct repository *r,
  22                               struct notes_merge_options *o)
  23 {
  24         memset(o, 0, sizeof(struct notes_merge_options));
  25         strbuf_init(&(o->commit_msg), 0);
  26         o->verbosity = NOTES_MERGE_VERBOSITY_DEFAULT;
  27         o->repo = r;
  28 }
  29
  30 static int path_to_oid(const char *path, struct object_id *oid)
  31 {
  32         char hex_oid[GIT_MAX_HEXSZ];
  33         int i = 0;
  34         while (*path && i < the_hash_algo->hexsz) {
  35                 if (*path != '/')
  36                         hex_oid[i++] = *path;
  37                 path++;
  38         }
  39         if (*path || i != the_hash_algo->hexsz)
  40                 return -1;
  41         return get_oid_hex(hex_oid, oid);
  42 }
  43
  44 static int verify_notes_filepair(struct diff_filepair *p, struct object_id *oid)
  45 {
  46         switch (p->status) {
  47         case DIFF_STATUS_MODIFIED:
  48                 assert(p->one->mode == p->two->mode);
  49                 assert(!is_null_oid(&p->one->oid));
  50                 assert(!is_null_oid(&p->two->oid));
  51                 break;
  52         case DIFF_STATUS_ADDED:
  53                 assert(is_null_oid(&p->one->oid));
  54                 break;
  55         case DIFF_STATUS_DELETED:
  56                 assert(is_null_oid(&p->two->oid));
  57                 break;
  58         default:
  59                 return -1;
  60         }
  61         assert(!strcmp(p->one->path, p->two->path));
  62         return path_to_oid(p->one->path, oid);
  63 }
  64
  65 static struct notes_merge_pair *find_notes_merge_pair_pos(
  66                 struct notes_merge_pair *list, int len, struct object_id *obj,
  67                 int insert_new, int *occupied)
  68 {
  69         /*
  70          * Both diff_tree_remote() and diff_tree_local() tend to process
  71          * merge_pairs in ascending order. Therefore, cache last returned
  72          * index, and search sequentially from there until the appropriate
  73          * position is found.
  74          *
  75          * Since inserts only happen from diff_tree_remote() (which mainly
  76          * _appends_), we don't care that inserting into the middle of the
  77          * list is expensive (using memmove()).
  78          */
  79         static int last_index;
  80         int i = last_index < len ? last_index : len - 1;
  81         int prev_cmp = 0, cmp = -1;
  82         while (i >= 0 && i < len) {
  83                 cmp = oidcmp(obj, &list[i].obj);
  84                 if (!cmp) /* obj belongs @ i */
  85                         break;
  86                 else if (cmp < 0 && prev_cmp <= 0) /* obj belongs < i */
  87                         i--;
  88                 else if (cmp < 0) /* obj belongs between i-1 and i */
  89                         break;
  90                 else if (cmp > 0 && prev_cmp >= 0) /* obj belongs > i */
  91                         i++;
  92                 else /* if (cmp > 0) */ { /* obj belongs between i and i+1 */
  93                         i++;
  94                         break;
  95                 }
  96                 prev_cmp = cmp;
  97         }
  98         if (i < 0)
  99                 i = 0;
 100         /* obj belongs at, or immediately preceding, index i (0 <= i <= len) */
 101
 102         if (!cmp)
 103                 *occupied = 1;
 104         else {
 105                 *occupied = 0;
 106                 if (insert_new && i < len) {
 107                         MOVE_ARRAY(list + i + 1, list + i, len - i);
 108                         memset(list + i, 0, sizeof(struct notes_merge_pair));
 109                 }
 110         }
 111         last_index = i;
 112         return list + i;
 113 }
 114
 115 static struct object_id uninitialized = {
 116         "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" \
 117         "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
 118 };
 119
 120 static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
 121                                                  const struct object_id *base,
 122                                                  const struct object_id *remote,
 123                                                  int *num_changes)
 124 {
 125         struct diff_options opt;
 126         struct notes_merge_pair *changes;
 127         int i, len = 0;
 128
 129         trace_printf("\tdiff_tree_remote(base = %.7s, remote = %.7s)\n",
 130                oid_to_hex(base), oid_to_hex(remote));
 131
 132         repo_diff_setup(o->repo, &opt);
 133         opt.flags.recursive = 1;
 134         opt.output_format = DIFF_FORMAT_NO_OUTPUT;
 135         diff_setup_done(&opt);
 136         diff_tree_oid(base, remote, "", &opt);
 137         diffcore_std(&opt);
 138
 139         CALLOC_ARRAY(changes, diff_queued_diff.nr);
 140
 141         for (i = 0; i < diff_queued_diff.nr; i++) {
 142                 struct diff_filepair *p = diff_queued_diff.queue[i];
 143                 struct notes_merge_pair *mp;
 144                 int occupied;
 145                 struct object_id obj;
 146
 147                 if (verify_notes_filepair(p, &obj)) {
 148                         trace_printf("\t\tCannot merge entry '%s' (%c): "
 149                                "%.7s -> %.7s. Skipping!\n", p->one->path,
 150                                p->status, oid_to_hex(&p->one->oid),
 151                                oid_to_hex(&p->two->oid));
 152                         continue;
 153                 }
 154                 mp = find_notes_merge_pair_pos(changes, len, &obj, 1, &occupied);
 155                 if (occupied) {
 156                         /* We've found an addition/deletion pair */
 157                         assert(oideq(&mp->obj, &obj));
 158                         if (is_null_oid(&p->one->oid)) { /* addition */
 159                                 assert(is_null_oid(&mp->remote));
 160                                 oidcpy(&mp->remote, &p->two->oid);
 161                         } else if (is_null_oid(&p->two->oid)) { /* deletion */
 162                                 assert(is_null_oid(&mp->base));
 163                                 oidcpy(&mp->base, &p->one->oid);
 164                         } else
 165                                 assert(!"Invalid existing change recorded");
 166                 } else {
 167                         oidcpy(&mp->obj, &obj);
 168                         oidcpy(&mp->base, &p->one->oid);
 169                         oidcpy(&mp->local, &uninitialized);
 170                         oidcpy(&mp->remote, &p->two->oid);
 171                         len++;
 172                 }
 173                 trace_printf("\t\tStored remote change for %s: %.7s -> %.7s\n",
 174                        oid_to_hex(&mp->obj), oid_to_hex(&mp->base),
 175                        oid_to_hex(&mp->remote));
 176         }
 177         diff_flush(&opt);
 178         clear_pathspec(&opt.pathspec);
 179
 180         *num_changes = len;
 181         return changes;
 182 }
 183
 184 static void diff_tree_local(struct notes_merge_options *o,
 185                             struct notes_merge_pair *changes, int len,
 186                             const struct object_id *base,
 187                             const struct object_id *local)
 188 {
 189         struct diff_options opt;
 190         int i;
 191
 192         trace_printf("\tdiff_tree_local(len = %i, base = %.7s, local = %.7s)\n",
 193                len, oid_to_hex(base), oid_to_hex(local));
 194
 195         repo_diff_setup(o->repo, &opt);
 196         opt.flags.recursive = 1;
 197         opt.output_format = DIFF_FORMAT_NO_OUTPUT;
 198         diff_setup_done(&opt);
 199         diff_tree_oid(base, local, "", &opt);
 200         diffcore_std(&opt);
 201
 202         for (i = 0; i < diff_queued_diff.nr; i++) {
 203                 struct diff_filepair *p = diff_queued_diff.queue[i];
 204                 struct notes_merge_pair *mp;
 205                 int match;
 206                 struct object_id obj;
 207
 208                 if (verify_notes_filepair(p, &obj)) {
 209                         trace_printf("\t\tCannot merge entry '%s' (%c): "
 210                                "%.7s -> %.7s. Skipping!\n", p->one->path,
 211                                p->status, oid_to_hex(&p->one->oid),
 212                                oid_to_hex(&p->two->oid));
 213                         continue;
 214                 }
 215                 mp = find_notes_merge_pair_pos(changes, len, &obj, 0, &match);
 216                 if (!match) {
 217                         trace_printf("\t\tIgnoring local-only change for %s: "
 218                                "%.7s -> %.7s\n", oid_to_hex(&obj),
 219                                oid_to_hex(&p->one->oid),
 220                                oid_to_hex(&p->two->oid));
 221                         continue;
 222                 }
 223
 224                 assert(oideq(&mp->obj, &obj));
 225                 if (is_null_oid(&p->two->oid)) { /* deletion */
 226                         /*
 227                          * Either this is a true deletion (1), or it is part
 228                          * of an A/D pair (2), or D/A pair (3):
 229                          *
 230                          * (1) mp->local is uninitialized; set it to null_sha1
 231                          * (2) mp->local is not uninitialized; don't touch it
 232                          * (3) mp->local is uninitialized; set it to null_sha1
 233                          *     (will be overwritten by following addition)
 234                          */
 235                         if (oideq(&mp->local, &uninitialized))
 236                                 oidclr(&mp->local);
 237                 } else if (is_null_oid(&p->one->oid)) { /* addition */
 238                         /*
 239                          * Either this is a true addition (1), or it is part
 240                          * of an A/D pair (2), or D/A pair (3):
 241                          *
 242                          * (1) mp->local is uninitialized; set to p->two->sha1
 243                          * (2) mp->local is uninitialized; set to p->two->sha1
 244                          * (3) mp->local is null_sha1;     set to p->two->sha1
 245                          */
 246                         assert(is_null_oid(&mp->local) ||
 247                                oideq(&mp->local, &uninitialized));
 248                         oidcpy(&mp->local, &p->two->oid);
 249                 } else { /* modification */
 250                         /*
 251                          * This is a true modification. p->one->sha1 shall
 252                          * match mp->base, and mp->local shall be uninitialized.
 253                          * Set mp->local to p->two->sha1.
 254                          */
 255                         assert(oideq(&p->one->oid, &mp->base));
 256                         assert(oideq(&mp->local, &uninitialized));
 257                         oidcpy(&mp->local, &p->two->oid);
 258                 }
 259                 trace_printf("\t\tStored local change for %s: %.7s -> %.7s\n",
 260                        oid_to_hex(&mp->obj), oid_to_hex(&mp->base),
 261                        oid_to_hex(&mp->local));
 262         }
 263         diff_flush(&opt);
 264         clear_pathspec(&opt.pathspec);
 265 }
 266
 267 static void check_notes_merge_worktree(struct notes_merge_options *o)
 268 {
 269         if (!o->has_worktree) {
 270                 /*
 271                  * Must establish NOTES_MERGE_WORKTREE.
 272                  * Abort if NOTES_MERGE_WORKTREE already exists
 273                  */
 274                 if (file_exists(git_path(NOTES_MERGE_WORKTREE)) &&
 275                     !is_empty_dir(git_path(NOTES_MERGE_WORKTREE))) {
 276                         if (advice_resolve_conflict)
 277                                 die(_("You have not concluded your previous "
 278                                     "notes merge (%s exists).\nPlease, use "
 279                                     "'git notes merge --commit' or 'git notes "
 280                                     "merge --abort' to commit/abort the "
 281                                     "previous merge before you start a new "
 282                                     "notes merge."), git_path("NOTES_MERGE_*"));
 283                         else
 284                                 die(_("You have not concluded your notes merge "
 285                                     "(%s exists)."), git_path("NOTES_MERGE_*"));
 286                 }
 287
 288                 if (safe_create_leading_directories_const(git_path(
 289                                 NOTES_MERGE_WORKTREE "/.test")))
 290                         die_errno("unable to create directory %s",
 291                                   git_path(NOTES_MERGE_WORKTREE));
 292                 o->has_worktree = 1;
 293         } else if (!file_exists(git_path(NOTES_MERGE_WORKTREE)))
 294                 /* NOTES_MERGE_WORKTREE should already be established */
 295                 die("missing '%s'. This should not happen",
 296                     git_path(NOTES_MERGE_WORKTREE));
 297 }
 298
 299 static void write_buf_to_worktree(const struct object_id *obj,
 300                                   const char *buf, unsigned long size)
 301 {
 302         int fd;
 303         char *path = git_pathdup(NOTES_MERGE_WORKTREE "/%s", oid_to_hex(obj));
 304         if (safe_create_leading_directories_const(path))
 305                 die_errno("unable to create directory for '%s'", path);
 306
 307         fd = xopen(path, O_WRONLY | O_EXCL | O_CREAT, 0666);
 308
 309         while (size > 0) {
 310                 ssize_t ret = write_in_full(fd, buf, size);
 311                 if (ret < 0) {
 312                         /* Ignore epipe */
 313                         if (errno == EPIPE)
 314                                 break;
 315                         die_errno("notes-merge");
 316                 }
 317                 size -= ret;
 318                 buf += ret;
 319         }
 320
 321         close(fd);
 322         free(path);
 323 }
 324
 325 static void write_note_to_worktree(const struct object_id *obj,
 326                                    const struct object_id *note)
 327 {
 328         enum object_type type;
 329         unsigned long size;
 330         void *buf = read_object_file(note, &type, &size);
 331
 332         if (!buf)
 333                 die("cannot read note %s for object %s",
 334                     oid_to_hex(note), oid_to_hex(obj));
 335         if (type != OBJ_BLOB)
 336                 die("blob expected in note %s for object %s",
 337                     oid_to_hex(note), oid_to_hex(obj));
 338         write_buf_to_worktree(obj, buf, size);
 339         free(buf);
 340 }
 341
 342 static int ll_merge_in_worktree(struct notes_merge_options *o,
 343                                 struct notes_merge_pair *p)
 344 {
 345         mmbuffer_t result_buf;
 346         mmfile_t base, local, remote;
 347         int status;
 348
 349         read_mmblob(&base, &p->base);
 350         read_mmblob(&local, &p->local);
 351         read_mmblob(&remote, &p->remote);
 352
 353         status = ll_merge(&result_buf, oid_to_hex(&p->obj), &base, NULL,
 354                           &local, o->local_ref, &remote, o->remote_ref,
 355                           o->repo->index, NULL);
 356
 357         free(base.ptr);
 358         free(local.ptr);
 359         free(remote.ptr);
 360
 361         if ((status < 0) || !result_buf.ptr)
 362                 die("Failed to execute internal merge");
 363
 364         write_buf_to_worktree(&p->obj, result_buf.ptr, result_buf.size);
 365         free(result_buf.ptr);
 366
 367         return status;
 368 }
 369
 370 static int merge_one_change_manual(struct notes_merge_options *o,
 371                                    struct notes_merge_pair *p,
 372                                    struct notes_tree *t)
 373 {
 374         const char *lref = o->local_ref ? o->local_ref : "local version";
 375         const char *rref = o->remote_ref ? o->remote_ref : "remote version";
 376
 377         trace_printf("\t\t\tmerge_one_change_manual(obj = %.7s, base = %.7s, "
 378                "local = %.7s, remote = %.7s)\n",
 379                oid_to_hex(&p->obj), oid_to_hex(&p->base),
 380                oid_to_hex(&p->local), oid_to_hex(&p->remote));
 381
 382         /* add "Conflicts:" section to commit message first time through */
 383         if (!o->has_worktree)
 384                 strbuf_addstr(&(o->commit_msg), "\n\nConflicts:\n");
 385
 386         strbuf_addf(&(o->commit_msg), "\t%s\n", oid_to_hex(&p->obj));
 387
 388         if (o->verbosity >= 2)
 389                 printf("Auto-merging notes for %s\n", oid_to_hex(&p->obj));
 390         check_notes_merge_worktree(o);
 391         if (is_null_oid(&p->local)) {
 392                 /* D/F conflict, checkout p->remote */
 393                 assert(!is_null_oid(&p->remote));
 394                 if (o->verbosity >= 1)
 395                         printf("CONFLICT (delete/modify): Notes for object %s "
 396                                 "deleted in %s and modified in %s. Version from %s "
 397                                 "left in tree.\n",
 398                                 oid_to_hex(&p->obj), lref, rref, rref);
 399                 write_note_to_worktree(&p->obj, &p->remote);
 400         } else if (is_null_oid(&p->remote)) {
 401                 /* D/F conflict, checkout p->local */
 402                 assert(!is_null_oid(&p->local));
 403                 if (o->verbosity >= 1)
 404                         printf("CONFLICT (delete/modify): Notes for object %s "
 405                                 "deleted in %s and modified in %s. Version from %s "
 406                                 "left in tree.\n",
 407                                 oid_to_hex(&p->obj), rref, lref, lref);
 408                 write_note_to_worktree(&p->obj, &p->local);
 409         } else {
 410                 /* "regular" conflict, checkout result of ll_merge() */
 411                 const char *reason = "content";
 412                 if (is_null_oid(&p->base))
 413                         reason = "add/add";
 414                 assert(!is_null_oid(&p->local));
 415                 assert(!is_null_oid(&p->remote));
 416                 if (o->verbosity >= 1)
 417                         printf("CONFLICT (%s): Merge conflict in notes for "
 418                                 "object %s\n", reason,
 419                                 oid_to_hex(&p->obj));
 420                 ll_merge_in_worktree(o, p);
 421         }
 422
 423         trace_printf("\t\t\tremoving from partial merge result\n");
 424         remove_note(t, p->obj.hash);
 425
 426         return 1;
 427 }
 428
 429 static int merge_one_change(struct notes_merge_options *o,
 430                             struct notes_merge_pair *p, struct notes_tree *t)
 431 {
 432         /*
 433          * Return 0 if change is successfully resolved (stored in notes_tree).
 434          * Return 1 is change results in a conflict (NOT stored in notes_tree,
 435          * but instead written to NOTES_MERGE_WORKTREE with conflict markers).
 436          */
 437         switch (o->strategy) {
 438         case NOTES_MERGE_RESOLVE_MANUAL:
 439                 return merge_one_change_manual(o, p, t);
 440         case NOTES_MERGE_RESOLVE_OURS:
 441                 if (o->verbosity >= 2)
 442                         printf("Using local notes for %s\n",
 443                                                 oid_to_hex(&p->obj));
 444                 /* nothing to do */
 445                 return 0;
 446         case NOTES_MERGE_RESOLVE_THEIRS:
 447                 if (o->verbosity >= 2)
 448                         printf("Using remote notes for %s\n",
 449                                                 oid_to_hex(&p->obj));
 450                 if (add_note(t, &p->obj, &p->remote, combine_notes_overwrite))
 451                         BUG("combine_notes_overwrite failed");
 452                 return 0;
 453         case NOTES_MERGE_RESOLVE_UNION:
 454                 if (o->verbosity >= 2)
 455                         printf("Concatenating local and remote notes for %s\n",
 456                                                         oid_to_hex(&p->obj));
 457                 if (add_note(t, &p->obj, &p->remote, combine_notes_concatenate))
 458                         die("failed to concatenate notes "
 459                             "(combine_notes_concatenate)");
 460                 return 0;
 461         case NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ:
 462                 if (o->verbosity >= 2)
 463                         printf("Concatenating unique lines in local and remote "
 464                                 "notes for %s\n", oid_to_hex(&p->obj));
 465                 if (add_note(t, &p->obj, &p->remote, combine_notes_cat_sort_uniq))
 466                         die("failed to concatenate notes "
 467                             "(combine_notes_cat_sort_uniq)");
 468                 return 0;
 469         }
 470         die("Unknown strategy (%i).", o->strategy);
 471 }
 472
 473 static int merge_changes(struct notes_merge_options *o,
 474                          struct notes_merge_pair *changes, int *num_changes,
 475                          struct notes_tree *t)
 476 {
 477         int i, conflicts = 0;
 478
 479         trace_printf("\tmerge_changes(num_changes = %i)\n", *num_changes);
 480         for (i = 0; i < *num_changes; i++) {
 481                 struct notes_merge_pair *p = changes + i;
 482                 trace_printf("\t\t%.7s: %.7s -> %.7s/%.7s\n",
 483                        oid_to_hex(&p->obj), oid_to_hex(&p->base),
 484                        oid_to_hex(&p->local),
 485                        oid_to_hex(&p->remote));
 486
 487                 if (oideq(&p->base, &p->remote)) {
 488                         /* no remote change; nothing to do */
 489                         trace_printf("\t\t\tskipping (no remote change)\n");
 490                 } else if (oideq(&p->local, &p->remote)) {
 491                         /* same change in local and remote; nothing to do */
 492                         trace_printf("\t\t\tskipping (local == remote)\n");
 493                 } else if (oideq(&p->local, &uninitialized) ||
 494                            oideq(&p->local, &p->base)) {
 495                         /* no local change; adopt remote change */
 496                         trace_printf("\t\t\tno local change, adopted remote\n");
 497                         if (add_note(t, &p->obj, &p->remote,
 498                                      combine_notes_overwrite))
 499                                 BUG("combine_notes_overwrite failed");
 500                 } else {
 501                         /* need file-level merge between local and remote */
 502                         trace_printf("\t\t\tneed content-level merge\n");
 503                         conflicts += merge_one_change(o, p, t);
 504                 }
 505         }
 506
 507         return conflicts;
 508 }
 509
 510 static int merge_from_diffs(struct notes_merge_options *o,
 511                             const struct object_id *base,
 512                             const struct object_id *local,
 513                             const struct object_id *remote,
 514                             struct notes_tree *t)
 515 {
 516         struct notes_merge_pair *changes;
 517         int num_changes, conflicts;
 518
 519         trace_printf("\tmerge_from_diffs(base = %.7s, local = %.7s, "
 520                "remote = %.7s)\n", oid_to_hex(base), oid_to_hex(local),
 521                oid_to_hex(remote));
 522
 523         changes = diff_tree_remote(o, base, remote, &num_changes);
 524         diff_tree_local(o, changes, num_changes, base, local);
 525
 526         conflicts = merge_changes(o, changes, &num_changes, t);
 527         free(changes);
 528
 529         if (o->verbosity >= 4)
 530                 printf(t->dirty ?
 531                        "Merge result: %i unmerged notes and a dirty notes tree\n" :
 532                        "Merge result: %i unmerged notes and a clean notes tree\n",
 533                        conflicts);
 534
 535         return conflicts ? -1 : 1;
 536 }
 537
 538 int notes_merge(struct notes_merge_options *o,
 539                 struct notes_tree *local_tree,
 540                 struct object_id *result_oid)
 541 {
 542         struct object_id local_oid, remote_oid;
 543         struct commit *local, *remote;
 544         struct commit_list *bases = NULL;
 545         const struct object_id *base_oid, *base_tree_oid;
 546         int result = 0;
 547
 548         assert(o->local_ref && o->remote_ref);
 549         assert(!strcmp(o->local_ref, local_tree->ref));
 550         oidclr(result_oid);
 551
 552         trace_printf("notes_merge(o->local_ref = %s, o->remote_ref = %s)\n",
 553                o->local_ref, o->remote_ref);
 554
 555         /* Dereference o->local_ref into local_sha1 */
 556         if (read_ref_full(o->local_ref, 0, &local_oid, NULL))
 557                 die("Failed to resolve local notes ref '%s'", o->local_ref);
 558         else if (!check_refname_format(o->local_ref, 0) &&
 559                 is_null_oid(&local_oid))
 560                 local = NULL; /* local_oid == null_oid indicates unborn ref */
 561         else if (!(local = lookup_commit_reference(o->repo, &local_oid)))
 562                 die("Could not parse local commit %s (%s)",
 563                     oid_to_hex(&local_oid), o->local_ref);
 564         trace_printf("\tlocal commit: %.7s\n", oid_to_hex(&local_oid));
 565
 566         /* Dereference o->remote_ref into remote_oid */
 567         if (get_oid(o->remote_ref, &remote_oid)) {
 568                 /*
 569                  * Failed to get remote_oid. If o->remote_ref looks like an
 570                  * unborn ref, perform the merge using an empty notes tree.
 571                  */
 572                 if (!check_refname_format(o->remote_ref, 0)) {
 573                         oidclr(&remote_oid);
 574                         remote = NULL;
 575                 } else {
 576                         die("Failed to resolve remote notes ref '%s'",
 577                             o->remote_ref);
 578                 }
 579         } else if (!(remote = lookup_commit_reference(o->repo, &remote_oid))) {
 580                 die("Could not parse remote commit %s (%s)",
 581                     oid_to_hex(&remote_oid), o->remote_ref);
 582         }
 583         trace_printf("\tremote commit: %.7s\n", oid_to_hex(&remote_oid));
 584
 585         if (!local && !remote)
 586                 die("Cannot merge empty notes ref (%s) into empty notes ref "
 587                     "(%s)", o->remote_ref, o->local_ref);
 588         if (!local) {
 589                 /* result == remote commit */
 590                 oidcpy(result_oid, &remote_oid);
 591                 goto found_result;
 592         }
 593         if (!remote) {
 594                 /* result == local commit */
 595                 oidcpy(result_oid, &local_oid);
 596                 goto found_result;
 597         }
 598         assert(local && remote);
 599
 600         /* Find merge bases */
 601         bases = get_merge_bases(local, remote);
 602         if (!bases) {
 603                 base_oid = null_oid();
 604                 base_tree_oid = the_hash_algo->empty_tree;
 605                 if (o->verbosity >= 4)
 606                         printf("No merge base found; doing history-less merge\n");
 607         } else if (!bases->next) {
 608                 base_oid = &bases->item->object.oid;
 609                 base_tree_oid = get_commit_tree_oid(bases->item);
 610                 if (o->verbosity >= 4)
 611                         printf("One merge base found (%.7s)\n",
 612                                oid_to_hex(base_oid));
 613         } else {
 614                 /* TODO: How to handle multiple merge-bases? */
 615                 base_oid = &bases->item->object.oid;
 616                 base_tree_oid = get_commit_tree_oid(bases->item);
 617                 if (o->verbosity >= 3)
 618                         printf("Multiple merge bases found. Using the first "
 619                                 "(%.7s)\n", oid_to_hex(base_oid));
 620         }
 621
 622         if (o->verbosity >= 4)
 623                 printf("Merging remote commit %.7s into local commit %.7s with "
 624                         "merge-base %.7s\n", oid_to_hex(&remote->object.oid),
 625                         oid_to_hex(&local->object.oid),
 626                         oid_to_hex(base_oid));
 627
 628         if (oideq(&remote->object.oid, base_oid)) {
 629                 /* Already merged; result == local commit */
 630                 if (o->verbosity >= 2)
 631                         printf_ln("Already up to date.");
 632                 oidcpy(result_oid, &local->object.oid);
 633                 goto found_result;
 634         }
 635         if (oideq(&local->object.oid, base_oid)) {
 636                 /* Fast-forward; result == remote commit */
 637                 if (o->verbosity >= 2)
 638                         printf("Fast-forward\n");
 639                 oidcpy(result_oid, &remote->object.oid);
 640                 goto found_result;
 641         }
 642
 643         result = merge_from_diffs(o, base_tree_oid,
 644                                   get_commit_tree_oid(local),
 645                                   get_commit_tree_oid(remote), local_tree);
 646
 647         if (result != 0) { /* non-trivial merge (with or without conflicts) */
 648                 /* Commit (partial) result */
 649                 struct commit_list *parents = NULL;
 650                 commit_list_insert(remote, &parents); /* LIFO order */
 651                 commit_list_insert(local, &parents);
 652                 create_notes_commit(o->repo, local_tree, parents, o->commit_msg.buf,
 653                                     o->commit_msg.len, result_oid);
 654         }
 655
 656 found_result:
 657         free_commit_list(bases);
 658         strbuf_release(&(o->commit_msg));
 659         trace_printf("notes_merge(): result = %i, result_oid = %.7s\n",
 660                result, oid_to_hex(result_oid));
 661         return result;
 662 }
 663
 664 int notes_merge_commit(struct notes_merge_options *o,
 665                        struct notes_tree *partial_tree,
 666                        struct commit *partial_commit,
 667                        struct object_id *result_oid)
 668 {
 669         /*
 670          * Iterate through files in .git/NOTES_MERGE_WORKTREE and add all
 671          * found notes to 'partial_tree'. Write the updated notes tree to
 672          * the DB, and commit the resulting tree object while reusing the
 673          * commit message and parents from 'partial_commit'.
 674          * Finally store the new commit object OID into 'result_oid'.
 675          */
 676         DIR *dir;
 677         struct dirent *e;
 678         struct strbuf path = STRBUF_INIT;
 679         const char *buffer = get_commit_buffer(partial_commit, NULL);
 680         const char *msg = strstr(buffer, "\n\n");
 681         int baselen;
 682
 683         git_path_buf(&path, NOTES_MERGE_WORKTREE);
 684         if (o->verbosity >= 3)
 685                 printf("Committing notes in notes merge worktree at %s\n",
 686                         path.buf);
 687
 688         if (!msg || msg[2] == '\0')
 689                 die("partial notes commit has empty message");
 690         msg += 2;
 691
 692         dir = opendir(path.buf);
 693         if (!dir)
 694                 die_errno("could not open %s", path.buf);
 695
 696         strbuf_addch(&path, '/');
 697         baselen = path.len;
 698         while ((e = readdir_skip_dot_and_dotdot(dir)) != NULL) {
 699                 struct stat st;
 700                 struct object_id obj_oid, blob_oid;
 701
 702                 if (get_oid_hex(e->d_name, &obj_oid)) {
 703                         if (o->verbosity >= 3)
 704                                 printf("Skipping non-SHA1 entry '%s%s'\n",
 705                                         path.buf, e->d_name);
 706                         continue;
 707                 }
 708
 709                 strbuf_addstr(&path, e->d_name);
 710                 /* write file as blob, and add to partial_tree */
 711                 if (stat(path.buf, &st))
 712                         die_errno("Failed to stat '%s'", path.buf);
 713                 if (index_path(o->repo->index, &blob_oid, path.buf, &st, HASH_WRITE_OBJECT))
 714                         die("Failed to write blob object from '%s'", path.buf);
 715                 if (add_note(partial_tree, &obj_oid, &blob_oid, NULL))
 716                         die("Failed to add resolved note '%s' to notes tree",
 717                             path.buf);
 718                 if (o->verbosity >= 4)
 719                         printf("Added resolved note for object %s: %s\n",
 720                                 oid_to_hex(&obj_oid), oid_to_hex(&blob_oid));
 721                 strbuf_setlen(&path, baselen);
 722         }
 723
 724         create_notes_commit(o->repo, partial_tree, partial_commit->parents, msg,
 725                             strlen(msg), result_oid);
 726         unuse_commit_buffer(partial_commit, buffer);
 727         if (o->verbosity >= 4)
 728                 printf("Finalized notes merge commit: %s\n",
 729                         oid_to_hex(result_oid));
 730         strbuf_release(&path);
 731         closedir(dir);
 732         return 0;
 733 }
 734
 735 int notes_merge_abort(struct notes_merge_options *o)
 736 {
 737         /*
 738          * Remove all files within .git/NOTES_MERGE_WORKTREE. We do not remove
 739          * the .git/NOTES_MERGE_WORKTREE directory itself, since it might be
 740          * the current working directory of the user.
 741          */
 742         struct strbuf buf = STRBUF_INIT;
 743         int ret;
 744
 745         git_path_buf(&buf, NOTES_MERGE_WORKTREE);
 746         if (o->verbosity >= 3)
 747                 printf("Removing notes merge worktree at %s/*\n", buf.buf);
 748         ret = remove_dir_recursively(&buf, REMOVE_DIR_KEEP_TOPLEVEL);
 749         strbuf_release(&buf);
 750         return ret;
 751 }