diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-22 04:08:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 04:08:31 (GMT) |
| commit | 2d0d706e5fd08b751a19562974ae0b76d9db03a1 (patch) | |
| tree | 8852a1b2770efa8c69dfe85b6d7ece3d8621d53b /merge-recursive.c | |
| parent | b28a1ce04cdafbd3b470ec43c0f562054bd45d4d (diff) | |
| parent | 19c6a4f8369f37c0df1fb57008a891eb6a6dc4bb (diff) | |
| download | git-2d0d706e5fd08b751a19562974ae0b76d9db03a1.zip git-2d0d706e5fd08b751a19562974ae0b76d9db03a1.tar.gz git-2d0d706e5fd08b751a19562974ae0b76d9db03a1.tar.bz2 | |
Merge branch 'maint'
* maint:
merge-recursive: do not return NULL only to cause segfault
retry request without query when info/refs?query fails
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 1239647..cb53b01 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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) |