summaryrefslogtreecommitdiffstats
path: root/src/config.rs
diff options
context:
space:
mode:
authorDan Davison <dandavison7@gmail.com>2021-08-23 00:24:49 -0700
committerGitHub <noreply@github.com>2021-08-23 00:24:49 -0700
commitbffa1efded7359b57d862a25422ef6b386ff9e4c (patch)
tree6bd5e5f1f0819a0c5df789d155a19fb17f49c8bb /src/config.rs
parent5e02d340a8b3f3184f84a34434d7ad170988331f (diff)
More minimalistic display of submodule (short) diffs (#700)
* Rename state machine state: Submodule -> SubmoduleLog * More minimalistic display of submodule log diffs Partially fixes #662 * Defer emitting hunk header until first true hunk line A consequence is that we do not emit the (pseudo) hunk header in submodule (short) state; see #662.
Diffstat (limited to 'src/config.rs')
-rw-r--r--src/config.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/config.rs b/src/config.rs
index acf7d0c9..9b1c23ce 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -99,8 +99,8 @@ impl Config {
State::HunkPlus(_) => &self.plus_style,
State::CommitMeta => &self.commit_style,
State::FileMeta => &self.file_style,
- State::HunkHeader => &self.hunk_header_style,
- State::Submodule => &self.file_style,
+ State::HunkHeader(_, _) => &self.hunk_header_style,
+ State::SubmoduleLog => &self.file_style,
_ => delta_unreachable("Unreachable code reached in get_style."),
}
}