Skip to contentSkip to conversation

builtin/rebase.c: remove superfluous space in messages

PATCH In review Ralf Thielow 2 participants 2 messages Nov 30, 2018

lore
Share & tools
lore

Ralf Thielow

author
#0 lore raw

PATCH 1/1 builtin/rebase.c: remove superfluous space in messages

Signed-off-by Ralf Thielow <[email protected]>
---
 builtin/rebase.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
builtin/rebase.c +2 -2
index 5b3e5baec8..a6acba76b4 100644
@@ -871,7 +871,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			       "them"), REBASE_PRESERVE_MERGES),
 		OPT_BOOL(0, "rerere-autoupdate",
 			 &options.allow_rerere_autoupdate,
-			 N_("allow rerere to update index  with resolved "
+			 N_("allow rerere to update index with resolved "
 			    "conflict")),
 		OPT_BOOL('k', "keep-empty", &options.keep_empty,
 			 N_("preserve empty commits during rebase")),

@@ -1520,7 +1520,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	 */
 	strbuf_reset(&msg);
 	if (!oidcmp(&merge_base, &options.orig_head)) {
-		printf(_("Fast-forwarded %s to %s. \n"),
+		printf(_("Fast-forwarded %s to %s.\n"),
 			branch_name, options.onto_name);
 		strbuf_addf(&msg, "rebase finished: %s onto %s",
 			options.head_name ? options.head_name : "detached HEAD",
Signature · 1 line
2.20.0.rc1.379.g1dd7ef354c
#1 lore raw

Hi Ralf,

Quoted 1 line · Ralf Thielow
Signed-off-by Ralf Thielow <[email protected]>

ACK.

The commit message could state that the scripted rebase does not have those whitespace issues, and that this aligns the built-in rebase with it, but I won't insist.

Ciao,
Johannes

Quoted 30 lines
---
 builtin/rebase.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
builtin/rebase.c +2 -2
index 5b3e5baec8..a6acba76b4 100644
@@ -871,7 +871,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			       "them"), REBASE_PRESERVE_MERGES),
 		OPT_BOOL(0, "rerere-autoupdate",
 			 &options.allow_rerere_autoupdate,
-			 N_("allow rerere to update index  with resolved "
+			 N_("allow rerere to update index with resolved "
 			    "conflict")),
 		OPT_BOOL('k', "keep-empty", &options.keep_empty,
 			 N_("preserve empty commits during rebase")),

@@ -1520,7 +1520,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	 */
 	strbuf_reset(&msg);
 	if (!oidcmp(&merge_base, &options.orig_head)) {
-		printf(_("Fast-forwarded %s to %s. \n"),
+		printf(_("Fast-forwarded %s to %s.\n"),
 			branch_name, options.onto_name);
 		strbuf_addf(&msg, "rebase finished: %s onto %s",
 			options.head_name ? options.head_name : "detached HEAD",
Signature · 1 line
2.20.0.rc1.379.g1dd7ef354c