Oh well, I rebased master on the branch. That fix is already in 1.6 ;-)

I was under the impression that Git recognizes the commit and does not include it in the merge, but apparently I was wrong.


Von meinem iPhone gesendet

Am 18.03.2013 um 09:00 schrieb Christian Johansen <notifications@github.com>:

> In lib/sinon/assert.js:
> 
> > @@ -104,7 +104,14 @@
> >              if (!sinon.calledInOrder(arguments)) {
> >                  try {
> >                      expected = [].join.call(arguments, ", ");
> > -                    actual = sinon.orderByFirstCall(slice.call(arguments)).join(", ");
> > +                    var calls = slice.call(arguments);
> > +                    var i = calls.length;
> > +                    while (i) {
> > +                        if (!calls[--i].called) {
> > +                            calls.splice(i, 1);
> > +                        }
> > +                    }
> > +                    actual = sinon.orderByFirstCall(calls).join(", ");
> Does this fix a bug or something?
> 
> —
> Reply to this email directly or view it on GitHub.