Congress halted a government shutdown with a second stop-gap funding bill, setting up a spending fight between House and Senate early in the new year.