Thread (43 messages) flat view 43 messages, 4 authors, 3d ago

Re: [PATCH v2 1/3] commit: reword the empty-commit rebase errors

From: Junio C Hamano <hidden>
Date: 2026-08-27 16:55:00

Phillip Wood [off-list ref] writes:
quoted
@@ -521,7 +521,7 @@ static const char *prepare_index(const char **argv, const char *prefix,
  		else if (is_from_cherry_pick(whence))
  			die(_("cannot do a partial commit during a cherry-pick."));
  		else if (is_from_rebase(whence))
-			die(_("cannot do a partial commit during a rebase."));
+			die(_("cannot do a partial commit while resolving a commit that became empty."));
"while committing a commit that became empty" would be clearer to me, 
but I what you have is definitely an improvement on the existing message.
A stupid question, but wouldn't a partial commit of an empty commit
still an empty commit?  IOW, why do we need to reject a partial
commit while committing a commit that became empty?

Thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help