Merge branch 'fg/submodule-fixup'

Code cleanup. * fg/submodule-fixup: git-submodule.sh: remove duplicate call to set_rev_name
git-mirror · Jun 24, 2013 · 515cded · 515cded
2 parents 9f19e0c + b545cd1
commit 515cded
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/git-submodule.sh b/git-submodule.sh
@@ -1129,16 +1129,16 @@ cmd_status()
 			say "-$sha1 $displaypath"
 			continue;
 		fi
-		set_name_rev "$sm_path" "$sha1"
 		if git diff-files --ignore-submodules=dirty --quiet -- "$sm_path"
 		then
+			set_name_rev "$sm_path" "$sha1"
 			say " $sha1 $displaypath$revname"
 		else
 			if test -z "$cached"
 			then
 				sha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD)
-				set_name_rev "$sm_path" "$sha1"
 			fi
+			set_name_rev "$sm_path" "$sha1"
 			say "+$sha1 $displaypath$revname"
 		fi