From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Jun 2011 18:40:32 +0000 (-0700)
Subject: Merge branch 'ab/i18n-scripts-basic'
X-Git-Tag: v1.7.6-rc3~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/179aae51bbaa86bd64bbb520f15e6126c92f3f4d?ds=inline;hp=-c

Merge branch 'ab/i18n-scripts-basic'

* ab/i18n-scripts-basic:
sh-i18n--envsubst.c: do not #include getopt.h
---

179aae51bbaa86bd64bbb520f15e6126c92f3f4d
diff --combined sh-i18n--envsubst.c
index 2eb0ee44b8,1153f8c47d..9d2e971a27
--- a/sh-i18n--envsubst.c
+++ b/sh-i18n--envsubst.c
@@@ -51,7 -51,6 +51,6 @@@
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
  #include <errno.h>
- #include <getopt.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
@@@ -68,7 -67,7 +67,7 @@@ in
  main (int argc, char *argv[])
  {
    /* Default values for command line options.  */
 -  unsigned short int show_variables = 0;
 +  /* unsigned short int show_variables = 0; */
  
    switch (argc)
  	{
@@@ -88,7 -87,7 +87,7 @@@
  	  /* git sh-i18n--envsubst --variables '$foo and $bar' */
  	  if (strcmp(argv[1], "--variables"))
  		error ("first argument must be --variables when two are given");
 -	  show_variables = 1;
 +	  /* show_variables = 1; */
        print_variables (argv[2]);
  	  break;
  	default: