All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Charles Bailey <charles@hashpling.org>
Cc: "David Aguilar" <davvid@gmail.com>,
	"Thomas Rast" <trast@student.ethz.ch>,
	"Junio C Hamano" <gitster@pobox.com>,
	git@vger.kernel.org, "Magnus Bäck" <magnus.back@sonyericsson.com>,
	"Avery Pennarun" <apenwarr@gmail.com>,
	"Theodore Ts'o" <tytso@mit.edu>
Subject: Re: [PATCH] mergetool: Skip autoresolved paths
Date: Fri, 20 Aug 2010 05:09:57 -0500	[thread overview]
Message-ID: <20100820100957.GB32127@burratino> (raw)
In-Reply-To: <4C6E519E.1080700@hashpling.org>

Charles Bailey wrote:

> We're in the middle of a shell pipe which has replaced stdin and
> merge_file needs access to the human on it's stdin; hence the
> </dev/tty. Strictly.
[...]
> Is there some way of juggling file descriptors in shell?

You can duplicate important fds, like so:

 exec 3<&0

 foo |
 (
	bar
	baz
	quuz <&3
 )

> I had a
> quick play with this but suspect it's a bashism

It's standard, luckily.  See http://unix.org/2008edition/

Hope that helps.

  reply	other threads:[~2010-08-20 10:11 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-12 21:28 Status of conflicted files resolved with rerere Magnus Bäck
2010-08-12 21:36 ` Avery Pennarun
2010-08-13 17:19   ` Jay Soffian
2010-08-15  2:24   ` David Aguilar
2010-08-15  6:59     ` Junio C Hamano
2010-08-15 16:00       ` Magnus Bäck
2010-08-17  9:22       ` [PATCH] mergetool: Skip autoresolved paths David Aguilar
2010-08-19 10:02         ` Thomas Rast
2010-08-20  3:52           ` David Aguilar
2010-08-20  9:57             ` Charles Bailey
2010-08-20 10:09               ` Jonathan Nieder [this message]
2010-08-20 11:17             ` [PATCH] mergetool: Remove explicit references to /dev/tty Charles Bailey
2010-08-20 12:27               ` Jonathan Nieder
2010-08-20 13:50                 ` Charles Bailey
2010-08-20 14:19                   ` Jonathan Nieder
2010-08-20 15:25                 ` [PATCH v2] " Charles Bailey

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=20100820100957.GB32127@burratino \
    --to=jrnieder@gmail.com \
    --cc=apenwarr@gmail.com \
    --cc=charles@hashpling.org \
    --cc=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=magnus.back@sonyericsson.com \
    --cc=trast@student.ethz.ch \
    --cc=tytso@mit.edu \
    /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.