{"thread":{"id":"17616","subject":"[PATCH 0/2] completion: Fixes GIT_PS1_SHOWDIRTYSTATE problems","startedAt":"2009-02-06T15:46:48Z","lastAt":"2009-02-06T23:32:33Z","messageCount":9,"participants":["Ted Pavlic","Shawn O. Pearce","Thomas Rast"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"103511","messageId":"1233935210-4941-1-git-send-email-ted@tedpavlic.com","threadId":"17616","inReplyTo":null,"subject":"[PATCH 0/2] completion: Fixes GIT_PS1_SHOWDIRTYSTATE problems","fromName":"Ted Pavlic","fromEmail":"ted@tedpavlic.com","sentAt":"2009-02-06T15:46:48Z","receivedAt":"2009-02-06T15:46:48Z","isPatch":true,"sender":{"key":"ted@tedpavlic.com","avatar":"https://gravatar.com/avatar/d085392370ff4c028cf17a0e81e0647744c9682fbcb36b499f31d08ef80ef569?d=mp&s=160"},"body":"These two patches correct some problems introduced by the recent\nGIT_PS1_SHOWDIRTYSTATE fixes.\n\nThe first changes $VAR to ${VAR-} to\nprevent the unbound variable errors that were discussed earlier on the\nlist.\n\nThe second changes the GIT_PS1_SHOWDIRTYSTATE documentation from\n\n#(Tab)Text\n\nto\n\n#(7 spaces)Text\n\nto be consistent with the surrounding text.\n\nTed Pavlic (2):\n completion: Fix GIT_PS1_SHOWDIRTYSTATE to prevent unbound variable\n errors.\n completion: Get rid of tabbed indentation in comments. Replace with\n spaces.\n\n contrib/completion/git-completion.bash | 12 ++++++------\n 1 files changed, 6 insertions(+), 6 deletions(-)\n"},{"id":"103512","messageId":"1233935210-4941-2-git-send-email-ted@tedpavlic.com","threadId":"17616","inReplyTo":"1233935210-4941-1-git-send-email-ted@tedpavlic.com","subject":"[PATCH 1/2] completion: Fix GIT_PS1_SHOWDIRTYSTATE to prevent unbound variable errors.","fromName":"Ted Pavlic","fromEmail":"ted@tedpavlic.com","sentAt":"2009-02-06T15:46:49Z","receivedAt":"2009-02-06T15:46:49Z","isPatch":true,"sender":{"key":"ted@tedpavlic.com","avatar":"https://gravatar.com/avatar/d085392370ff4c028cf17a0e81e0647744c9682fbcb36b499f31d08ef80ef569?d=mp&s=160"},"body":"Signed-off-by: Ted Pavlic \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 307bf5d..6e04985 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -125,7 +125,7 @@ __git_ps1 ()\n \t\tlocal w\n \t\tlocal i\n \n-\t\tif test -n \"$GIT_PS1_SHOWDIRTYSTATE\"; then\n+\t\tif test -n \"${GIT_PS1_SHOWDIRTYSTATE-}\"; then\n \t\t\tif test \"$(git config --bool bash.showDirtyState)\" != \"false\"; then\n \t\t\t\tgit diff --no-ext-diff --ignore-submodules \\\n \t\t\t\t\t--quiet --exit-code || w=\"*\"\n-- \n1.6.1.2.319.gbd9e\n"},{"id":"103513","messageId":"1233935210-4941-3-git-send-email-ted@tedpavlic.com","threadId":"17616","inReplyTo":"1233935210-4941-2-git-send-email-ted@tedpavlic.com","subject":"[PATCH 2/2] completion: Get rid of tabbed indentation in comments. Replace with spaces.","fromName":"Ted Pavlic","fromEmail":"ted@tedpavlic.com","sentAt":"2009-02-06T15:46:50Z","receivedAt":"2009-02-06T15:46:50Z","isPatch":true,"sender":{"key":"ted@tedpavlic.com","avatar":"https://gravatar.com/avatar/d085392370ff4c028cf17a0e81e0647744c9682fbcb36b499f31d08ef80ef569?d=mp&s=160"},"body":"Signed-off-by: Ted Pavlic \n---\n contrib/completion/git-completion.bash | 10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 6e04985..f44f63c 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -34,11 +34,11 @@\n # are currently in a git repository. The %s token will be\n # the name of the current branch.\n #\n-#\tIn addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty\n-#\tvalue, unstaged (*) and staged (+) changes will be shown next\n-#\tto the branch name. You can configure this per-repository\n-#\twith the bash.showDirtyState variable, which defaults to true\n-#\tonce GIT_PS1_SHOWDIRTYSTATE is enabled.\n+# In addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty\n+# value, unstaged (*) and staged (+) changes will be shown next\n+# to the branch name. You can configure this per-repository\n+# with the bash.showDirtyState variable, which defaults to true\n+# once GIT_PS1_SHOWDIRTYSTATE is enabled.\n #\n # To submit patches:\n #\n-- \n1.6.1.2.319.gbd9e\n"},{"id":"103516","messageId":"20090206155823.GO26880@spearce.org","threadId":"17616","inReplyTo":"1233935210-4941-3-git-send-email-ted@tedpavlic.com","subject":"Re: [PATCH 2/2] completion: Get rid of tabbed indentation in comments. Replace with spaces.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-02-06T15:58:23Z","receivedAt":"2009-02-06T15:58:23Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Ted Pavlic wrote:\n> Signed-off-by: Ted Pavlic \n\nBoth patches,\n\nTrivially-acked-by: Shawn O. Pearce \n\n\n> ---\n> contrib/completion/git-completion.bash | 10 +++++-----\n> 1 files changed, 5 insertions(+), 5 deletions(-)\n> \n> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\n> index 6e04985..f44f63c 100755\n> --- a/contrib/completion/git-completion.bash\n> +++ b/contrib/completion/git-completion.bash\n> @@ -34,11 +34,11 @@\n> # are currently in a git repository. The %s token will be\n> # the name of the current branch.\n> #\n> -#\tIn addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty\n> -#\tvalue, unstaged (*) and staged (+) changes will be shown next\n> -#\tto the branch name. You can configure this per-repository\n> -#\twith the bash.showDirtyState variable, which defaults to true\n> -#\tonce GIT_PS1_SHOWDIRTYSTATE is enabled.\n> +# In addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty\n> +# value, unstaged (*) and staged (+) changes will be shown next\n> +# to the branch name. You can configure this per-repository\n> +# with the bash.showDirtyState variable, which defaults to true\n> +# once GIT_PS1_SHOWDIRTYSTATE is enabled.\n> #\n> # To submit patches:\n> #\n> -- \n> 1.6.1.2.319.gbd9e\n> \n\n-- \nShawn.\n"},{"id":"103520","messageId":"1233936338-10679-1-git-send-email-ted@tedpavlic.com","threadId":"17616","inReplyTo":"20090206155823.GO26880@spearce.org","subject":"[PATCH 1/2] completion: Fix GIT_PS1_SHOWDIRTYSTATE to prevent unbound variable errors.","fromName":"Ted Pavlic","fromEmail":"ted@tedpavlic.com","sentAt":"2009-02-06T16:05:37Z","receivedAt":"2009-02-06T16:05:37Z","isPatch":true,"sender":{"key":"ted@tedpavlic.com","avatar":"https://gravatar.com/avatar/d085392370ff4c028cf17a0e81e0647744c9682fbcb36b499f31d08ef80ef569?d=mp&s=160"},"body":"Signed-off-by: Ted Pavlic \nAcked-by: Shawn O. Pearce \n---\n contrib/completion/git-completion.bash | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 307bf5d..6e04985 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -125,7 +125,7 @@ __git_ps1 ()\n \t\tlocal w\n \t\tlocal i\n \n-\t\tif test -n \"$GIT_PS1_SHOWDIRTYSTATE\"; then\n+\t\tif test -n \"${GIT_PS1_SHOWDIRTYSTATE-}\"; then\n \t\t\tif test \"$(git config --bool bash.showDirtyState)\" != \"false\"; then\n \t\t\t\tgit diff --no-ext-diff --ignore-submodules \\\n \t\t\t\t\t--quiet --exit-code || w=\"*\"\n-- \n1.6.1.2.390.gba743\n"},{"id":"103521","messageId":"1233936338-10679-2-git-send-email-ted@tedpavlic.com","threadId":"17616","inReplyTo":"1233936338-10679-1-git-send-email-ted@tedpavlic.com","subject":"[PATCH 2/2] completion: Get rid of tabbed indentation in comments. Replace with spaces.","fromName":"Ted Pavlic","fromEmail":"ted@tedpavlic.com","sentAt":"2009-02-06T16:05:38Z","receivedAt":"2009-02-06T16:05:38Z","isPatch":true,"sender":{"key":"ted@tedpavlic.com","avatar":"https://gravatar.com/avatar/d085392370ff4c028cf17a0e81e0647744c9682fbcb36b499f31d08ef80ef569?d=mp&s=160"},"body":"Signed-off-by: Ted Pavlic \nAcked-by: Shawn O. Pearce \n---\n contrib/completion/git-completion.bash | 10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 6e04985..f44f63c 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -34,11 +34,11 @@\n # are currently in a git repository. The %s token will be\n # the name of the current branch.\n #\n-#\tIn addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty\n-#\tvalue, unstaged (*) and staged (+) changes will be shown next\n-#\tto the branch name. You can configure this per-repository\n-#\twith the bash.showDirtyState variable, which defaults to true\n-#\tonce GIT_PS1_SHOWDIRTYSTATE is enabled.\n+# In addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty\n+# value, unstaged (*) and staged (+) changes will be shown next\n+# to the branch name. You can configure this per-repository\n+# with the bash.showDirtyState variable, which defaults to true\n+# once GIT_PS1_SHOWDIRTYSTATE is enabled.\n #\n # To submit patches:\n #\n-- \n1.6.1.2.390.gba743\n"},{"id":"103523","messageId":"20090206161303.GP26880@spearce.org","threadId":"17616","inReplyTo":"1233936338-10679-2-git-send-email-ted@tedpavlic.com","subject":"Re: [PATCH 2/2] completion: Get rid of tabbed indentation in comments. Replace with spaces.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-02-06T16:13:03Z","receivedAt":"2009-02-06T16:13:03Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Ted Pavlic wrote:\n> Signed-off-by: Ted Pavlic \n> Acked-by: Shawn O. Pearce \n\nHeh.\n\nI expected Junio to use my TAB line as-is. I find them amusing.\nPlus, I didn't actually apply your patches and test them. They\njust looked right to me. Usually Acked-by is applied only if you\nactually ran the code and verified it does what the message claims.\nTrivially-acked-by is a bit less strict.\n\nWhatever. These are really trivial patches. Whatever Junio\napplies here is fine.\n\nThanks for fixing that ${X-} thing. I clearly missed it on the\nreview of the ps1 stuff.\n\n-- \nShawn.\n"},{"id":"103527","messageId":"498C6308.1000700@tedpavlic.com","threadId":"17616","inReplyTo":"20090206161303.GP26880@spearce.org","subject":"Re: [PATCH 2/2] completion: Get rid of tabbed indentation in comments. Replace with spaces.","fromName":"Ted Pavlic","fromEmail":"ted@tedpavlic.com","sentAt":"2009-02-06T16:19:20Z","receivedAt":"2009-02-06T16:19:20Z","isPatch":true,"sender":{"key":"ted@tedpavlic.com","avatar":"https://gravatar.com/avatar/d085392370ff4c028cf17a0e81e0647744c9682fbcb36b499f31d08ef80ef569?d=mp&s=160"},"body":"> I expected Junio to use my TAB line as-is. I find them amusing.\n\nOops. :( In the future, I'll leave such things as is. I just figured the \n\"Trivially\" was a side comment, but the function was still the same.\n\n> Thanks for fixing that ${X-} thing. I clearly missed it on the\n> review of the ps1 stuff.\n\nI would have missed it myself... but then after I did a git pull, I was \ngetting a bash error on every single prompt. That was annoying. :)\n\nThanks --\nTed\n\n\n-- \nTed Pavlic \n\n Please visit my ALS association page:\n http://web.alsa.org/goto/tedpavlic\n My family appreciates your support in the fight to defeat ALS.\n"},{"id":"103570","messageId":"200902070032.40511.trast@student.ethz.ch","threadId":"17616","inReplyTo":"20090206161303.GP26880@spearce.org","subject":"Re: [PATCH 2/2] completion: Get rid of tabbed indentation in comments. Replace with spaces.","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2009-02-06T23:32:33Z","receivedAt":"2009-02-06T23:32:33Z","isPatch":true,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Shawn O. Pearce wrote:\n> \n> Thanks for fixing that ${X-} thing. I clearly missed it on the\n> review of the ps1 stuff.\n\nSorry for not thinking of that, I actually remember the thread around\nthe original ${X-} cleanup...\n\nFor extra sillyness you could also add my Ack ;-)\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"}]}