Merge branch 'sp/maint-push-sideband' into maint-1.6.6

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index ac1136a3f5a6d61e8b5ae18ae32451674effb0d8..91b604289dd59101cb6477fa49dd9c342e5b39e5 100644 (file)
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -306,7 +306,6 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
        struct rev_info revs;
        struct rev_list_info info;
        int i;
-       int read_from_stdin = 0;
        int bisect_list = 0;
        int bisect_show_vars = 0;
        int bisect_find_all = 0;
@@ -351,12 +350,6 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
                        bisect_show_vars = 1;
                        continue;
                }
-               if (!strcmp(arg, "--stdin")) {
-                       if (read_from_stdin++)
-                               die("--stdin given twice?");
-                       read_revisions_from_stdin(&revs);
-                       continue;
-               }
                usage(rev_list_usage);
 
        }