From: Junio C Hamano <junkio@cox.net>
Date: Sat, 6 May 2006 21:42:08 +0000 (-0700)
Subject: Merge branch 'master' into js/fmt-patch
X-Git-Tag: v1.4.0-rc1~76^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c66b6c067e49c5ec80f1254daef79aa1c7f5ffce;p=git.git

Merge branch 'master' into js/fmt-patch

* master: (109 commits)
  t1300-repo-config: two new config parsing tests.
  Another config file parsing fix.
  update-index: plug memory leak from prefix_path()
  checkout-index: plug memory leak from prefix_path()
  update-index --unresolve: work from a subdirectory.
  pack-object: squelch eye-candy on non-tty
  core.prefersymlinkrefs: use symlinks for .git/HEAD
  repo-config: trim white-space before comment
  Fix for config file section parsing.
  Clarify git-cherry documentation.
  Update git-unpack-objects documentation.
  Fix up docs where "--" isn't displayed correctly.
  Several trivial documentation touch ups.
  git-svn 1.0.0
  git-svn: documentation updates
  delta: stricter constness
  Makefile: do not link rev-list any specially.
  builtin-push: --all and --tags _are_ explicit refspecs
  builtin-log/whatchanged/show: make them official.
  show-branch: omit uninteresting merges.
  ...
---

c66b6c067e49c5ec80f1254daef79aa1c7f5ffce
diff --cc builtin.h
index 94dc0732f,bb63f0729..635a00bf7
--- a/builtin.h
+++ b/builtin.h
@@@ -19,6 -19,9 +19,10 @@@ extern int cmd_version(int argc, const 
  extern int cmd_whatchanged(int argc, const char **argv, char **envp);
  extern int cmd_show(int argc, const char **argv, char **envp);
  extern int cmd_log(int argc, const char **argv, char **envp);
+ extern int cmd_diff(int argc, const char **argv, char **envp);
 +extern int cmd_format_patch(int argc, const char **argv, char **envp);
+ extern int cmd_count_objects(int argc, const char **argv, char **envp);
+ 
+ extern int cmd_push(int argc, const char **argv, char **envp);
  
  #endif
diff --cc git.c
index 619c6654e,49ba5189d..a8f7926b4
--- a/git.c
+++ b/git.c
@@@ -47,7 -46,9 +46,10 @@@ static void handle_internal_command(in
  		{ "log", cmd_log },
  		{ "whatchanged", cmd_whatchanged },
  		{ "show", cmd_show },
+ 		{ "push", cmd_push },
 +		{ "fmt-patch", cmd_format_patch },
+ 		{ "count-objects", cmd_count_objects },
+ 		{ "diff", cmd_diff },
  	};
  	int i;
  
diff --cc log-tree.c
index 4a3cd6791,b90ba6762..526d578e9
--- a/log-tree.c
+++ b/log-tree.c
@@@ -38,31 -49,14 +50,33 @@@ void show_log(struct rev_info *opt, str
  	/*
  	 * Print header line of header..
  	 */
 -	printf("%s%s",
 -		opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
 -		diff_unique_abbrev(commit->object.sha1, abbrev_commit));
 -	if (opt->parents)
 -		show_parents(commit, abbrev_commit);
 -	if (parent)
 -		printf(" (from %s)", diff_unique_abbrev(parent->object.sha1, abbrev_commit));
 -	putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
 +
 +	if (opt->commit_format == CMIT_FMT_EMAIL) {
 +		if (opt->total > 0) {
 +			static char buffer[64];
 +			snprintf(buffer, sizeof(buffer),
 +					"Subject: [PATCH %d/%d] ",
 +					opt->nr, opt->total);
 +			subject = buffer;
 +		} else if (opt->total == 0)
 +			subject = "Subject: [PATCH] ";
 +		else
 +			subject = "Subject: ";
 +
 +		printf("From %s  Thu Apr 7 15:13:13 2005\n",
 +		       sha1_to_hex(commit->object.sha1));
 +	} else {
 +		printf("%s%s",
 +		       opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
 +		       diff_unique_abbrev(commit->object.sha1, abbrev_commit));
++		if (opt->parents)
++			show_parents(commit, abbrev_commit);
 +		if (parent) 
 +			printf(" (from %s)",
 +			       diff_unique_abbrev(parent->object.sha1,
 +						  abbrev_commit));
 +		putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
 +	}
  
  	/*
  	 * And then the pretty-printed message itself