From f869ce51b473aff2818afd365013b777c3413524 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 5 Apr 2016 21:13:27 -0700 Subject: git storage: add explanation for fast forward to remote Signed-off-by: Dirk Hohndel --- core/git-access.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/git-access.c') 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)) { -- cgit v1.2.3-70-g09d2