Commit a956ce4d authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Skip submodule updates if up-to-date with upstream

parent 5e9475b7

.shell/lib/shell-funcs.sh

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ update_worktree() 
		return 0

	fi

	local original=`git rev-parse HEAD`

	test $original = `git rev-parse $upstream` && return

	if git merge --ff --no-edit $upstream origin/master; then

		git submodule sync --recursive

		git submodule update ${GIT_JOBS} \