gitweb: Add support for FastCGI, using CGI::Fast

diff --git a/builtin/checkout.c b/builtin/checkout.c
index d652b4c95f9d6059998c1837dd661bb8194e2c56..88b1f43e05e64f0e8dcd6dd0461bbebd6fab1e25 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -439,6 +439,7 @@ static int merge_working_tree(struct checkout_opts *opts,
                        ret = reset_tree(new->commit->tree, opts, 1);
                        if (ret)
                                return ret;
+                       o.ancestor = old->name;
                        o.branch1 = new->name;
                        o.branch2 = "local";
                        merge_trees(&o, new->commit->tree, work,