{"thread":{"id":"35067","subject":"Bug? Unexpected outputs of git pull on stdout v.s. stderr","startedAt":"2013-10-04T17:18:49Z","lastAt":"2013-10-04T17:18:49Z","messageCount":1,"participants":["Pascal MALAISE"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"228563","messageId":"524EF879.1020607@magic.fr","threadId":"35067","inReplyTo":null,"subject":"Bug? Unexpected outputs of git pull on stdout v.s. stderr","fromName":"Pascal MALAISE","fromEmail":"malaise@magic.fr","sentAt":"2013-10-04T17:18:49Z","receivedAt":"2013-10-04T17:18:49Z","isPatch":false,"sender":{"key":"malaise@magic.fr","avatar":null},"body":"Hello,\n\ngit --version\n-> git version 1.7.9.5\non linux\n\nA 'git pull' operation exits with 1 (which is normal) but generates the\nfollowing output and error flows:\n\nstdout:\nAuto-merging c/makefile\nCONFLICT (content): Merge conflict in c/makefile\nAuto-merging c/x_color.c\nAuto-merging c/x_export.c\nCONFLICT (content): Merge conflict in c/x_export.c\n...\nCONFLICT (content): Merge conflict in c/x_line.h\nAutomatic merge failed; fix conflicts and then commit the result.\n\nstderr:\nFrom /home/malaise/ada\n* branch            Xft        -> FETCH_HEAD\n\nWith option -q the Error flow is empty and the Output is as before.\n\n\nI would expect that the text:\n> From /home/malaise/ada\n> * branch            Xft        -> FETCH_HEAD\nis part of stdout and suppressed with option -q\n\nAnd that the message:\n> Automatic merge failed; fix conflicts and then commit the result.\nis part of stderr (and kept with option -q).\n\n\nOr did I miss something?\nThank you.\n\n-- \nCouldn't eradicate windows from my PC but I caged it in a vmware.\nPascal MALAISE\n"}]}