[GH-ISSUE #301] pull `--ff` does not retain authorship logs #106

New issue

Closed

opened 2026-03-02 04:11:51 +03:00 by kerem · 0 comments

kerem commented

2026-03-02 04:11:51 +03:00

Owner

Originally created by @acunniffe on GitHub (Dec 22, 2025).
Original GitHub issue: https://github.com/git-ai-project/git-ai/issues/301

Git pull will fast-forward as long as you don't have any dirty changes in a file that would be modified by the checkout. If you do have a conflict, it aborts and asks you to manually stash / apply.

In this case, the checkpoints can be assumed to be accurate. The line ranges they point to are unchanged post-checkout, but they are no longer associated with the working index because they're addressed by HEAD commit sha (which changed in the fast-forward).

When we detect a fast-forward, we need to rename the working log.

From https://github.com/acunniffe/git-ai
 * branch            main       -> FETCH_HEAD
Updating 55d0f80..1f9a5dc.  << look for this

I think we just need to look for these lines in the stdout

Originally created by @acunniffe on GitHub (Dec 22, 2025). Original GitHub issue: https://github.com/git-ai-project/git-ai/issues/301 Git pull will fast-forward as long as you don't have any dirty changes in a file that would be modified by the checkout. If you do have a conflict, it aborts and asks you to manually stash / apply. In this case, the checkpoints can be assumed to be accurate. The line ranges they point to are unchanged post-checkout, but they are no longer associated with the working index because they're addressed by `HEAD` commit sha (which changed in the fast-forward). When we detect a fast-forward, we need to rename the working log. ``` From https://github.com/acunniffe/git-ai * branch main -> FETCH_HEAD Updating 55d0f80..1f9a5dc. << look for this ``` I think we just need to look for these lines in the stdout