{"thread":{"id":"36648","subject":"[PATCH] contrib: completion: fix 'eread()' namespace","startedAt":"2014-05-13T13:21:19Z","lastAt":"2014-05-13T20:41:15Z","messageCount":2,"participants":["Felipe Contreras","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"241366","messageId":"1399987279-12487-1-git-send-email-felipe.contreras@gmail.com","threadId":"36648","inReplyTo":null,"subject":"[PATCH] contrib: completion: fix 'eread()' namespace","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2014-05-13T13:21:19Z","receivedAt":"2014-05-13T13:21:19Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Otherwise it might collide with a function of the same name in the\nuser's environment.\n\nSuggested-by: SZEDER Gábor <szeder@ira.uka.de>\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n contrib/completion/git-prompt.sh | 16 ++++++++--------\n 1 file changed, 8 insertions(+), 8 deletions(-)\n\ndiff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh\nindex 96b8087..853425d 100644\n--- a/contrib/completion/git-prompt.sh\n+++ b/contrib/completion/git-prompt.sh\n@@ -270,7 +270,7 @@ __git_ps1_colorize_gitstring ()\n \tr=\"$c_clear$r\"\n }\n \n-eread ()\n+__git_eread ()\n {\n \tf=\"$1\"\n \tshift\n@@ -339,9 +339,9 @@ __git_ps1 ()\n \tlocal step=\"\"\n \tlocal total=\"\"\n \tif [ -d \"$g/rebase-merge\" ]; then\n-\t\teread \"$g/rebase-merge/head-name\" b\n-\t\teread \"$g/rebase-merge/msgnum\" step\n-\t\teread \"$g/rebase-merge/end\" total\n+\t\t__git_eread \"$g/rebase-merge/head-name\" b\n+\t\t__git_eread \"$g/rebase-merge/msgnum\" step\n+\t\t__git_eread \"$g/rebase-merge/end\" total\n \t\tif [ -f \"$g/rebase-merge/interactive\" ]; then\n \t\t\tr=\"|REBASE-i\"\n \t\telse\n@@ -349,10 +349,10 @@ __git_ps1 ()\n \t\tfi\n \telse\n \t\tif [ -d \"$g/rebase-apply\" ]; then\n-\t\t\teread \"$g/rebase-apply/next\" step\n-\t\t\teread \"$g/rebase-apply/last\" total\n+\t\t\t__git_eread \"$g/rebase-apply/next\" step\n+\t\t\t__git_eread \"$g/rebase-apply/last\" total\n \t\t\tif [ -f \"$g/rebase-apply/rebasing\" ]; then\n-\t\t\t\teread \"$g/rebase-apply/head-name\" b\n+\t\t\t\t__git_eread \"$g/rebase-apply/head-name\" b\n \t\t\t\tr=\"|REBASE\"\n \t\t\telif [ -f \"$g/rebase-apply/applying\" ]; then\n \t\t\t\tr=\"|AM\"\n@@ -376,7 +376,7 @@ __git_ps1 ()\n \t\t\tb=\"$(git symbolic-ref HEAD 2>/dev/null)\"\n \t\telse\n \t\t\tlocal head=\"\"\n-\t\t\tif ! eread \"$g/HEAD\" head; then\n+\t\t\tif ! __git_eread \"$g/HEAD\" head; then\n \t\t\t\tif [ $pcmode = yes ]; then\n \t\t\t\t\tPS1=\"$ps1pc_start$ps1pc_end\"\n \t\t\t\tfi\n-- \n1.9.3+fc1\n"},{"id":"241432","messageId":"xmqqvbt9mmxg.fsf@gitster.dls.corp.google.com","threadId":"36648","inReplyTo":"1399987279-12487-1-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH] contrib: completion: fix 'eread()' namespace","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-05-13T20:41:15Z","receivedAt":"2014-05-13T20:41:15Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"A reasonable regression fix.  Will queue for 2.0 final.\n\nThanks.\n"}]}