On Thu, Dec 1, 2016 at 10:50 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Stefan Beller <sbeller@xxxxxxxxxx> writes: > >> On Thu, Dec 1, 2016 at 9:59 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> >>> +test_expect_success '--rebase fast forward' ' >>> + git reset --hard before-rebase && >>> + git checkout -b ff && >>> + echo another modification >file && >>> + git commit -m third file && >>> + >>> + git checkout to-rebase && >>> + git pull --rebase . ff && >>> + test "$(git rev-parse HEAD)" = "$(git rev-parse ff)" && >>> + >>> + # The above only validates the result. Did we actually bypass rebase? >> >> Good catch for the test, but I think we can make the sed regexp simpler, as we >> can leave out the second "[0-9a-f]"? (git reflog |sed >> "s/^[0-9a-f]*/OBJID/" works here) > > This mimics the existing tests around there for consistency. > Simplifying or cleaning of this test script as a whole is outside > the scope. Ok, in that case the patch looks fine.