On Mon, Aug 3, 2009 at 12:54, Ulrich
Windl<ulrich.windl@xxxxxxxxxxxxxxxxxxxx> wrote:
> Here is the end of "make test":
> [...]
> *** t0100-previous.sh ***
> * ok 1: branch -d @{-1}
> * ok 2: branch -d @{-12} when there is not enough switches yet
> * FAIL 3: merge @{-1}
>
> git checkout A &&
> test_commit B &&
> git checkout A &&
> test_commit C &&
> git branch -f master B &&
> git branch -f other &&
> git checkout other &&
> git checkout master &&
> git merge @{-1} &&
> git cat-file commit HEAD | grep "Merge branch 'other'"
>
> * FAIL 4: merge @{-1} when there is not enough switches yet
>
> git reflog expire --expire=now &&
> git checkout -f master &&
> git reset --hard B &&
> git branch -f other C &&
> git checkout other &&
> git checkout master &&
> test_must_fail git merge @{-12}
>
> * failed 2 among 4 test(s)
> make[2]: *** [t0100-previous.sh] Error 1
> [...]
>
> I can try some simple things fixing the problem, but I don't have an Internet
> connection at that machine.
Try:
$ cd t && ./t0100-previous.sh -d -v -i
Look at the output and if you can't make anything out of it,
just post it here.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html