diff options
author | Dan Davison <dandavison7@gmail.com> | 2020-12-05 23:24:39 +0000 |
---|---|---|
committer | Dan Davison <dandavison7@gmail.com> | 2020-12-05 23:24:39 +0000 |
commit | 1a5959a6d3883801bea5d079bd6a51c03ad4fc7b (patch) | |
tree | d8875e8718128a7157ecf394bf722549f039cf0c | |
parent | e198c0d841d9fb660e59e0329235a8601b407c69 (diff) |
Commit test examples
-rw-r--r-- | etc/examples/345-keep-plus-minus-markers.diff | 85 | ||||
-rw-r--r-- | etc/examples/345-keep-plus-minus-markers.gitconfig | 36 | ||||
-rw-r--r-- | etc/examples/388-whitespace_error_keep_plus_minus_marker | 6 |
3 files changed, 127 insertions, 0 deletions
diff --git a/etc/examples/345-keep-plus-minus-markers.diff b/etc/examples/345-keep-plus-minus-markers.diff new file mode 100644 index 00000000..f76b321c --- /dev/null +++ b/etc/examples/345-keep-plus-minus-markers.diff @@ -0,0 +1,85 @@ +commit f6086641f4cfe7c28559db99c27a964b3af31dab (HEAD -> master, origin/master) +Author: Eric Nielsen <eric@amalgamar.com.br> +Date: Thu Oct 8 10:10:45 2020 -0500 + + Add class Name + +diff --git a/Person.java b/Person.java +index 971edb4..ef67116 100644 +--- a/Person.java ++++ b/Person.java +@@ -3,6 +3,11 @@ import lombok.NonNull; + + @Data + public class Person { +- private Long id; +- @NonNull private String name; ++ private Long id; ++ @Data ++ public class Name { ++ @NonNull private String first; ++ @NonNull private String last; ++ } ++ @NonNull private Name name; + } + +commit f94abd9a5d883bcf2bdee4ff735f1c3a62cc9346 +Author: Eric Nielsen <eric@amalgamar.com.br> +Date: Thu Oct 8 10:03:54 2020 -0500 + + Replace "@NonNull" by spaces + +diff --git a/Person.java b/Person.java +index 07255bf..971edb4 100644 +--- a/Person.java ++++ b/Person.java +@@ -3,6 +3,6 @@ import lombok.NonNull; + + @Data + public class Person { +- @NonNull private Long id; ++ private Long id; + @NonNull private String name; + } + +commit 4b3c2a712bef024228a95db7a318de3ebc23e11d +Author: Eric Nielsen <eric@amalgamar.com.br> +Date: Wed Oct 7 18:28:30 2020 -0500 + + Add "@NonNull " + +diff --git a/Person.java b/Person.java +index c6c830c..07255bf 100644 +--- a/Person.java ++++ b/Person.java +@@ -1,7 +1,8 @@ + import lombok.Data; ++import lombok.NonNull; + + @Data + public class Person { +- private Long id; +- private String name; ++ @NonNull private Long id; ++ @NonNull private String name; + } + +commit 27866afcea30970731ac032b108661fd0c247f2b +Author: Eric Nielsen <eric@amalgamar.com.br> +Date: Wed Oct 7 18:27:28 2020 -0500 + + First commit + +diff --git a/Person.java b/Person.java +new file mode 100644 +index 0000000..c6c830c +--- /dev/null ++++ b/Person.java +@@ -0,0 +1,7 @@ ++import lombok.Data; ++ ++@Data ++public class Person { ++ private Long id; ++ private String name; ++} diff --git a/etc/examples/345-keep-plus-minus-markers.gitconfig b/etc/examples/345-keep-plus-minus-markers.gitconfig new file mode 100644 index 00000000..e2fde8ef --- /dev/null +++ b/etc/examples/345-keep-plus-minus-markers.gitconfig @@ -0,0 +1,36 @@ +[core] + pager = delta +[color "diff-highlight"] + oldNormal = red bold + oldHighlight = red bold 52 + newNormal = green bold + newHighlight = green bold 22 +[color "diff"] + meta = yellow bold + frag = magenta bold + commit = yellow bold + old = red bold + new = green bold + whitespace = red reverse +[delta] + commit-decoration-style = yellow ol ul + file-style = bold yellow + file-decoration-style = yellow box + hunk-header-style = bold 146 + hunk-header-decoration-style = + minus-style = bold red + minus-non-emph-style = bold red + minus-emph-style = bold red 52 + minus-empty-line-marker-style = normal + zero-style = normal + plus-style = bold green + plus-non-emph-style = bold green + plus-emph-style = bold green 22 + plus-empty-line-marker-style = normal + keep-plus-minus-markers = true + line-numbers = false + side-by-side = true +[diff-so-fancy] + markEmptyLines = false + stripLeadingSymbols = false + rulerWidth = 50 diff --git a/etc/examples/388-whitespace_error_keep_plus_minus_marker b/etc/examples/388-whitespace_error_keep_plus_minus_marker new file mode 100644 index 00000000..de226434 --- /dev/null +++ b/etc/examples/388-whitespace_error_keep_plus_minus_marker @@ -0,0 +1,6 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 93f58aea..2f945245 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -11,6 +11,7 @@ readme = "README.md" ++ |