Commit 6e1eade5c833f34c20301fd61b720268525270f8

Stefan Sperling 2020-07-23T14:22:35

fix 'got revert' progress output for symlinks

diff --git a/lib/worktree.c b/lib/worktree.c
index 40f832a..b98e8e7 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -1365,7 +1365,9 @@ install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
 				goto done;
 			if (progress_cb) {
 				err = (*progress_cb)(progress_arg,
-				    GOT_STATUS_UPDATE, path);
+				    reverting_versioned_file ?
+				    GOT_STATUS_REVERT : GOT_STATUS_UPDATE,
+				    path);
 			}
 			goto done; /* Nothing else to do. */
 		}
@@ -1408,7 +1410,8 @@ install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
 			    target_path, ondisk_path);
 		}
 	} else if (progress_cb)
-		err = (*progress_cb)(progress_arg, GOT_STATUS_ADD, path);
+		err = (*progress_cb)(progress_arg, reverting_versioned_file ?
+		    GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
 done:
 	free(resolved_path);
 	free(abspath);