diff options
Diffstat (limited to 'src/update')
| -rw-r--r-- | src/update/mod.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/update/mod.rs b/src/update/mod.rs index e3cd36a..e5e9f4c 100644 --- a/src/update/mod.rs +++ b/src/update/mod.rs @@ -46,13 +46,14 @@ impl Repo { let _fetched = self.fetch()?; let (remote, head) = self.default_remote_head()?; debug!("default remote and head: {:?} {:?}", remote, head); - // TODO do not update if there are unpushed commits - self.update_default_branch_ref(&remote, head)?; - debug!("updated default branch reference"); // TODO check out only if the default branch is currently checked out self.checkout(&remote, head, &mut progress)?; debug!("finished checkout"); + // TODO do not update if there are unpushed commits + self.update_default_branch_ref(&remote, head)?; + debug!("updated default branch reference"); + // let merged = repo.branches(Some(BranchType::Local))? // .filter_map(|x| x.ok()) // .try_fold(false, |mut merged, (mut branch, _)| { |