Skip to content

Commit 9d457fd

Browse files
committed
Merge revspec-related blocks
1 parent 80ede05 commit 9d457fd

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

asyncgit/src/sync/diff.rs

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -355,23 +355,17 @@ pub fn get_diff(
355355
),
356356
);
357357

358-
let old_revspec = if stage {
359-
format!("HEAD:{p}")
360-
} else {
361-
format!(":{p}")
362-
};
363-
let (old_blob_id, old_root) =
364-
resolve_revspec(&gix_repo, &old_revspec);
365-
366358
// TODO:
367359
// Make sure that the revspec logic is correct, i. e. uses the correct syntax for all the
368360
// relevant cases.
369-
let new_revspec = if stage {
370-
format!(":{p}")
361+
let (old_revspec, new_revspec) = if stage {
362+
(format!("HEAD:{p}"), format!(":{p}"))
371363
} else {
372-
p.to_string()
364+
(format!(":{p}"), p.to_string())
373365
};
374366

367+
let (old_blob_id, old_root) =
368+
resolve_revspec(&gix_repo, &old_revspec);
375369
let (new_blob_id, new_root) =
376370
resolve_revspec(&gix_repo, &new_revspec);
377371

0 commit comments

Comments
 (0)