[ref #190] don't claim there was a previous oid unnecessarily…

…maybe this is where we should see that mutating this just to use it in reflogs isn't the way.

Sebastian Thiel committed 5 years ago

Commit 68f7fc21 parent 07126d62 files · +3 −8Browse files

Unified · Split

2 files

             assert!(!change.update.deref, "Deref mode is turned into splits and turned off");
             match &change.update.change {
                 // reflog first, then reference
-                Change::Update {
+                Change::Update { log, new, expected } => {
-                    log,
-                    new,
-                    expected: mode,
-                } => {
                     let lock = change.lock.take().expect("each ref is locked");
                     let (update_ref, update_reflog) = match log.mode {
                         RefLog::Only => (false, true),
                         match new {
                             Target::Symbolic(_) => {} // no reflog for symref changes
                             Target::Peeled(new_oid) => {
-                                let previous = mode.previous_oid().or(change.leaf_referent_previous_oid);
+                                let previous = expected.previous_oid().or(change.leaf_referent_previous_oid);
                                 let do_update = previous.as_ref().map_or(true, |previous| previous != new_oid);
                                 if do_update {
                                     self.store.reflog_create_or_append(

 impl PreviousValue {
     pub(crate) fn previous_oid(&self) -> Option<ObjectId> {
         match self {
-            PreviousValue::MustExistAndMatch(Target::Peeled(oid))
+            PreviousValue::MustExistAndMatch(Target::Peeled(oid)) => Some(*oid),
-            | PreviousValue::ExistingMustMatch(Target::Peeled(oid)) => Some(*oid),
             _ => None,
         }
     }

Keyboard shortcuts