Fix chmod argument bug

hlovdal · hlovdal · commit ebf7f9fe5267 · 2022-05-29T19:01:11.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fixed incorrect argument handling for the code that tries to preserve file
+  permission.
+
 ### Security
 
 ## [0.1.0] - 2022-05-12
diff --git a/git-resolve-conflict-using-kdiff3.pl b/git-resolve-conflict-using-kdiff3.pl
@@ -187,8 +187,7 @@ sub get_filemode {
 	my $file = shift;
 	# Reference "oct" in in perlfunc
 	my $dec_perms = (stat($file))[2] & 07777;
-	my $oct_perm_str = sprintf "%o", $dec_perms;
-	return $oct_perm_str;
+	return $dec_perms;
 }
 
 ################################################################################

Original file line number	Diff line number	Diff line change
`@@ -187,8 +187,7 @@ sub get_filemode {`
`187`	`187`	`my $file = shift;`
`188`	`188`	`# Reference "oct" in in perlfunc`
`189`	`189`	`my $dec_perms = (stat($file))[2] & 07777;`
`190`		`- my $oct_perm_str = sprintf "%o", $dec_perms;`
`191`		`- return $oct_perm_str;`
	`190`	`+ return $dec_perms;`
`192`	`191`	`}`
`193`	`192`
`194`	`193`	`################################################################################`