{"thread":{"id":"16825","subject":"[Patch] Minor corrections to help & error messages","startedAt":"2008-12-21T23:53:09Z","lastAt":"2008-12-21T23:53:09Z","messageCount":1,"participants":["Richard Hartmann"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"98520","messageId":"2d460de70812211553q56d20fb0rfbd2f8fdd555103a@mail.gmail.com","threadId":"16825","inReplyTo":null,"subject":"[Patch] Minor corrections to help & error messages","fromName":"Richard Hartmann","fromEmail":"richih.mailinglist@gmail.com","sentAt":"2008-12-21T23:53:09Z","receivedAt":"2008-12-21T23:53:09Z","isPatch":true,"sender":{"key":"richih.mailinglist@gmail.com","avatar":"https://avatars.githubusercontent.com/u/754723?v=4"},"body":"Hi all,\n\nthe two patches should be so obvious, there is not much\nneed to explain them.\n\nI noticed that quite a few options in the manpages are\nnot in alphabetical order. Would a patch which fixes\nall of those be accepted?\n\n\nRichard\n\n\nFrom 59b291d79cdcdb5fe235202cb45705dd4f8f352d Mon Sep 17 00:00:00 2001\nFrom: Richard Hartmann <richih.mailinglist@gmail.com>\nDate: Sun, 21 Dec 2008 23:28:25 +0100\nSubject: [PATCH] Make help entries alphabetical\n\nSwitched the order. If there is a need for more changes, I can do them later.\n\nSigned-off-by: Richard Hartmann <richih@net.in.tum.de>\n---\n Documentation/config.txt |    8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 21ea165..52786c7 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -601,10 +601,6 @@ diff.autorefreshindex::\n \taffects only 'git-diff' Porcelain, and not lower level\n \t'diff' commands, such as 'git-diff-files'.\n \n-diff.suppress-blank-empty::\n-\tA boolean to inhibit the standard behavior of printing a space\n-\tbefore each empty output line. Defaults to false.\n-\n diff.external::\n \tIf this config variable is set, diff generation is not\n \tperformed using the internal diff machinery, but using the\n@@ -639,6 +635,10 @@ diff.renames::\n \twill enable basic rename detection.  If set to \"copies\" or\n \t\"copy\", it will detect copies, as well.\n \n+diff.suppress-blank-empty::\n+\tA boolean to inhibit the standard behavior of printing a space\n+\tbefore each empty output line. Defaults to false.\n+\n fetch.unpackLimit::\n \tIf the number of objects fetched over the git native\n \ttransfer is below this\n-- \n1.5.6.5\n\n\n\nFrom bc332cec43d1a389786c36ee893a0a1d09b112bc Mon Sep 17 00:00:00 2001\nFrom: Richard Hartmann <richih.mailinglist@gmail.com>\nDate: Mon, 22 Dec 2008 00:17:32 +0100\nSubject: [PATCH] Always show which directory is not a git repository\n\nUnify all\n\n  fatal: Not a git repository\n\nerror messages so they include path information.\n\nSigned-off-by: Richard Hartmann <richih@net.in.tum.de>\n---\n contrib/workdir/git-new-workdir |    2 +-\n perl/Git.pm                     |    4 ++--\n setup.c                         |    2 +-\n 3 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/contrib/workdir/git-new-workdir b/contrib/workdir/git-new-workdir\nindex 7959eab..993cacf 100755\n--- a/contrib/workdir/git-new-workdir\n+++ b/contrib/workdir/git-new-workdir\n@@ -22,7 +22,7 @@ branch=$3\n # want to make sure that what is pointed to has a .git directory ...\n git_dir=$(cd \"$orig_git\" 2>/dev/null &&\n   git rev-parse --git-dir 2>/dev/null) ||\n-  die \"\\\"$orig_git\\\" is not a git repository!\"\n+  die \"Not a git repository: \\\"$orig_git\\\"\"\n \n case \"$git_dir\" in\n .git)\ndiff --git a/perl/Git.pm b/perl/Git.pm\nindex dde9105..8392a68 100644\n--- a/perl/Git.pm\n+++ b/perl/Git.pm\n@@ -204,14 +204,14 @@ sub repository {\n \n \t\t\tunless (-d \"$dir/refs\" and -d \"$dir/objects\" and -e \"$dir/HEAD\") {\n \t\t\t\t# Mimick git-rev-parse --git-dir error message:\n-\t\t\t\tthrow Error::Simple('fatal: Not a git repository');\n+\t\t\t\tthrow Error::Simple(\"fatal: Not a git repository: $dir\");\n \t\t\t}\n \t\t\tmy $search = Git->repository(Repository => $dir);\n \t\t\ttry {\n \t\t\t\t$search->command('symbolic-ref', 'HEAD');\n \t\t\t} catch Git::Error::Command with {\n \t\t\t\t# Mimick git-rev-parse --git-dir error message:\n-\t\t\t\tthrow Error::Simple('fatal: Not a git repository');\n+\t\t\t\tthrow Error::Simple(\"fatal: Not a git repository: $dir\");\n \t\t\t}\n \n \t\t\t$opts{Repository} = abs_path($dir);\ndiff --git a/setup.c b/setup.c\nindex 833ced2..6b277b6 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -468,7 +468,7 @@ const char *setup_git_directory_gently(int *nongit_ok)\n \t\t\t\t*nongit_ok = 1;\n \t\t\t\treturn NULL;\n \t\t\t}\n-\t\t\tdie(\"Not a git repository\");\n+\t\t\tdie(\"Not a git repository (or any of the parent directories): %s\", DEFAULT_GIT_DIR_ENVIRONMENT);\n \t\t}\n \t\tif (chdir(\"..\"))\n \t\t\tdie(\"Cannot change to %s/..: %s\", cwd, strerror(errno));\n-- \n1.5.6.5\n\n"}]}