Miklos Vajna wrote:
> On Thu, Sep 25, 2008 at 09:05:02AM +0200, Thomas Rast <trast@xxxxxxxxxxxxxxx> wrote:
> > On the other hand, as near as I can tell this is a regression in
> > builtin-merge. Miklos, do you know if/how this can be fixed?
>
> I think Junio already fixed this in 446247d (merge: fix numerus bugs
> around "trivial merge" area, 2008-08-23), so 1.6.0.1 or 1.6.0.2 should
> not have this bug.
>
> Michael, could you please upgrade frm 1.6.0 and confirm your problem
> goes away?
That won't help. I decided this was a good opportunity to learn about
'git bisect run', and bisected it to 1c7b76b (Build in merge,
2008-07-07). This was with bad = 47a765d (pulled from Shawn's repo
this week) and good = v1.5.6.
In case you want to check my logic, the commands are below.
- Thomas
* Setup:
mkdir $temp_repo
cd $temp_repo
git init
echo foo > foo
git add foo
git commit -m initial
echo a > foo
git commit -m a foo
git checkout -b side HEAD^
echo b > foo
git commit -m b foo
git checkout master
* Bisection script:
-- 8< --
#!/bin/sh
rm -rf $temp_repo/{bin,libexec}
make -j3 prefix=$temp_repo install
PATH=$temp_repo/bin:$PATH
cd $temp_repo
touch foo
git merge side
test -f .git/MERGE_HEAD
s=$?
git reset --hard
if test $s != 0; then
echo did not work
exit 1
else
echo worked
exit 0
fi
-- >8 --
Attachment:
signature.asc
Description: This is a digitally signed message part.
