checkout returns index checkout result (#450)

Sebastian Thiel committed 4 years ago

Commit 2ef8d531 parent 056f4dd2 files · +4 −4Browse files

Unified · Split

2 files

@@ -43,7 +43,7 @@ pub mod main_worktree { · 42 unmodified lines
43	43	&mut self,
44	44	mut progress: impl crate::Progress,
45	45	should_interrupt: &AtomicBool,
46		− ) -> Result<Repository, Error> {
	46	+ ) -> Result<(Repository, git_worktree::index::checkout::Outcome), Error> {
47	47	let repo = self
48	48	.repo
49	49	.as_ref()
@@ -75,7 +75,7 @@ pub mod main_worktree { · 25 unmodified lines
75	75	bytes.init(None, crate::progress::bytes());
76	76
77	77	let start = std::time::Instant::now();
78		− git_worktree::index::checkout(
	78	+ let outcome = git_worktree::index::checkout(
79	79	&mut index,
80	80	workdir,
81	81	{
@@ -91,7 +91,7 @@ pub mod main_worktree { · 9 unmodified lines
91	91	bytes.show_throughput(start);
92	92
93	93	index.write(Default::default())?;
94		− Ok(self.repo.take().expect("still present"))
	94	+ Ok((self.repo.take().expect("still present"), outcome))
95	95	}
96	96	}
97	97	}

@@ -66,7 +66,7 @@ fn fetch_and_checkout() -> crate::Result { · 65 unmodified lines
66	66	let (mut checkout, _out) = prepare
67	67	.fetch_then_checkout(git::progress::Discard, &std::sync::atomic::AtomicBool::default())
68	68	.unwrap();
69		− let repo = checkout
	69	+ let (repo, _) = checkout
70	70	.main_worktree(git::progress::Discard, &std::sync::atomic::AtomicBool::default())
71	71	.unwrap();
72	72