From 23e21f0cfc6196d5dce8fc20af0ecc9701aabe4f Mon Sep 17 00:00:00 2001 From: Mathias Rüdiger Date: Mon, 22 Jun 2020 09:09:19 +0200 Subject: Report "Already up to date" when local repository ahead of remote If you run 'git pull', do a commit and run 'git pull' again git will report "Already up to date" whereas go-git would report a reports non-fast-forward update. This commit changes the behavior of go-git to match that of git. --- worktree.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'worktree.go') diff --git a/worktree.go b/worktree.go index 7f394d4..d272373 100644 --- a/worktree.go +++ b/worktree.go @@ -93,10 +93,16 @@ func (w *Worktree) PullContext(ctx context.Context, o *PullOptions) error { head, err := w.r.Head() if err == nil { - if !updated && head.Hash() == ref.Hash() { + headAheadOfRef,err := isFastForward(w.r.Storer, ref.Hash(), head.Hash()) + if err != nil { + return err + } + + if !updated && headAheadOfRef { return NoErrAlreadyUpToDate } + ff, err := isFastForward(w.r.Storer, head.Hash(), ref.Hash()) if err != nil { return err -- cgit