Fixing a panic when showing conflict messages around conflict markers

pmeunier

Mar 1, 2023, 8:06 PM

LXKZODXJKDAKPLZJN22UNPYSJ5VOFIVZVXRXTTZZ2LJTCBGITYWQC

Dependencies

• [2] ZFSIT55U Solving a conflict
• [3] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• replacement in libpijul/src/vertex_buffer.rs at line 215
  [2.774]→[2.774:848](∅→∅)
  − Ok(header) => header.message.lines().next().unwrap().to_string(),
  [2.774]

  [2.848]
  + Ok(header) => if let Some(l) = header.message.lines().next() {

  + l.to_string()

  + } else {

  + String::new()

  + },