mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/merge-saner-messages'

Browse Source 
* jc/merge-saner-messages:
  merge-recursive: give less scary messages when merge did not start
This commit is contained in:
Junio C Hamano
2009-09-13 01:33:15 -07:00
parent 1cdd64e800 fadd069d03
commit 8b54f63dce
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
merge-recursive.c
View File

@ -170,6 +170,18 @@ static int git_merge_trees(int index_only,
int rc; int rc;
struct tree_desc t[3]; struct tree_desc t[3];
struct unpack_trees_options opts; struct unpack_trees_options opts;
static const struct unpack_trees_error_msgs msgs = {
/* would_overwrite */
"Your local changes to '%s' would be overwritten by merge. Aborting.",
/* not_uptodate_file */
"Your local changes to '%s' would be overwritten by merge. Aborting.",
/* not_uptodate_dir */
"Updating '%s' would lose untracked files in it. Aborting.",
/* would_lose_untracked */
"Untracked working tree file '%s' would be %s by merge. Aborting",
/* bind_overlap -- will not happen here */
NULL,
};
memset(&opts, 0, sizeof(opts)); memset(&opts, 0, sizeof(opts));
if (index_only) if (index_only)
@ -181,6 +193,7 @@ static int git_merge_trees(int index_only,
opts.fn = threeway_merge; opts.fn = threeway_merge;
opts.src_index = &the_index; opts.src_index = &the_index;
opts.dst_index = &the_index; opts.dst_index = &the_index;
opts.msgs = msgs;
init_tree_desc_from_tree(t+0, common); init_tree_desc_from_tree(t+0, common);
init_tree_desc_from_tree(t+1, head); init_tree_desc_from_tree(t+1, head);
@ -1188,10 +1201,14 @@ int merge_trees(struct merge_options *o,
code = git_merge_trees(o->call_depth, common, head, merge); code = git_merge_trees(o->call_depth, common, head, merge);
if (code != 0) if (code != 0) {
die("merging of trees %s and %s failed", if (show(o, 4) || o->call_depth)
sha1_to_hex(head->object.sha1), die("merging of trees %s and %s failed",
sha1_to_hex(merge->object.sha1)); sha1_to_hex(head->object.sha1),
sha1_to_hex(merge->object.sha1));
else
exit(128);
}
if (unmerged_cache()) { if (unmerged_cache()) {
struct string_list *entries, *re_head, *re_merge; struct string_list *entries, *re_head, *re_merge;