Merge pull request #2549 from carapace-sh/git-eval-symlink

git: ActionChanges - evaluate symlinks before generating relative paths
carapace-sh · Oct 13, 2024 · eb3fdba · eb3fdba
2 parents 7b571b1 + f19d12b
commit eb3fdba
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/actions/tools/git/change.go b/pkg/actions/tools/git/change.go
@@ -46,7 +46,12 @@ func ActionChanges(opts ChangeOpts) carapace.Action {
 							if splitted := strings.SplitN(path, " -> ", 2); len(splitted) > 1 { // renamed
 								path = splitted[1]
 							}
-							if relativePath, err := filepath.Rel(c.Dir, root+"/"+path); err != nil {
+
+							evaluatedDir, err := filepath.EvalSymlinks(c.Dir)
+							if err != nil {
+								return carapace.ActionMessage(err.Error())
+							}
+							if relativePath, err := filepath.Rel(evaluatedDir, root+"/"+path); err != nil {
 								return carapace.ActionMessage(err.Error())
 							} else {
 								if status := line[:2]; strings.Contains(status, "D") { // deleted