From: "Shawn O. Pearce" <spearce@spearce.org>
To: Theodore Ts'o <tytso@mit.edu>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: [GIT PULL] Please pull mergetool.git
Date: Wed, 14 Mar 2007 01:59:23 -0400 [thread overview]
Message-ID: <20070314055923.GA20978@spearce.org> (raw)
In-Reply-To: <E1HRI5K-0008T9-9e@candygram.thunk.org>
Theodore Ts'o <tytso@mit.edu> wrote:
> + base_mode=`git ls-files -u -- "$path" | awk '{if ($3==1) print $1;}'`
> + local_mode=`git ls-files -u -- "$path" | awk '{if ($3==2) print $1;}'`
> + remote_mode=`git ls-files -u -- "$path" | awk '{if ($3==3) print $1;}'`
> +
> + base_present && git cat-file blob ":1:$path" > "$BASE" 2>/dev/null
> + local_present && git cat-file blob ":2:$path" > "$LOCAL" 2>/dev/null
> + remote_present && git cat-file blob ":3:$path" > "$REMOTE" 2>/dev/null
Why not use `git checkout-index --stage=all "$path"` ?
E.g.:
git checkout-index --stage=all "$path" |
read base_temp local_temp remote_temp path
I'm not trying to nitpick, I'm just curious about why this particular
feature of checkout-index was not useful here.
--
Shawn.
next prev parent reply other threads:[~2007-03-14 5:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-14 1:15 [GIT PULL] Please pull mergetool.git Theodore Ts'o
2007-03-14 5:59 ` Shawn O. Pearce [this message]
2007-03-14 6:17 ` Theodore Tso
2007-03-14 7:03 ` Junio C Hamano
2007-03-14 9:45 ` Junio C Hamano
2007-03-14 9:55 ` Alex Riesen
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=20070314055923.GA20978@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).