Commit Diff


commit - 352ef0fe3ed57dbb48436b419875fd82ae5f3d4e601e8d9048e531e0142c8992
commit + 04c4030186579b605a9bc649ed67f42bde5445911a7b33bf62b20c3cc44e7ee1
blob - 04de1a83d724bfefbbcba78f82f035ee30e76ffbd90a0394097d48b8e29fe826
blob + 566130b850f98d43616e90d3ef387e3b7075d157b5aa4840b1821c97c6d70d02
--- lib/worktree.c	
+++ lib/worktree.c	
@@ -6936,6 +6936,9 @@ got_commitable_get_path(struct got_commitable *ct)
 unsigned int
 got_commitable_get_status(struct got_commitable *ct)
 {
+	if (ct->staged_status != GOT_STATUS_NO_CHANGE)
+		return ct->staged_status;
+
 	return ct->status;
 }