From: Junio C Hamano <junkio@cox.net>
Date: Mon, 22 May 2006 00:37:54 +0000 (-0700)
Subject: Merge branch 'jc/mailinfo' into next
X-Git-Tag: v1.4.1-rc1~76
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7b8e4ab07c6ebc72e311804c9c79ef93cfbbe704?hp=-c

Merge branch 'jc/mailinfo' into next

* jc/mailinfo:
mailinfo: skip bogus UNIX From line inside body
tutorial-2: typofix in examples.
tutorial: add discussion of index file, object database
tutorial: expanded discussion of commit history
tutorial: replace "whatchanged" by "log"
NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
remove superflous "const"
checkdiff_consume: strtol parameter fix.
Elaborate on why ':' is a bad idea in a ref name.
Reference git-check-ref-format in git-branch.
---

7b8e4ab07c6ebc72e311804c9c79ef93cfbbe704
diff --combined Makefile
index d171829e02,efe6b12719..5bf820c82b
--- a/Makefile
+++ b/Makefile
@@@ -113,14 -113,14 +113,14 @@@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__pow
  ### --- END CONFIGURATION SECTION ---
  
  SCRIPT_SH = \
 -	git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
 +	git-bisect.sh git-branch.sh git-checkout.sh \
  	git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
  	git-fetch.sh \
 -	git-format-patch.sh git-ls-remote.sh \
 +	git-ls-remote.sh \
  	git-merge-one-file.sh git-parse-remote.sh \
  	git-prune.sh git-pull.sh git-rebase.sh \
  	git-repack.sh git-request-pull.sh git-reset.sh \
 -	git-resolve.sh git-revert.sh git-rm.sh git-sh-setup.sh \
 +	git-resolve.sh git-revert.sh git-sh-setup.sh \
  	git-tag.sh git-verify-tag.sh \
  	git-applymbox.sh git-applypatch.sh git-am.sh \
  	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
@@@ -161,7 -161,7 +161,7 @@@ PROGRAMS = 
  	git-receive-pack$X git-rev-parse$X \
  	git-send-pack$X git-show-branch$X git-shell$X \
  	git-show-index$X git-ssh-fetch$X \
 -	git-ssh-upload$X git-tar-tree$X git-unpack-file$X \
 +	git-ssh-upload$X git-unpack-file$X \
  	git-unpack-objects$X git-update-index$X git-update-server-info$X \
  	git-upload-pack$X git-verify-pack$X git-write-tree$X \
  	git-update-ref$X git-symbolic-ref$X \
@@@ -170,9 -170,8 +170,9 @@@
  
  BUILT_INS = git-log$X git-whatchanged$X git-show$X \
  	git-count-objects$X git-diff$X git-push$X \
 -	git-grep$X git-rev-list$X git-check-ref-format$X \
 -	git-init-db$X
 +	git-grep$X git-add$X git-rm$X git-rev-list$X \
 +	git-check-ref-format$X \
 +	git-init-db$X git-tar-tree$X git-upload-tar$X git-format-patch$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -201,7 -200,7 +201,7 @@@ LIB_H = 
  	blob.h cache.h commit.h csum-file.h delta.h \
  	diff.h object.h pack.h pkt-line.h quote.h refs.h \
  	run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
 -	tree-walk.h log-tree.h
 +	tree-walk.h log-tree.h dir.h
  
  DIFF_OBJS = \
  	diff.o diff-lib.o diffcore-break.o diffcore-order.o \
@@@ -209,10 -208,10 +209,10 @@@
  	diffcore-delta.o log-tree.o
  
  LIB_OBJS = \
 -	blob.o commit.o connect.o csum-file.o base85.o \
 +	blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \
  	date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
  	object.o pack-check.o patch-delta.o path.o pkt-line.o \
 -	quote.o read-cache.o refs.o run-command.o \
 +	quote.o read-cache.o refs.o run-command.o dir.o \
  	server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
  	tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
  	fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
@@@ -220,8 -219,8 +220,8 @@@
  
  BUILTIN_OBJS = \
  	builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
 -	builtin-grep.o builtin-rev-list.o builtin-check-ref-format.o \
 -	builtin-init-db.o
 +	builtin-grep.o builtin-add.o builtin-rev-list.o builtin-check-ref-format.o \
 +	builtin-rm.o builtin-init-db.o builtin-tar-tree.o builtin-upload-tar.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
@@@ -421,6 -420,9 +421,9 @@@ els
  	ALL_CFLAGS += -Dsockaddr_storage=sockaddr_in6
  endif
  endif
+ ifdef NO_INET_NTOP
+ 	LIB_OBJS += compat/inet_ntop.o
+ endif
  
  ifdef NO_ICONV
  	ALL_CFLAGS += -DNO_ICONV
@@@ -610,9 -612,6 +613,9 @@@ test-date$X: test-date.c date.o ctype.
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
  	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
  
 +test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
 +	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 +
  check:
  	for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
  
diff --combined diff.c
index be459cac69,d3bb10e009..d8c00dbc46
--- a/diff.c
+++ b/diff.c
@@@ -299,7 -299,6 +299,7 @@@ static void diffstat_consume(void *priv
  
  static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
  static const char minuses[]= "----------------------------------------------------------------------";
 +const char mime_boundary_leader[] = "------------";
  
  static void show_stats(struct diffstat_t* data)
  {
@@@ -432,7 -431,7 +432,7 @@@ static void checkdiff_consume(void *pri
  	else if (line[0] == '@') {
  		char *plus = strchr(line, '+');
  		if (plus)
- 			data->lineno = strtol(plus, line + len, 10);
+ 			data->lineno = strtol(plus, NULL, 10);
  		else
  			die("invalid diff");
  	}
@@@ -1981,10 -1980,7 +1981,10 @@@ void diff_flush(struct diff_options *op
  		show_stats(diffstat);
  		free(diffstat);
  		diffstat = NULL;
 -		putchar(options->line_termination);
 +		if (options->stat_sep)
 +			fputs(options->stat_sep, stdout);
 +		else
 +			putchar(options->line_termination);
  	}
  	for (i = 0; i < q->nr; i++) {
  		struct diff_filepair *p = q->queue[i];