Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package git-delta for openSUSE:Factory checked in at 2026-11-20 14:49:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git-delta (Old) and /work/SRC/openSUSE:Factory/.git-delta.new.1251 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git-delta" Fri Nov 20 14:49:08 2026 rev:19 rq:1398919 version:0.21.2 Changes: -------- --- /work/SRC/openSUSE:Factory/git-delta/git-delta.changes 2026-11-19 16:57:59.885115436 +0100 +++ /work/SRC/openSUSE:Factory/.git-delta.new.1251/git-delta.changes 2026-11-20 14:51:47.961262398 +0100 @@ -1,0 +2,7 @@ +Fri Nov 20 08:09:41 UTC 2026 - Michael Vetter <[email protected]> + +- Update to 0.21.2: + * Show TUI setup in the README #2335 + * Indicate submodule dirty state #2349 + +------------------------------------------------------------------- Old: ---- git-delta-0.21.1.tar.gz New: ---- git-delta-0.21.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git-delta.spec ++++++ --- /var/tmp/diff_new_pack.wwwqZe/_old 2026-11-20 14:51:49.428324485 +0100 +++ /var/tmp/diff_new_pack.wwwqZe/_new 2026-11-20 14:51:49.430324570 +0100 @@ -17,7 +17,7 @@ Name: git-delta -Version: 0.21.1 +Version: 0.21.2 Release: 0 Summary: A syntax-highlighter for git and diff output License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.wwwqZe/_old 2026-11-20 14:51:49.469326220 +0100 +++ /var/tmp/diff_new_pack.wwwqZe/_new 2026-11-20 14:51:49.472326347 +0100 @@ -1,6 +1,6 @@ <services> <service name="cargo_vendor" mode="disabled"> - <param name="srctar">git-delta-0.21.1.tar.gz</param> + <param name="srctar">git-delta-0.21.2.tar.gz</param> <param name="compression">zst</param> <param name="update">true</param> <param name="filter">true</param> ++++++ git-delta-0.21.1.tar.gz -> git-delta-0.21.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/delta-0.21.1/Cargo.lock new/delta-0.21.2/Cargo.lock --- old/delta-0.21.1/Cargo.lock 2026-11-19 03:12:46.000000000 +0100 +++ new/delta-0.21.2/Cargo.lock 2026-11-19 19:27:11.000000000 +0100 @@ -531,9 +531,9 @@ [[package]] name = "delta-gitu" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de7f224670a5917955f37d83e415677d131075f37453b02696e0c6642a3bddb" +checksum = "5a7af9b0679e2089fa94bbd96df83274e51e2681713a0c5811c8d551cb335278" dependencies = [ "anstyle-parse", "arboard", @@ -925,7 +925,7 @@ [[package]] name = "git-delta" -version = "0.21.1" +version = "0.21.2" dependencies = [ "ansi_colours", "ansi_term", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/delta-0.21.1/Cargo.toml new/delta-0.21.2/Cargo.toml --- old/delta-0.21.1/Cargo.toml 2026-11-19 03:12:46.000000000 +0100 +++ new/delta-0.21.2/Cargo.toml 2026-11-19 19:27:11.000000000 +0100 @@ -8,7 +8,7 @@ homepage = "https://github.com/dandavison/delta" license = "MIT" repository = "https://github.com/dandavison/delta" -version = "0.21.1" +version = "0.21.2" [[bin]] name = "delta" @@ -38,7 +38,7 @@ ] } console = "0.15.0" ctrlc = "3.2.5" -delta-gitu = { version = "0.1.20", default-features = false, optional = true } +delta-gitu = { version = "0.1.21", default-features = false, optional = true } dirs = "6.0.0" git2 = { version = "0.20.0", default-features = false, features = [] } grep-cli = "0.1.8" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/delta-0.21.1/README.md new/delta-0.21.2/README.md --- old/delta-0.21.1/README.md 2026-11-19 03:12:46.000000000 +0100 +++ new/delta-0.21.2/README.md 2026-11-19 19:27:11.000000000 +0100 @@ -34,7 +34,8 @@ conflictStyle = zdiff3 ``` -Or run: +<details> +<summary>Commands to write the config</summary> ```sh git config --global core.pager delta @@ -44,6 +45,79 @@ git config --global merge.conflictStyle zdiff3 ``` +</details> + + +Alternatively, delta can be used as a TUI based on [gitu](https://github.com/altsem/gitu), with many +keybindings for exploring `git diff`, `git show`, and `git log` views, the ability to stage directly +from delta-rendered diffs (including side-by-side), reorder and fixup commits in your native log +view, and all of gitu's other git operations (commit, push, pull, frebase, etc). This is a much more +powerful way to use delta: + +```gitconfig +[pager] + diff = delta --tui + show = delta --tui + log = delta --tui +``` + +See [below](#tui-mode) for videos. + +<details> +<summary>A complete tui config with ideas for making it look nice</summary> + +```gitconfig +[pager] + diff = delta --tui + show = delta --tui + log = delta --tui + +# Everything below is optional: suggestions to show what is available. + +[pretty] + commit-format = tformat:%n%n▸ %h %C(blue)%an %C(blue)%ar%C(auto)%d%C(reset)%n%n %C(green)%s%C(auto) + commit-format-full = tformat:%n%n▸ %h %C(blue)%an %C(blue)%ar%C(auto)%d%C(reset)%n%n%w(0,4,4)%C(green)%s%C(reset)%n%+b + +[delta-tui] + # Arguments of the git log and git show that the TUI runs itself + # (`l l`, `right` on a commit). + log-args = --stat + log-args = --date=relative + log-args = --pretty=commit-format + show-args = --pretty=commit-format-full + # Head each file with its `git diff --stat` row. + file-header = stat + # Open every patch with its files folded. + start-folded = true + +[delta-tui "general.views"] + # use H to bind features, views, and commands to hotkeys + ignore-whitespace = {command} -w + +[delta] + # Must match the first line of the [pretty] formats above, so that each + # commit is one cursor stop. + commit-regex = ^(▸|commit ) + commit-decoration-style = blue ol + # Styles go in a feature rather than here, so that themes (`T`) can + # override them. + features = my-theme + +[delta "my-theme"] + file-decoration-style = magenta ul + file-added-label = • + file-modified-label = • + file-removed-label = • + file-renamed-label = • + +# delta's collection of themes, for `T` to step through: +# [include] +# path = /path/to/delta/themes.gitconfig +``` + +</details> + + Delta has many features and is very customizable; please see `delta -h` (short help) or `delta --help` (full manual), or the [online user manual](https://dandavison.github.io/delta/). @@ -202,7 +276,7 @@ <img width="600px" alt="image" src="https://github.com/dandavison/open-in-editor/assets/52205/d203d380-5acb-4296-aeb9-e38c73d6c27f"> </td></tr></table> -### TUI mode (experimental) +### TUI mode [[User manual](https://dandavison.github.io/delta/tui.html)] @@ -210,6 +284,74 @@ and discard in delta's output. It is based on [gitu](https://github.com/altsem/gitu) by altsem, a git client inspired by Magit, and is embedded via a [fork](https://github.com/dandavison/gitu). + +### git diff +Folding files, side-by-side, color themes, line numbers. + +https://github.com/user-attachments/assets/8fc87bdd-ddca-4465-acd2-c1b8682b66f3 + +### Changing what git diff shows +Context lines, editing the git command, hiding files, whole functions, `gh pr diff`. + +https://github.com/user-attachments/assets/3979530a-53f0-4f22-ace5-742a73963eda + +### git log +Searching, opening a commit, interactive rebase, `git log -p`. + +https://github.com/user-attachments/assets/b0886f1c-17bb-4a7b-a220-af067155ae19 + +### Staging and committing +Staging files, hunks and lines; committing and amending. + +https://github.com/user-attachments/assets/c5a4ba44-52b7-4b60-9cc2-82dbb4c471f1 + +### More features +Help, toggling delta features such as +/- markers, blame, filtering files. + +https://github.com/user-attachments/assets/caad6b67-1988-4171-b45a-66c4bc990d24 + +### Your own views +git commands of your own, opened from keys, with the commit or file under the cursor. + +https://github.com/user-attachments/assets/b0a33a5c-90c1-436e-8377-4dca761425a8 + +<details> +<summary><h2>Light-mode videos</h2></summary> + + +### git diff +Folding files, side-by-side, color themes, line numbers. + +https://github.com/user-attachments/assets/4818f448-5d5e-4cf3-88c9-ce3617c40773 + +### Changing what git diff shows +Context lines, editing the git command, hiding files, whole functions, `gh pr diff`. + +https://github.com/user-attachments/assets/b7399ee7-5c40-43ed-b7a4-aa6bbf0e4a3e + +### git log +Searching, opening a commit, interactive rebase, `git log -p`. + +https://github.com/user-attachments/assets/550c0ce8-be3f-4b76-a4e6-fac835f126ca + +### Staging and committing +Staging files, hunks and lines; committing and amending. + +https://github.com/user-attachments/assets/3f9d573a-f788-475d-8177-92c69047fe35 + +### More features +Help, toggling delta features such as +/- markers, blame, filtering files. + +https://github.com/user-attachments/assets/503c0608-a656-4e3c-b9d8-a32ec92b177a + +### Your own views +git commands of your own, opened from keys, with the commit or file under the cursor. + +https://github.com/user-attachments/assets/25c31545-32ac-4442-997a-11fbaf051aee + +</details> + + ### Installation and usage Please see the [user manual](https://dandavison.github.io/delta/) and `delta --help`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/delta-0.21.1/manual/src/installation.md new/delta-0.21.2/manual/src/installation.md --- old/delta-0.21.1/manual/src/installation.md 2026-11-19 03:12:46.000000000 +0100 +++ new/delta-0.21.2/manual/src/installation.md 2026-11-19 19:27:11.000000000 +0100 @@ -1,13 +1,13 @@ # Installation You can download an executable for your system: -[Linux (glibc)](https://github.com/dandavison/delta/releases/download/0.20.1/delta-0.20.1-x86_64-unknown-linux-gnu.tar.gz) +[Linux (glibc)](https://github.com/dandavison/delta/releases/download/0.21.1/delta-0.21.1-x86_64-unknown-linux-gnu.tar.gz) | -[Linux (musl)](https://github.com/dandavison/delta/releases/download/0.20.1/delta-0.20.1-x86_64-unknown-linux-musl.tar.gz) +[Linux (musl)](https://github.com/dandavison/delta/releases/download/0.21.1/delta-0.21.1-x86_64-unknown-linux-musl.tar.gz) | -[MacOS](https://github.com/dandavison/delta/releases/download/0.20.1/delta-0.20.1-aarch64-apple-darwin.tar.gz) +[MacOS](https://github.com/dandavison/delta/releases/download/0.21.1/delta-0.21.1-aarch64-apple-darwin.tar.gz) | -[Windows](https://github.com/dandavison/delta/releases/download/0.20.1/delta-0.20.1-x86_64-pc-windows-msvc.zip) +[Windows](https://github.com/dandavison/delta/releases/download/0.21.1/delta-0.21.1-x86_64-pc-windows-msvc.zip) | [All](https://github.com/dandavison/delta/releases) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/delta-0.21.1/manual/src/tui.md new/delta-0.21.2/manual/src/tui.md --- old/delta-0.21.1/manual/src/tui.md 2026-11-19 03:12:46.000000000 +0100 +++ new/delta-0.21.2/manual/src/tui.md 2026-11-19 19:27:11.000000000 +0100 @@ -1,6 +1,12 @@ # TUI mode -`delta --tui` is an interactive git client and pager whose diffs are rendered by delta. You can stage, fold and navigate delta's output whatever its layout: side-by-side, line numbers etc. do not prevent staging individual lines. It is based on [gitu](https://github.com/altsem/gitu) by altsem, a git client inspired by Magit, and is embedded via a [fork](https://github.com/dandavison/gitu). It is experimental. `--gitu` is an alias of `--tui`. +`delta --tui` is an interactive git client and pager whose diffs are rendered by delta. You can +stage, fold and navigate delta's output whatever its layout: side-by-side, line numbers etc. do not +prevent staging individual lines. It is based on [gitu](https://github.com/altsem/gitu) by altsem, a +git client inspired by Magit, and is embedded via a [fork](https://github.com/dandavison/gitu). It +is experimental. `--gitu` is an alias of `--tui`. + +See the [README TUI section](https://github.com/dandavison/delta/#tui-mode) for videos. ## Setup @@ -45,6 +51,59 @@ Every setting is listed under [TUI config](#tui-config). +## An example config + +A fuller config, with ideas for making the TUI look nice. Each part is explained in the sections below: [Log and commit formats](#log-and-commit-formats), [Color themes](#color-themes) and [TUI config](#tui-config). + +```gitconfig +[pager] + diff = delta --tui + show = delta --tui + log = delta --tui + +# Everything below is optional: suggestions to show what is available. + +[pretty] + commit-format = tformat:%n%n▸ %h %C(blue)%an %C(blue)%ar%C(auto)%d%C(reset)%n%n %C(green)%s%C(auto) + commit-format-full = tformat:%n%n▸ %h %C(blue)%an %C(blue)%ar%C(auto)%d%C(reset)%n%n%w(0,4,4)%C(green)%s%C(reset)%n%+b + +[delta-tui] + # Arguments of the git log and git show that the TUI runs itself + # (`l l`, `right` on a commit). + log-args = --stat + log-args = --date=relative + log-args = --pretty=commit-format + show-args = --pretty=commit-format-full + # Head each file with its `git diff --stat` row. + file-header = stat + # Open every patch with its files folded. + start-folded = true + +[delta-tui "general.views"] + # use H to bind features, views, and commands to hotkeys + ignore-whitespace = {command} -w + +[delta] + # Must match the first line of the [pretty] formats above, so that each + # commit is one cursor stop. + commit-regex = ^(▸|commit ) + commit-decoration-style = blue ol + # Styles go in a feature rather than here, so that themes (`T`) can + # override them. + features = my-theme + +[delta "my-theme"] + file-decoration-style = magenta ul + file-added-label = • + file-modified-label = • + file-removed-label = • + file-renamed-label = • + +# delta's collection of themes, for `T` to step through: +# [include] +# path = /path/to/delta/themes.gitconfig +``` + ## Keys Everything the TUI does. `h` or `?` shows what is available for the row under the cursor. A binding is rebound in the TUI config by the name in the last column, e.g. `hide-file = ctrl+k` in `[delta-tui "bindings.root"]`. @@ -261,12 +320,14 @@ [delta-tui "general.views"] diff-since = git diff {commit}... word-diff = {command} --word-diff + ignore-whitespace = {command} -w [delta-tui "general.diff-renderer.feature-keys"] diff-since = D word-diff = W + ignore-whitespace = w ``` -The key opens the view on top of the one it is pressed on, as `right` opens a commit, and `left` goes back. `{commit}`, `{file}` and `{branch}` are filled in as for shell commands, but a view is not run by a shell: `{command}` is a word of its own there, standing for the words of the git command the screen is showing, so that a view such as `word-diff` above changes the command in view. A view is a git command the TUI shows, run again after each change, and `:`, `U` and `&` change it as they change any other. A view that is not `git diff`, `git show` or `git log` is refused. `H` lists views in a column of their own. +The key opens the view on top of the one it is pressed on, as `right` opens a commit, and `left` goes back. `{commit}`, `{file}` and `{branch}` are filled in as for shell commands, but a view is not run by a shell: `{command}` is a word of its own there, standing for the words of the git command the screen is showing, so that a view such as `word-diff` or `ignore-whitespace` above changes the command in view. A view is a git command the TUI shows, run again after each change, and `:`, `U` and `&` change it as they change any other. A view that is not `git diff`, `git show` or `git log` is refused. `H` lists views in a column of their own. ## Log and commit formats diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/delta-0.21.1/src/handlers/diff_header.rs new/delta-0.21.2/src/handlers/diff_header.rs --- old/delta-0.21.1/src/handlers/diff_header.rs 2026-11-19 03:12:46.000000000 +0100 +++ new/delta-0.21.2/src/handlers/diff_header.rs 2026-11-19 19:27:11.000000000 +0100 @@ -1163,6 +1163,27 @@ } #[test] + fn test_hunk_header_record_on_submodule_short_row() { + // With diff.submodule=short, delta draws the submodule's hunk as one + // row of commits. That row stands in for the hunk header, so it must + // carry the `h` record: without it a host cannot place the row. + let input = "\ +diff --git a/sub b/sub +index 64a392c..676de96 160000 +--- a/sub ++++ b/sub +@@ -1 +1 @@ +-Subproject commit 64a392c2ccaeea0acaef893ddb0024f3c939ffd9 ++Subproject commit 676de96c0a8aefe32c4195376be47ebcce2b6703-dirty +"; + assert_snapshot!(visible_metadata_records(input, &[]), @r" + ⟦1;f;;;sub⟧sub + ⟦1;f;;;sub⟧─────────────────────────────────────────── + ⟦1;h;1;;sub⟧64a392c2ccae..676de96c0a8a (dirty) + "); + } + + #[test] fn test_no_file_header_record_on_an_unreadable_submodule_row() { // A row that opens with "Submodule " but states no submodule carries no // record: an empty path would hand the host a second file identity. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/delta-0.21.1/src/handlers/hunk_header.rs new/delta-0.21.2/src/handlers/hunk_header.rs --- old/delta-0.21.1/src/handlers/hunk_header.rs 2026-11-19 03:12:46.000000000 +0100 +++ new/delta-0.21.2/src/handlers/hunk_header.rs 2026-11-19 19:27:11.000000000 +0100 @@ -34,7 +34,7 @@ #[derive(Clone, Default, Debug, PartialEq, Eq)] pub struct ParsedHunkHeader { code_fragment: String, - line_numbers_and_hunk_lengths: Vec<(usize, usize)>, + pub line_numbers_and_hunk_lengths: Vec<(usize, usize)>, } impl ParsedHunkHeader { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/delta-0.21.1/src/handlers/submodule.rs new/delta-0.21.2/src/handlers/submodule.rs --- old/delta-0.21.1/src/handlers/submodule.rs 2026-11-19 03:12:46.000000000 +0100 +++ new/delta-0.21.2/src/handlers/submodule.rs 2026-11-19 19:27:11.000000000 +0100 @@ -45,21 +45,49 @@ if !self.test_submodule_short_line() || self.config.color_only { return Ok(false); } - if let Some(commit) = get_submodule_short_commit(&self.line) { - if let State::HunkHeader(_, _, _, _) = self.state { + if let Some((commit, dirty)) = get_submodule_short_commit(&self.line) { + if let State::HunkHeader(_, parsed_hunk_header, _, _) = &self.state { + // The row drawn below replaces the hunk, hunk header included, + // so it carries the hunk header's record. + if let Some(md) = self.painter.diff_line_metadata.as_mut() { + let file = if self.plus_file == "/dev/null" { + &self.minus_file + } else { + &self.plus_file + }; + md.initialize_hunk( + &parsed_hunk_header.line_numbers_and_hunk_lengths, + file.clone(), + ); + } self.state = State::SubmoduleShort(commit.to_owned()); } else if let State::SubmoduleShort(minus_commit) = &self.state { self.painter.emit()?; - writeln!( - self.painter.writer, - "{}..{}", - self.config - .minus_style - .paint(minus_commit.chars().take(12).collect::<String>()), - self.config - .plus_style - .paint(commit.chars().take(12).collect::<String>()), - )?; + // git writes "-dirty" after the new commit when the submodule's + // working tree has uncommitted changes or untracked files. When + // that is the only change, the two commits are the same. + let plus_commit = self + .config + .plus_style + .paint(commit.chars().take(12).collect::<String>()); + let range = if minus_commit == commit { + plus_commit.to_string() + } else { + format!( + "{}..{}", + self.config + .minus_style + .paint(minus_commit.chars().take(12).collect::<String>()), + plus_commit, + ) + }; + let dirty = if dirty { " (dirty)" } else { "" }; + let osc = self + .painter + .diff_line_metadata + .as_ref() + .map_or(String::new(), |md| md.osc_for_hunk_header()); + writeln!(self.painter.writer, "{osc}{range}{dirty}")?; } } Ok(true) @@ -86,11 +114,12 @@ ).unwrap(); } -pub fn get_submodule_short_commit(line: &str) -> Option<&str> { - match SUBMODULE_SHORT_LINE_REGEX.captures(line) { - Some(caps) => Some(caps.get(1).unwrap().as_str()), - None => None, - } +/// The commit a "Subproject commit" row states, and whether the row marks the +/// submodule's working tree as dirty. +pub fn get_submodule_short_commit(line: &str) -> Option<(&str, bool)> { + SUBMODULE_SHORT_LINE_REGEX + .captures(line) + .map(|caps| (caps.get(1).unwrap().as_str(), caps.get(2).is_some())) } /// The submodule a "Submodule …" row names, for the rows that are the header of @@ -147,4 +176,17 @@ assert_eq!(get_submodule_log_path(line), expected, "{line}"); } } + + #[test] + fn test_get_submodule_short_commit_reports_dirty_state() { + const COMMIT: &str = "ca030fd1a02225a6fc1a834c480276d9c97a8c6f"; + + let line = format!("-Subproject commit {COMMIT}"); + assert_eq!(get_submodule_short_commit(&line), Some((COMMIT, false))); + + let line = format!("+Subproject commit {COMMIT}-dirty"); + assert_eq!(get_submodule_short_commit(&line), Some((COMMIT, true))); + + assert_eq!(get_submodule_short_commit("Subproject commit nope"), None); + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/delta-0.21.1/src/tests/test_example_diffs.rs new/delta-0.21.2/src/tests/test_example_diffs.rs --- old/delta-0.21.1/src/tests/test_example_diffs.rs 2026-11-19 03:12:46.000000000 +0100 +++ new/delta-0.21.2/src/tests/test_example_diffs.rs 2026-11-19 19:27:11.000000000 +0100 @@ -310,11 +310,39 @@ r#" some_submodule ────────────────────────────── + ca030fd1a022..803be42ca46a (dirty)"#, + ); + } + + #[test] + fn test_simple_clean_submodule_diff() { + DeltaTest::with_args(&["--width", "30"]) + .with_input(SUBMODULE_CLEAN) + .inspect() + .expect_after_skip( + 1, + r#" + some_submodule + ────────────────────────────── ca030fd1a022..803be42ca46a"#, ); } #[test] + fn test_dirty_submodule_at_same_commit_diff() { + DeltaTest::with_args(&["--width", "30"]) + .with_input(SUBMODULE_DIRTY_AT_SAME_COMMIT) + .inspect() + .expect_after_skip( + 1, + r#" + some_submodule + ────────────────────────────── + ca030fd1a022 (dirty)"#, + ); + } + + #[test] fn test_submodule_diff_log() { // See etc/examples/662-submodules // diff.submodule = log @@ -2707,6 +2735,25 @@ +Subproject commit 803be42ca46af0fbc65b54a9abfb499389516939-dirty "; + const SUBMODULE_CLEAN: &str = "\ +diff --git a/some_submodule b/some_submodule +index ca030fd1a0..803be42ca4 160000 +--- a/some_submodule ++++ b/some_submodule +@@ -1 +1 @@ +-Subproject commit ca030fd1a02225a6fc1a834c480276d9c97a8c6f ++Subproject commit 803be42ca46af0fbc65b54a9abfb499389516939 +"; + + const SUBMODULE_DIRTY_AT_SAME_COMMIT: &str = "\ +diff --git a/some_submodule b/some_submodule +--- a/some_submodule ++++ b/some_submodule +@@ -1 +1 @@ +-Subproject commit ca030fd1a02225a6fc1a834c480276d9c97a8c6f ++Subproject commit ca030fd1a02225a6fc1a834c480276d9c97a8c6f-dirty +"; + // See etc/examples/662-submodules // diff.submodule = log const SUBMODULE_DIFF_LOG: &str = "\ ++++++ vendor.tar.zst ++++++ /work/SRC/openSUSE:Factory/git-delta/vendor.tar.zst /work/SRC/openSUSE:Factory/.git-delta.new.1251/vendor.tar.zst differ: char 7, line 1
