diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-08-23 18:19:36 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-08-25 10:43:36 -0700 |
| commit | eb205c1b090b94f4812358c8835065491d149c6b (patch) | |
| tree | 665d9eefa36293a1277dc2ce83c2124e50af6e00 /git-access.c | |
| parent | f177b2ec533dea8b61648a856ac8e77bf6407a48 (diff) | |
| download | subsurface-eb205c1b090b94f4812358c8835065491d149c6b.tar.gz | |
Cloud storage: be more verbose if asked to be verbose
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'git-access.c')
| -rw-r--r-- | git-access.c | 9 |
1 files changed, 9 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; |