[PATCH v2] Documentation: GPG capitalization

[Dave Nicolson]

When "GPG" is used in a sentence it is now consistently capitalized. When 
referring to the binary it is left as "gpg".

Signed-off-by: David Nicolson 
---
 Documentation/git-tag.txt   | 2 +-
 Documentation/git-verify-commit.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index abab481..32bc4aa 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -78,7 +78,7 @@ OPTIONS
 
 -v::
 --verify::
-   Verify the gpg signature of the given tag names.
+   Verify the GPG signature of the given tag names.
 
 -n::
 specifies how many lines from the annotation, if any,
diff --git a/Documentation/git-verify-commit.txt 
b/Documentation/git-verify-commit.txt
index ecf4da1..92097f6 100644
--- a/Documentation/git-verify-commit.txt
+++ b/Documentation/git-verify-commit.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 
 DESCRIPTION
 ---
-Validates the gpg signature created by 'git commit -S'.
+Validates the GPG signature created by 'git commit -S'.
 
 OPTIONS
 ---

--
https://github.com/git/git/pull/246
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] Documentation: GPG capitalization

[Dave Nicolson]

When "GPG" is used in a sentence it is now consistently capitalized. When 
referring to the binary it is left as "gpg".

Signed-off-by: David Nicolson 
---
 Documentation/git-mktag.txt | 2 +-
 Documentation/git-tag.txt   | 2 +-
 Documentation/git-verify-commit.txt | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt
index fa6a756..724408d 100644
--- a/Documentation/git-mktag.txt
+++ b/Documentation/git-mktag.txt
@@ -32,7 +32,7 @@ followed by some 'optional' free-form message (some tags 
created
 by older Git may not have `tagger` line).  The message, when
 exists, is separated by a blank line from the header.  The
 message part may contain a signature that Git itself doesn't
-care about, but that can be verified with gpg.
+care about, but that can be verified with GPG.
 
 GIT
 ---
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index abab481..32bc4aa 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -78,7 +78,7 @@ OPTIONS
 
 -v::
 --verify::
-   Verify the gpg signature of the given tag names.
+   Verify the GPG signature of the given tag names.
 
 -n::
 specifies how many lines from the annotation, if any,
diff --git a/Documentation/git-verify-commit.txt 
b/Documentation/git-verify-commit.txt
index ecf4da1..0101f0f 100644
--- a/Documentation/git-verify-commit.txt
+++ b/Documentation/git-verify-commit.txt
@@ -12,12 +12,12 @@ SYNOPSIS
 
 DESCRIPTION
 ---
-Validates the gpg signature created by 'git commit -S'.
+Validates the GPG signature created by 'git commit -S'.
 
 OPTIONS
 ---
 --raw::
-   Print the raw gpg status output to standard error instead of the normal
+   Print the raw GPG status output to standard error instead of the normal
human-readable output.
 
 -v::

--
https://github.com/git/git/pull/246
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/2] Do not output whitespace on blank lines

[Dave Nicolson]

---
 diff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diff.c b/diff.c
index d3734d3..459b36a 100644
--- a/diff.c
+++ b/diff.c
@@ -471,7 +471,7 @@ static void emit_line_0(struct diff_options *o, const char 
*set, const char *res
has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
if (has_trailing_carriage_return)
len--;
-   nofirst = 0;
+   nofirst = len == 0 && (char)first == ' ' ? 1 : 0;
}
 
if (len || !nofirst) {

--
https://github.com/git/git/pull/245
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/2] Fix tests

[Dave Nicolson]

---
 t/lib-diff-alternative.sh| 4 ++--
 t/t4029-diff-trailing-space.sh   | 2 +-
 t/t4034-diff-words.sh| 2 +-
 t/t4051-diff-function-context.sh | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/t/lib-diff-alternative.sh b/t/lib-diff-alternative.sh
index 8b4dbf2..4a5d9d0 100644
--- a/t/lib-diff-alternative.sh
+++ b/t/lib-diff-alternative.sh
@@ -66,7 +66,7 @@ index 6faa5a3..e3af329 100644
 +++ b/file2
 @@ -1,26 +1,25 @@
  #include 
- 
+
 +int fib(int n)
 +{
 +if(n > 2)
@@ -86,7 +86,7 @@ index 6faa5a3..e3af329 100644
  printf("%d\n", foo);
  }
  }
- 
+
 -int fact(int n)
 -{
 -if(n > 1)
diff --git a/t/t4029-diff-trailing-space.sh b/t/t4029-diff-trailing-space.sh
index 3ccc237..751469c 100755
--- a/t/t4029-diff-trailing-space.sh
+++ b/t/t4029-diff-trailing-space.sh
@@ -27,7 +27,7 @@ test_expect_success \
  git config --bool diff.suppressBlankEmpty true &&
  git diff f > actual &&
  test_cmp exp actual &&
- perl -i.bak -p -e "s/^\$/ /" exp &&
+ perl -i.bak -p -e "s/^\$//" exp &&
  git config --bool diff.suppressBlankEmpty false &&
  git diff f > actual &&
  test_cmp exp actual &&
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index f2f55fc..7458e61 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -106,7 +106,7 @@ test_expect_success '--word-diff=porcelain' '
-h(4)
+h(4),hh[44]
~
-# significant space
+   # significant space
~
 a = b + c
~
diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh
index 001d678..f786139 100755
--- a/t/t4051-diff-function-context.sh
+++ b/t/t4051-diff-function-context.sh
@@ -57,7 +57,7 @@ diff --git a/hello.c b/hello.c
  {
 -  /* Classic. */
printf("Hello world.\n");
- 
+
/* Success! */
return 0;
  }
@@ -73,12 +73,12 @@ diff --git a/hello.c b/hello.c
 --- a/hello.c
 +++ b/hello.c
 @@ -9,9 +9,8 @@ static int a(void)
- 
+
  static int hello_world(void)
  {
 -  /* Classic. */
printf("Hello world.\n");
- 
+
/* Success! */
return 0;
  }

--
https://github.com/git/git/pull/245
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html