git-svn: pass an unambiguous ref to rev-list when grafting-branches

diff --git a/revision.c b/revision.c
index af9f87418c6ed342e0a3d751b8f8e59fe5e8aeed..6e4ec463024a3e6cc4199ea1937f3b11e0a0dace 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1039,6 +1039,14 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                                all_match = 1;
                                continue;
                        }
+                       if (!strncmp(arg, "--encoding=", 11)) {
+                               arg += 11;
+                               if (strcmp(arg, "none"))
+                                       git_log_output_encoding = strdup(arg);
+                               else
+                                       git_log_output_encoding = "";
+                               continue;
+                       }
 
                        opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
                        if (opts > 0) {