| commit | 2847cae835fa70f00e6e2286fbfa5595cb2247d0 | |
| author | Ramkumar Ramachandra <artagnon@gmail.com> | |
| Fri, 14 Jun 2013 08:28:05 +0000 (14 13:58 +0530) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Jun 2013 15:27:09 +0000 (14 08:27 -0700) | ||
| tree | d301f3372867482671867696d0cd6c171569ae32 | treesnapshot (tar.gz zip) |
| parent | 45acb7592825b1faa59ea09247bb88b8e91849e3 | commitdiff |
prompt: squelch error output from cat
The files $g/rebase-{merge,apply}/{head-name,msgnum,end} are not
guaranteed to exist. When attempting to cat them, squelch the error
output.
In addition to guarding against stray directories, this patch addresses
a real problem:
# on terminal 1
$ git rebase -i master
# ignore editor, and switch to terminal 2
cat: .git/rebase-merge/msgnum: No such file or directory
cat: .git/rebase-merge/end: No such file or directory
$
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The files $g/rebase-{merge,apply}/{head-name,msgnum,end} are not
guaranteed to exist. When attempting to cat them, squelch the error
output.
In addition to guarding against stray directories, this patch addresses
a real problem:
# on terminal 1
$ git rebase -i master
# ignore editor, and switch to terminal 2
cat: .git/rebase-merge/msgnum: No such file or directory
cat: .git/rebase-merge/end: No such file or directory
$
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/completion/git-prompt.sh | diffblobblamehistory |