{"thread":{"id":"44942","subject":"[PATCH 3/3] git-prompt.sh: fix for submodule 'dirty' indicator","startedAt":"2017-01-22T19:30:39Z","lastAt":"2017-01-24T01:17:20Z","messageCount":2,"participants":["Benjamin Fuchs","brian m. carlson"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"309939","messageId":"1485113421-22264-1-git-send-email-email@benjaminfuchs.de","threadId":"44942","inReplyTo":null,"subject":"[PATCH 3/3] git-prompt.sh: fix for submodule 'dirty' indicator","fromName":"Benjamin Fuchs","fromEmail":"email@benjaminfuchs.de","sentAt":"2017-01-22T19:30:21Z","receivedAt":"2017-01-22T19:30:39Z","isPatch":true,"sender":{"key":"email@benjaminfuchs.de","avatar":null},"body":"Fixing wrong git diff line.\n---\n contrib/completion/git-prompt.sh | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh\nindex c44b9a2..43b28e9 100644\n--- a/contrib/completion/git-prompt.sh\n+++ b/contrib/completion/git-prompt.sh\n@@ -306,9 +306,9 @@ __git_ps1_submodule ()\n \tlocal submodule_name=\"$(basename \"$git_dir\")\"\n \tif [ \"$submodule_name\" != \".git\" ] && [ \"$submodule_name\" != \".\" ]; then\n \t\tlocal parent_top=\"${git_dir%.git*}\"\n-\t\tlocal submodule_top=\"${git_dir#*modules}\"\n+\t\tlocal submodule_top=\"${git_dir#*modules/}\"\n \t\tlocal status=\"\"\n-\t\tgit diff -C \"$parent_top\" --no-ext-diff --ignore-submodules=dirty --quiet -- \"$submodule_top\" 2>/dev/null || status=\"+\"\n+\t\tgit -C \"$parent_top\" diff --no-ext-diff --ignore-submodules=dirty --quiet -- \"$submodule_top\" 2>/dev/null || status=\"+\"\n \t\tprintf \"$status$submodule_name:\"\n \tfi\n }\n@@ -544,7 +544,7 @@ __git_ps1 ()\n \n \tlocal sub=\"\"\n \tif [ -n \"${GIT_PS1_SHOWSUBMODULE}\" ]; then\n-\t\tsub=\"$(__git_ps1_submodule $g)\"\n+\t\tsub=\"$(__git_ps1_submodule \"$g\")\"\n \tfi\n \n \tlocal f=\"$w$i$s$u\"\n-- \n2.7.4\n\n"},{"id":"310067","messageId":"20170124011708.qlq7aenmdfg6wosv@genre.crustytoothpaste.net","threadId":"44942","inReplyTo":"1485113421-22264-1-git-send-email-email@benjaminfuchs.de","subject":"Re: [PATCH 3/3] git-prompt.sh: fix for submodule 'dirty' indicator","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2017-01-24T01:17:08Z","receivedAt":"2017-01-24T01:17:20Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On Sun, Jan 22, 2017 at 08:30:21PM +0100, Benjamin Fuchs wrote:\n> Fixing wrong git diff line.\n\nThis patch says 3/3, but I don't see 1 and 2.  Also, this description\ndoesn't tell me what the problem is, or why this fix is useful.  Such\ninformation helps us down the line when looking at the history, and it\nalso helps reviewers determine whether your change makes sense.\n\nRight now I can only guess that there's an issue with spaces or slashes\nsomehow.  You might want to take a look at\nDocumentation/SubmittingPatches, especially point 2.\n\n> ---\n>  contrib/completion/git-prompt.sh | 6 +++---\n>  1 file changed, 3 insertions(+), 3 deletions(-)\n> \n> diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh\n> index c44b9a2..43b28e9 100644\n> --- a/contrib/completion/git-prompt.sh\n> +++ b/contrib/completion/git-prompt.sh\n> @@ -306,9 +306,9 @@ __git_ps1_submodule ()\n>  \tlocal submodule_name=\"$(basename \"$git_dir\")\"\n>  \tif [ \"$submodule_name\" != \".git\" ] && [ \"$submodule_name\" != \".\" ]; then\n>  \t\tlocal parent_top=\"${git_dir%.git*}\"\n> -\t\tlocal submodule_top=\"${git_dir#*modules}\"\n> +\t\tlocal submodule_top=\"${git_dir#*modules/}\"\n>  \t\tlocal status=\"\"\n> -\t\tgit diff -C \"$parent_top\" --no-ext-diff --ignore-submodules=dirty --quiet -- \"$submodule_top\" 2>/dev/null || status=\"+\"\n> +\t\tgit -C \"$parent_top\" diff --no-ext-diff --ignore-submodules=dirty --quiet -- \"$submodule_top\" 2>/dev/null || status=\"+\"\n>  \t\tprintf \"$status$submodule_name:\"\n>  \tfi\n>  }\n> @@ -544,7 +544,7 @@ __git_ps1 ()\n>  \n>  \tlocal sub=\"\"\n>  \tif [ -n \"${GIT_PS1_SHOWSUBMODULE}\" ]; then\n> -\t\tsub=\"$(__git_ps1_submodule $g)\"\n> +\t\tsub=\"$(__git_ps1_submodule \"$g\")\"\n>  \tfi\n>  \n>  \tlocal f=\"$w$i$s$u\"\n> -- \n> 2.7.4\n> \n\n-- \nbrian m. carlson / brian with sandals: Houston, Texas, US\n+1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only\nOpenPGP: https://keybase.io/bk2204\n"}]}