summaryrefslogtreecommitdiff
path: root/transport.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-10 19:33:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-10 19:33:20 (GMT)
commit1a5f1a3f256a53014e5b832e1281d952ec5f9ef7 (patch)
tree90cdcd99d55b8970bd127078415b26f76524aa11 /transport.c
parent7a3ea666331cd6cf8d9a7a15aafc33459b8c571c (diff)
parent6999bc7074c2a8d7605c3ad24bd4e5371a6df71c (diff)
downloadgit-1a5f1a3f256a53014e5b832e1281d952ec5f9ef7.zip
git-1a5f1a3f256a53014e5b832e1281d952ec5f9ef7.tar.gz
git-1a5f1a3f256a53014e5b832e1281d952ec5f9ef7.tar.bz2
Merge branch 'js/am-3-merge-recursive-direct'
"git am -3" calls "git merge-recursive" when it needs to fall back to a three-way merge; this call has been turned into an internal subroutine call instead of spawning a separate subprocess. * js/am-3-merge-recursive-direct: merge-recursive: flush output buffer even when erroring out merge_trees(): ensure that the callers release output buffer merge-recursive: offer an option to retain the output in 'obuf' merge-recursive: write the commit title in one go merge-recursive: flush output buffer before printing error messages am -3: use merge_recursive() directly again merge-recursive: switch to returning errors instead of dying merge-recursive: handle return values indicating errors merge-recursive: allow write_tree_from_memory() to error out merge-recursive: avoid returning a wholesale struct merge_recursive: abort properly upon errors prepare the builtins for a libified merge_recursive() merge-recursive: clarify code in was_tracked() die(_("BUG")): avoid translating bug messages die("bug"): report bugs consistently t5520: verify that `pull --rebase` shows the helpful advice when failing
Diffstat (limited to 'transport.c')
-rw-r--r--transport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/transport.c b/transport.c
index 4ba48b0..c5772a1 100644
--- a/transport.c
+++ b/transport.c
@@ -567,7 +567,7 @@ void transport_take_over(struct transport *transport,
struct git_transport_data *data;
if (!transport->smart_options)
- die("Bug detected: Taking over transport requires non-NULL "
+ die("BUG: taking over transport requires non-NULL "
"smart_options field.");
data = xcalloc(1, sizeof(*data));