[PR #428] [MERGED] pull `--rebase` support + tests #466

New issue

Closed

opened 2026-03-02 04:13:42 +03:00 by kerem · 0 comments

kerem commented

2026-03-02 04:13:42 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/git-ai-project/git-ai/pull/428
Author: @acunniffe
Created: 1/30/2026
Status: ✅ Merged
Merged: 1/30/2026
Merged by: @acunniffe

Base: main ← Head: feat/pull-rebase-flag

📝 Commits (2)

e442d6a pull --rebase fix
473bf2c refactor flag check and add tests

📊 Changes

4 files changed (+302 additions, -40 deletions)

View changed files

📝 src/authorship/rebase_authorship.rs (+7 -1)
📝 src/commands/hooks/fetch_hooks.rs (+61 -6)
📝 src/commands/hooks/rebase_hooks.rs (+1 -1)
📝 tests/pull_rebase_ff.rs (+233 -32)

📄 Description

Pull --rebase was not working unless it was run with autostash. This PR makes both work independently and together and ships better tests for the behavior of each

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/git-ai-project/git-ai/pull/428 **Author:** [@acunniffe](https://github.com/acunniffe) **Created:** 1/30/2026 **Status:** ✅ Merged **Merged:** 1/30/2026 **Merged by:** [@acunniffe](https://github.com/acunniffe) **Base:** `main` ← **Head:** `feat/pull-rebase-flag` --- ### 📝 Commits (2) - [`e442d6a`](https://github.com/git-ai-project/git-ai/commit/e442d6afc2e855315b74c38d869e73038097bb83) pull --rebase fix - [`473bf2c`](https://github.com/git-ai-project/git-ai/commit/473bf2cda362ffcaa518155093c4aaab71a82f0e) refactor flag check and add tests ### 📊 Changes **4 files changed** (+302 additions, -40 deletions) <details> <summary>View changed files</summary> 📝 `src/authorship/rebase_authorship.rs` (+7 -1) 📝 `src/commands/hooks/fetch_hooks.rs` (+61 -6) 📝 `src/commands/hooks/rebase_hooks.rs` (+1 -1) 📝 `tests/pull_rebase_ff.rs` (+233 -32) </details> ### 📄 Description Pull `--rebase` was not working unless it was run with autostash. This PR makes both work independently and together and ships better tests for the behavior of each --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>