git_ui: Combine disjoint conditions into one (#25722)

This PR combines two disjoint conditions for the same value into one.

This makes it so the type checker can accurately reason about the
branches.

Release Notes:

- N/A