Skip to contentSkip to conversation

git-rebase.sh: fix typos in error messages

PATCH In review Ralf Thielow 2 participants 3 messages Sep 28, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 git-rebase.sh: fix typos in error messages

---
 git-rebase.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
git-rebase.sh +3 -3
index 7973447645..45b6ee9c0e 100755
@@ -553,15 +553,15 @@ then
 	# Note: incompatibility with --interactive is just a strong warning;
 	#       git-rebase.txt caveats with "unless you know what you are doing"
 	test -n "$rebase_merges" &&
-		die "$(gettext "error: cannot combine '--preserve_merges' with '--rebase-merges'")"
+		die "$(gettext "error: cannot combine '--preserve-merges' with '--rebase-merges'")"
 fi
 
 if test -n "$rebase_merges"
 then
 	test -n "$strategy_opts" &&
-		die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy-option'")"
+		die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy-option'")"
 	test -n "$strategy" &&
-		die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy'")"
+		die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy'")"
 fi
 
 if test -z "$rebase_root"
Signature · 1 line
2.19.0.599.g22e244bd67
#1 lore raw
Quoted 4 lines · Ralf Thielow
---
 git-rebase.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

This patch itself will soon stop mattering once the group of rebase-in-c topics graduate, which hopefully will happen during this cycle. However, because the same mistakes are inherited to builtin/rebase.c by these topics, we'd need a matching fix to correct 07664161 ("builtin rebase: error out on incompatible option/mode combinations", 2018-08-08) and either squash the fix into that commit, or queue it on top of pk/rebase-in-c-5-test topic.

Will queue; thanks.

Quoted 24 lines
git-rebase.sh +3 -3
index 7973447645..45b6ee9c0e 100755
@@ -553,15 +553,15 @@ then
 	# Note: incompatibility with --interactive is just a strong warning;
 	#       git-rebase.txt caveats with "unless you know what you are doing"
 	test -n "$rebase_merges" &&
-		die "$(gettext "error: cannot combine '--preserve_merges' with '--rebase-merges'")"
+		die "$(gettext "error: cannot combine '--preserve-merges' with '--rebase-merges'")"
 fi
 
 if test -n "$rebase_merges"
 then
 	test -n "$strategy_opts" &&
-		die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy-option'")"
+		die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy-option'")"
 	test -n "$strategy" &&
-		die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy'")"
+		die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy'")"
 fi
 
 if test -z "$rebase_root"
#2 lore raw
Quoted 7 lines · Junio C Hamano

... However, because the same mistakes are inherited to builtin/rebase.c by these topics, we'd need a matching fix to correct 07664161 ("builtin rebase: error out on incompatible option/mode combinations", 2018-08-08) and either squash the fix into that commit, or queue it on top of pk/rebase-in-c-5-test topic.

Will queue; thanks.

Here is what I'd queue, too.

-- >8 --
Subject: [PATCH] rebase: fix typos in error messages

The separator between words in a multi-word option name is a dash, not an underscore.

Inspired by a matching change by Ralf Thielow for the scripted version of "git rebase".

---
 builtin/rebase.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
builtin/rebase.c +3 -3
index 1a697d70c9..0f9a40aae5 100644
@@ -1135,15 +1135,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		 *       git-rebase.txt caveats with "unless you know what you are doing"
 		 */
 		if (options.rebase_merges)
-			die(_("error: cannot combine '--preserve_merges' with "
+			die(_("error: cannot combine '--preserve-merges' with "
 			      "'--rebase-merges'"));
 
 	if (options.rebase_merges) {
 		if (strategy_options.nr)
-			die(_("error: cannot combine '--rebase_merges' with "
+			die(_("error: cannot combine '--rebase-merges' with "
 			      "'--strategy-option'"));
 		if (options.strategy)
-			die(_("error: cannot combine '--rebase_merges' with "
+			die(_("error: cannot combine '--rebase-merges' with "
 			      "'--strategy'"));
 	}
 
Signature · 1 line
2.19.0-271-gfe8321ec05