kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into next 

* master:
  Call builtin ls-tree in git-cat-file -p
  built-in format-patch: various fixups.
  Add instructions to commit template.
maint
Junio C Hamano 2006-05-26 16:36:20 -07:00
parent 3c38f60c33 b931aa5a48
commit 2a0a1398ff
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-cat-file.c
View File

@ -141,7 +141,7 @@ int cmd_cat_file(int argc, const char **argv, char **envp)


/* custom pretty-print here */ /* custom pretty-print here */
if (!strcmp(type, tree_type)) if (!strcmp(type, tree_type))
return execl_git_cmd("ls-tree", argv[2], NULL); return cmd_ls_tree(2, argv + 1, NULL);


buf = read_sha1_file(sha1, type, &size); buf = read_sha1_file(sha1, type, &size);
if (!buf) if (!buf)

13
builtin-log.c
View File

@ -201,7 +201,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
} }
argc = j; argc = j;


if (numbered && start_number < 0) if (start_number < 0)
start_number = 1; start_number = 1;
if (numbered && keep_subject < 0) if (numbered && keep_subject < 0)
die ("-n and -k are mutually exclusive."); die ("-n and -k are mutually exclusive.");
@ -233,12 +233,21 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
while (0 <= --nr) { while (0 <= --nr) {
int shown; int shown;
commit = list[nr]; commit = list[nr];
rev.nr = rev.total - nr; rev.nr = total - nr + (start_number - 1);
if (!use_stdout) if (!use_stdout)
reopen_stdout(commit, rev.nr, keep_subject); reopen_stdout(commit, rev.nr, keep_subject);
shown = log_tree_commit(&rev, commit); shown = log_tree_commit(&rev, commit);
free(commit->buffer); free(commit->buffer);
commit->buffer = NULL; commit->buffer = NULL;

/* We put one extra blank line between formatted
* patches and this flag is used by log-tree code
* to see if it needs to emit a LF before showing
* the log; when using one file per patch, we do
* not want the extra blank line.
*/
if (!use_stdout)
rev.shown_one = 0;
if (shown) { if (shown) {
if (rev.mime_boundary) if (rev.mime_boundary)
printf("\n--%s%s--\n\n\n", printf("\n--%s%s--\n\n\n",

3
git-commit.sh
View File

@ -626,6 +626,9 @@ fi
if test -z "$no_edit" if test -z "$no_edit"
then then
{ {
echo ""
echo "# Please enter the commit message for your changes."
echo "# (Comment lines starting with '#' will not be included)"
test -z "$only_include_assumed" || echo "$only_include_assumed" test -z "$only_include_assumed" || echo "$only_include_assumed"
run_status run_status
} >>"$GIT_DIR"/COMMIT_EDITMSG } >>"$GIT_DIR"/COMMIT_EDITMSG