Merge branch 'mg/rebase-i-onto-reflog-in-full'

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index f3348208d89a4fbeb3ae9f79376d7d21a8f9015c..782e7d0c38aa939a7db03266c3e6ff4993e4d2bd 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2373,7 +2373,7 @@ static void get_object_list(int ac, const char **av)
                        }
                        die("not a rev '%s'", line);
                }
-               if (handle_revision_arg(line, &revs, flags, 1))
+               if (handle_revision_arg(line, &revs, flags, REVARG_CANNOT_BE_FILENAME))
                        die("bad revision '%s'", line);
        }