From: Pascal MALAISE <malaise@magic.fr>
To: git@vger.kernel.org
Subject: Bug? Unexpected outputs of git pull on stdout v.s. stderr
Date: Fri, 04 Oct 2013 19:18:49 +0200 [thread overview]
Message-ID: <524EF879.1020607@magic.fr> (raw)
Hello,
git --version
-> git version 1.7.9.5
on linux
A 'git pull' operation exits with 1 (which is normal) but generates the
following output and error flows:
stdout:
Auto-merging c/makefile
CONFLICT (content): Merge conflict in c/makefile
Auto-merging c/x_color.c
Auto-merging c/x_export.c
CONFLICT (content): Merge conflict in c/x_export.c
...
CONFLICT (content): Merge conflict in c/x_line.h
Automatic merge failed; fix conflicts and then commit the result.
stderr:
From /home/malaise/ada
* branch Xft -> FETCH_HEAD
With option -q the Error flow is empty and the Output is as before.
I would expect that the text:
> From /home/malaise/ada
> * branch Xft -> FETCH_HEAD
is part of stdout and suppressed with option -q
And that the message:
> Automatic merge failed; fix conflicts and then commit the result.
is part of stderr (and kept with option -q).
Or did I miss something?
Thank you.
--
Couldn't eradicate windows from my PC but I caged it in a vmware.
Pascal MALAISE
reply other threads:[~2013-10-04 17:19 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=524EF879.1020607@magic.fr \
--to=malaise@magic.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.