{"thread":{"id":"11112","subject":"[PATCH 0/2] Fail merge gently","startedAt":"2007-12-03T05:32:38Z","lastAt":"2007-12-03T05:32:38Z","messageCount":1,"participants":["Daniel Barkalow"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"61726","messageId":"Pine.LNX.4.64.0712030025032.5349@iabervon.org","threadId":"11112","inReplyTo":null,"subject":"[PATCH 0/2] Fail merge gently","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2007-12-03T05:32:38Z","receivedAt":"2007-12-03T05:32:38Z","isPatch":true,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"This series makes it possible to call unpack_trees() and get an error \nresult instead of having it call die(). Additionally, it allows the caller \nto suppress error messages, in case it's just going to try something else \ninstead of actually failing. This passes all of the tests, and should \nhave no effect on existing code except for making the exit messages not \nsay \"fatal:\", and merge-recursive will free its tree cache before exiting, \nand print an additional message already in the code but previously \ninaccessible.\n\nThis is preliminary for builtin-checkout, which I'm partway through. I \nthink I'm down to the case where a real merge is needed for -m, but I'm \nnot sure, and I think I need to write a bunch of tests for checkout.\n\nDaniel Barkalow (2):\n      Allow callers of unpack_trees() to handle failure\n      Add flag to make unpack_trees() not print errors.\n\n builtin-read-tree.c |    3 +-\n unpack-trees.c      |   90 ++++++++++++++++++++++++++++++---------------------\n unpack-trees.h      |    1 +\n 3 files changed, 56 insertions(+), 38 deletions(-)\n\n\t-Daniel\n*This .sig left intentionally blank*\n"}]}