Skip to content

Make :linear filter non-recursive #756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christian-schilling merged 1 commit into from
Jun 8, 2022
Merged

Make :linear filter non-recursive #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/filter/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,20 +297,21 @@ fn apply_to_commit2(

let filtered_tree = match &to_op(filter) {
Op::Linear => {
let p: Vec<_> = commit.parents().collect();
let p: Vec<_> = commit.parent_ids().collect();
if p.len() == 0 {
transaction.insert(filter, commit.id(), commit.id(), true);
return Ok(Some(commit.id()));
}
let parent = some_or!(apply_to_commit2(op, &p[0], transaction)?, {
let parent = some_or!(transaction.get(filter, p[0]), {
return Ok(None);
});

let parent_commit = repo.find_commit(parent)?;
return Some(history::rewrite_commit(
repo,
return Some(history::create_filtered_commit(
commit,
&[&parent_commit],
&commit.tree()?,
vec![parent],
commit.tree()?,
transaction,
filter,
))
.transpose();
}
Expand Down
2 changes: 2 additions & 0 deletions tests/filter/linear.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
* add file1

$ josh-filter -s :linear refs/heads/master --update refs/heads/filtered
[3] :linear

$ git log --graph --pretty=%s refs/heads/filtered
* Merge branch 'branch2'
Expand All @@ -56,6 +57,7 @@
* add file1

$ josh-filter -s :linear refs/heads/master --update refs/heads/filtered --reverse
[3] :linear

$ git log --graph --pretty=%s refs/heads/master
* mod file2
Expand Down