svn commit: r1424052 - /subversion/trunk/subversion/svn/svn.c

[st...@apache.org]

Author: stsp
Date: Wed Dec 19 19:30:41 2012
New Revision: 1424052

URL: http://svn.apache.org/viewvc?rev=1424052&view=rev
Log:
* subversion/svn/svn.c
  (sub_main): We don't need to set opt_state.non_interactive based on whether
   stdin is a tty if the user already passed the --non-interactive option.

Suggested by: rhuijben

Modified:
    subversion/trunk/subversion/svn/svn.c

Modified: subversion/trunk/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1424052&r1=1424051&r2=1424052&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Wed Dec 19 19:30:41 2012
@@ -2210,9 +2210,9 @@ sub_main(int argc, const char *argv[], a
       return EXIT_ERROR(err);
     }
 
-  /* If stdin is not a terminal and --force-interactive was not passed,
-   * set --non-interactive. */
-  if (!opt_state.force_interactive)
+  /* If neither --non-interactive nor --force-interactive was passed,
+   * and stdin is not a terminal, set --non-interactive. */
+  if (!opt_state.force_interactive && !opt_state.non_interactive)
       opt_state.non_interactive = !svn_cmdline__stdin_isatty();
 
   /* Turn our hash of changelists into an array of unique ones. */