From: Derrick Stolee <dstolee@microsoft•com>
To: "git@vger•kernel.org" <git@vger•kernel.org>
Cc: "sbeller@google•com" <sbeller@google•com>,
"jnareb@gmail•com" <jnareb@gmail•com>,
"stolee@gmail•com" <stolee@gmail•com>,
Derrick Stolee <dstolee@microsoft•com>
Subject: [RFC PATCH 3/6] commit-graph: enable replace-object and grafts
Date: Thu, 31 May 2018 17:41:13 +0000 [thread overview]
Message-ID: <20180531174024.124488-4-dstolee@microsoft.com> (raw)
In-Reply-To: <20180531174024.124488-1-dstolee@microsoft.com>
Create destroy_commit_graph() method to delete the commit-graph file
when history is altered by a replace-object call. If the commit-graph
is rebuilt after that, we will load the correct object while reading
the commit-graph.
When parsing a commit, first check if the commit was grafted. If so,
then ignore the commit-graph for that commit and insted use the parents
loaded by parsing the commit buffer and comparing against the graft
file.
Signed-off-by: Derrick Stolee <dstolee@microsoft•com>
---
builtin/replace.c | 3 +++
commit-graph.c | 20 +++++++++++++++++++-
commit-graph.h | 9 +++++++++
commit.c | 5 +++++
4 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/builtin/replace.c b/builtin/replace.c
index 9f01f3fc7f..d553aadcdc 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -15,6 +15,7 @@
#include "parse-options.h"
#include "run-command.h"
#include "tag.h"
+#include "commit-graph.h"
static const char * const git_replace_usage[] = {
N_("git replace [-f] <object> <replacement>"),
@@ -468,6 +469,8 @@ int cmd_replace(int argc, const char **argv, const char *prefix)
usage_msg_opt("--raw only makes sense with --edit",
git_replace_usage, options);
+ destroy_commit_graph(get_object_directory());
+
switch (cmdmode) {
case MODE_DELETE:
if (argc < 1)
diff --git a/commit-graph.c b/commit-graph.c
index e9195dfb17..95af4ed519 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -6,6 +6,7 @@
#include "pack.h"
#include "packfile.h"
#include "commit.h"
+#include "dir.h"
#include "object.h"
#include "refs.h"
#include "revision.h"
@@ -240,15 +241,22 @@ static struct commit_list **insert_parent_or_die(struct commit_graph *g,
{
struct commit *c;
struct object_id oid;
+ const unsigned char *real;
if (pos >= g->num_commits)
die("invalid parent position %"PRIu64, pos);
hashcpy(oid.hash, g->chunk_oid_lookup + g->hash_len * pos);
+
+ real = lookup_replace_object(oid.hash);
+
c = lookup_commit(&oid);
if (!c)
die("could not find commit %s", oid_to_hex(&oid));
- c->graph_pos = pos;
+
+ if (!hashcmp(real, oid.hash))
+ c->graph_pos = pos;
+
return &commit_list_insert(c, pptr)->next;
}
@@ -1019,3 +1027,13 @@ int verify_commit_graph(struct commit_graph *g)
return verify_commit_graph_error;
}
+
+void destroy_commit_graph(const char *obj_dir)
+{
+ char *graph_name;
+ close_commit_graph();
+
+ graph_name = get_commit_graph_filename(obj_dir);
+ remove_path(graph_name);
+ FREE_AND_NULL(graph_name);
+}
diff --git a/commit-graph.h b/commit-graph.h
index 9a06a5f188..1d17da1582 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -56,4 +56,13 @@ void write_commit_graph(const char *obj_dir,
int verify_commit_graph(struct commit_graph *g);
+/*
+ * Delete the commit-graph file in the given object directory.
+ *
+ * WARNING: this deletes data, so should only be used when
+ * performing history-altering actions like replace-object
+ * or grafts.
+ */
+void destroy_commit_graph(const char *obj_dir);
+
#endif
diff --git a/commit.c b/commit.c
index 6eaed0174c..2fe31cde77 100644
--- a/commit.c
+++ b/commit.c
@@ -403,6 +403,11 @@ int parse_commit_internal(struct commit *item, int quiet_on_missing, int use_com
return -1;
if (item->object.parsed)
return 0;
+
+ prepare_commit_graft();
+ if (commit_graft_pos(item->object.oid.hash) >= 0)
+ use_commit_graph = 0;
+
if (use_commit_graph && parse_commit_in_graph(item))
return 0;
buffer = read_sha1_file(item->object.oid.hash, &type, &size);
--
2.16.2.338.gcfe06ae955
next prev parent reply other threads:[~2018-05-31 17:41 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-31 17:40 [RFC PATCH 0/6] Fix commit-graph/graft/replace/shallow combo Derrick Stolee
2018-05-31 17:41 ` [RFC PATCH 1/6] DO NOT MERGE: compute commit-graph on every commit Derrick Stolee
2018-05-31 19:39 ` Stefan Beller
2018-05-31 17:41 ` [RFC PATCH 2/6] DO NOT MERGE: write commit-graph on every fetch Derrick Stolee
2018-05-31 17:41 ` Derrick Stolee [this message]
2018-06-09 15:47 ` [RFC PATCH 3/6] commit-graph: enable replace-object and grafts Jakub Narebski
2018-05-31 17:41 ` [RFC PATCH 4/6] commit-graph: avoid writing when repo is shallow Derrick Stolee
2018-05-31 19:07 ` Stefan Beller
2018-06-01 2:30 ` Junio C Hamano
2018-06-01 11:46 ` Derrick Stolee
2018-06-02 18:39 ` Jakub Narebski
2018-06-04 2:19 ` Junio C Hamano
2018-05-31 17:41 ` [RFC PATCH 5/6] fetch: destroy commit graph on shallow parameters Derrick Stolee
2018-05-31 19:29 ` Stefan Beller
2018-05-31 17:41 ` [RFC PATCH 6/6] commit-graph: revert to odb on missing parents Derrick Stolee
2018-05-31 18:33 ` [RFC PATCH 0/6] Fix commit-graph/graft/replace/shallow combo Stefan Beller
2018-06-01 1:09 ` Derrick Stolee
2018-06-08 11:59 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180531174024.124488-4-dstolee@microsoft.com \
--to=dstolee@microsoft$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jnareb@gmail$(echo .)com \
--cc=sbeller@google$(echo .)com \
--cc=stolee@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox