From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 14 Mar 2007 05:59:23 GMT
Subject: Re: [GIT PULL] Please pull mergetool.git
Message-ID: <20070314055923.GA20978@spearce.org>
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.