mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-02 07:53:55 +03:00
cranky fixes
This commit is contained in:
parent
687d73897a
commit
f66c1e4db7
@ -87,7 +87,7 @@ impl TestProject {
|
||||
let mut remote = self.local_repository.find_remote("origin").unwrap();
|
||||
remote
|
||||
.fetch(&["+refs/heads/*:refs/remotes/origin/*"], None)
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
/// works like if we'd open and merge a PR on github. does not update local.
|
||||
|
@ -1292,7 +1292,7 @@ mod upstream {
|
||||
.find(|b| b.id == branch1_id)
|
||||
.unwrap();
|
||||
repository.merge(&branch.upstream.as_ref().unwrap().name);
|
||||
repository.fetch()
|
||||
repository.fetch();
|
||||
}
|
||||
|
||||
let oid3 = {
|
||||
|
Loading…
Reference in New Issue
Block a user