Git Clean and Smudge Filters - 試圖修正 Git 總是視 tree 為不乾淨的問題(3)

Signed-off-by: 林博仁 <[email protected]>

Git Clean and Smudge Filters/smudge-bash.bash

@@ -63,12 +63,6 @@ init(){
 		exit 1
 	fi
 
-	# Make Git don't consider tree is dirty even when it shouldn't because of the existing clean filter
-	# Why does 'git status' ignore the .gitattributes clean filter? - Stack Overflow
-	# http://stackoverflow.com/questions/19807979/why-does-git-status-ignore-the-gitattributes-clean-filter
-	rm --force .git/index.lock # Workaround: force override git lock
-	git add -u
-
 	declare version
 	version="$(describe_this_version)"
 

Git Clean and Smudge Filters/smudge-bash.manual-apply.bash

@@ -107,6 +107,11 @@ smudge_file(){
 	declare -r temp_file_name=stdout.bash
 	declare -r temp_file="${global_temp_directory}/${temp_file_name}"
 
+	# Workaround: Make Git don't consider tree is dirty even when it shouldn't because of the existing clean filter
+	# Why does 'git status' ignore the .gitattributes clean filter? - Stack Overflow
+	# http://stackoverflow.com/questions/19807979/why-does-git-status-ignore-the-gitattributes-clean-filter
+	git add -u
+
 	printf "Smudging %s...\n" "${target_file}"
 	"${RUNTIME_SCRIPT_DIRECTORY}"/smudge-bash.bash <"${target_file}" >"${temp_file}"
 	cat "${temp_file}" >"${target_file}"

build.bash

@@ -78,13 +78,8 @@ init(){
 
 	# Workaround: git tag always dirty even when it's isn't, manually fixing it
 	# Make Git don't consider tree is dirty even when it shouldn't because of the existing clean filter
-	for template_file in "${SDC_SOURCE_CODE_DIR}/"*.bash; do
-		# Why does 'git status' ignore the .gitattributes clean filter? - Stack Overflow
-		# http://stackoverflow.com/questions/19807979/why-does-git-status-ignore-the-gitattributes-clean-filter
-		git add -u
-
-		"${SDC_GIT_FILTERS_DIR}/smudge-bash.manual-apply.bash" "${template_file}"
-	done
+	find "${SDC_SOURCE_CODE_DIR}" -name "*.bash" -print0 | xargs --null --max-args=1 --verbose "${SDC_GIT_FILTERS_DIR}/clean-bash.manual-apply.bash"
+	"${SDC_GIT_FILTERS_DIR}/smudge-bash.manual-apply.bash" "${SDC_SOURCE_CODE_DIR}/"*.bash
 
 	if [ ! -d "${SDC_RELEASE_DIR}" ]; then
 		mkdir --parents "${SDC_RELEASE_DIR}"