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

Merge branch 'maint'

Browse Source 
* maint:
  merge-recursive: do not return NULL only to cause segfault
  retry request without query when info/refs?query fails
This commit is contained in:
Junio C Hamano
2010-01-21 20:08:31 -08:00
parent b28a1ce04c 19c6a4f836
commit 2d0d706e5f
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
merge-recursive.c
View File

@ -202,14 +202,14 @@ struct tree *write_tree_from_memory(struct merge_options *o)
if (unmerged_cache()) {
int i;
output(o, 0, "There are unmerged index entries:");
fprintf(stderr, "BUG: There are unmerged index entries:\n");
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
if (ce_stage(ce))
output(o, 0, "%d %.*s", ce_stage(ce),
(int)ce_namelen(ce), ce->name);
fprintf(stderr, "BUG: %d %.*s", ce_stage(ce),
(int)ce_namelen(ce), ce->name);
}
return NULL;
die("Bug in merge-recursive.c");
}
if (!active_cache_tree)