diff options
| -rw-r--r-- | git-access.c | 9 | ||||
| -rw-r--r-- | load-git.c | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/git-access.c b/git-access.c index 879330a6a..cf6868af8 100644 --- a/git-access.c +++ b/git-access.c @@ -184,6 +184,15 @@ static int try_to_git_merge(git_repository *repo, git_reference *local, git_refe git_commit *local_commit, *remote_commit, *base_commit; git_index *merged_index; git_merge_options merge_options; + + if (verbose) { + char outlocal[41], outremote[41]; + outlocal[40] = outremote[40] = 0; + git_oid_fmt(outlocal, local_id); + git_oid_fmt(outremote, remote_id); + fprintf(stderr, "trying to merge local SHA %s remote SHA %s\n", outlocal, outremote); + } + git_merge_init_options(&merge_options, GIT_MERGE_OPTIONS_VERSION); merge_options.tree_flags = GIT_MERGE_TREE_FIND_RENAMES; merge_options.file_favor = GIT_MERGE_FILE_FAVOR_UNION; diff --git a/load-git.c b/load-git.c index c4bbf1616..24fef24de 100644 --- a/load-git.c +++ b/load-git.c @@ -1531,6 +1531,8 @@ static int walk_tree_file(const char *root, const git_tree_entry *entry, git_rep struct dive *dive = active_dive; dive_trip_t *trip = active_trip; const char *name = git_tree_entry_name(entry); + if (verbose) + fprintf(stderr, "git load handling file %s\n", name); switch (*name) { /* Picture file? They are saved as time offsets in the dive */ case '-': case '+': |