pijul diff: Do not ignore the --untracked option in presence of --short.

[?]
FHRXP5Jnb2MWLDrPrnLnkN2ryWcGCo6CRr1dXR9FW2YA
Dec 1, 2021, 5:04 PM
EWZ7VHV4N7QNK7GNG3FC6AQ6XVPH4ADJSUQADM7TZFYAD2AYNNTAC

Dependencies

  • [2] NWU66ZIP Untracked files when there are no other changes
  • [3] AGTMM5U7 More informative diff --short
  • [4] I52XSRUH Massive cleanup, and simplification
  • [5] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
  • [6] OQQ4TGEM Printing modifications only once in pijul diff
  • [7] VSTBTRYE Fixing a compilation error
  • [8] HSEYMLO2 Adding an untracked change iterator

Change contents

  • replacement in pijul/src/commands/diff.rs at line 93
    [2.34][2.34:62]()
    if self.short {
    [2.34]
    [2.62]
    if self.short && self.untracked {
  • replacement in pijul/src/commands/diff.rs at line 224
    [3.1899][3.1899:1950](),[3.1950][2.402:469]()
    for path in untracked(&repo, &*txn)? {
    writeln!(stdout, "U {}", path.to_str().unwrap())?;
    [3.1899]
    [3.5627]
    if self.untracked {
    for path in untracked(&repo, &*txn)? {
    writeln!(stdout, "U {}", path.to_str().unwrap())?;
    }