Ease your vendor branch management worries with Piston, a tool to copy vendor / upstream code to your own repository, while preserving your local patches.
more
Use the status subcommand to know whether or not the upstream repository has changed.