{"thread":{"id":"34135","subject":"[PATCH v2] prompt: squelch error output from cat","startedAt":"2013-06-14T08:28:05Z","lastAt":"2013-06-14T18:19:09Z","messageCount":2,"participants":["Ramkumar Ramachandra","Junio C Hamano"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"220787","messageId":"1371198485-32663-1-git-send-email-artagnon@gmail.com","threadId":"34135","inReplyTo":null,"subject":"[PATCH v2] prompt: squelch error output from cat","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-06-14T08:28:05Z","receivedAt":"2013-06-14T08:28:05Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"The files $g/rebase-{merge,apply}/{head-name,msgnum,end} are not\nguaranteed to exist.  When attempting to cat them, squelch the error\noutput.\n\nIn addition to guarding against stray directories, this patch addresses\na real problem:\n\n  # on terminal 1\n  $ git rebase -i master\n  # ignore editor, and switch to terminal 2\n  cat: .git/rebase-merge/msgnum: No such file or directory\n  cat: .git/rebase-merge/end: No such file or directory\n  $\n\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n Better commit message.\n\n contrib/completion/git-prompt.sh | 12 ++++++------\n 1 file changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh\nindex 86a4f3f..07a6218 100644\n--- a/contrib/completion/git-prompt.sh\n+++ b/contrib/completion/git-prompt.sh\n@@ -347,9 +347,9 @@ __git_ps1 ()\n \t\tlocal step=\"\"\n \t\tlocal total=\"\"\n \t\tif [ -d \"$g/rebase-merge\" ]; then\n-\t\t\tb=\"$(cat \"$g/rebase-merge/head-name\")\"\n-\t\t\tstep=$(cat \"$g/rebase-merge/msgnum\")\n-\t\t\ttotal=$(cat \"$g/rebase-merge/end\")\n+\t\t\tb=\"$(cat \"$g/rebase-merge/head-name\" 2>/dev/null)\"\n+\t\t\tstep=$(cat \"$g/rebase-merge/msgnum\" 2>/dev/null)\n+\t\t\ttotal=$(cat \"$g/rebase-merge/end\" 2>/dev/null)\n \t\t\tif [ -f \"$g/rebase-merge/interactive\" ]; then\n \t\t\t\tr=\"|REBASE-i\"\n \t\t\telse\n@@ -357,10 +357,10 @@ __git_ps1 ()\n \t\t\tfi\n \t\telse\n \t\t\tif [ -d \"$g/rebase-apply\" ]; then\n-\t\t\t\tstep=$(cat \"$g/rebase-apply/next\")\n-\t\t\t\ttotal=$(cat \"$g/rebase-apply/last\")\n+\t\t\t\tstep=$(cat \"$g/rebase-apply/next\" 2>/dev/null)\n+\t\t\t\ttotal=$(cat \"$g/rebase-apply/last\" 2>/dev/null)\n \t\t\t\tif [ -f \"$g/rebase-apply/rebasing\" ]; then\n-\t\t\t\t\tb=\"$(cat \"$g/rebase-apply/head-name\")\"\n+\t\t\t\t\tb=\"$(cat \"$g/rebase-apply/head-name\" 2>/dev/null)\"\n \t\t\t\t\tr=\"|REBASE\"\n \t\t\t\telif [ -f \"$g/rebase-apply/applying\" ]; then\n \t\t\t\t\tr=\"|AM\"\n-- \n1.8.3.1.383.gbc1f167.dirty\n"},{"id":"220900","messageId":"7vobb8o8rm.fsf@alter.siamese.dyndns.org","threadId":"34135","inReplyTo":"1371198485-32663-1-git-send-email-artagnon@gmail.com","subject":"Re: [PATCH v2] prompt: squelch error output from cat","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-14T18:19:09Z","receivedAt":"2013-06-14T18:19:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Will queue.  Thanks.\n"}]}