adapt to new git