diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-04-05 21:13:27 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-04-05 21:13:27 -0700 |
| commit | f869ce51b473aff2818afd365013b777c3413524 (patch) | |
| tree | 66889fae3883228375f78a32e3e27d9848b91d36 /core/git-access.c | |
| parent | 092d0478c3729689b7f76eb5674eb55d8d33e47c (diff) | |
| download | subsurface-f869ce51b473aff2818afd365013b777c3413524.tar.gz | |
git storage: add explanation for fast forward to remote
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/git-access.c')
| -rw-r--r-- | core/git-access.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/git-access.c b/core/git-access.c index d10139d3d..8f3b1f8d6 100644 --- a/core/git-access.c +++ b/core/git-access.c @@ -447,8 +447,10 @@ static int try_to_update(git_repository *repo, git_remote *origin, git_reference return report_error("Unable to find common commit of local and remote branches"); } /* Is the remote strictly newer? Use it */ - if (git_oid_equal(&base, local_id)) + if (git_oid_equal(&base, local_id)) { + git_storage_update_progress(10, "fast forward to remote"); return reset_to_remote(repo, local, remote_id); + } /* Is the local repo the more recent one? See if we can update upstream */ if (git_oid_equal(&base, remote_id)) { |