diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-27 03:36:20 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-27 03:36:20 +0400 |
| commit | 2a0a1398ff3db6762076ebd071559c36b9414217 (patch) | |
| tree | bc95a9df52973e909359a921f92b33c1bd6185a1 | |
| parent | 3c38f60c339839869f97448fd7a27551f97cec12 (diff) | |
| parent | b931aa5a48f9fb3c26a565d5f19866923f13b692 (diff) | |
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.
| -rw-r--r-- | builtin-cat-file.c | 2 | ||||
| -rw-r--r-- | builtin-log.c | 13 | ||||
| -rwxr-xr-x | git-commit.sh | 3 |
3 files changed, 15 insertions, 3 deletions
diff --git a/builtin-cat-file.c b/builtin-cat-file.c index 8ab136e981..4d36817e5f 100644 --- a/builtin-cat-file.c +++ b/builtin-cat-file.c @@ -141,7 +141,7 @@ int cmd_cat_file(int argc, const char **argv, char **envp) /* custom pretty-print here */ 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); if (!buf) diff --git a/builtin-log.c b/builtin-log.c index 71f4ff9b8f..cdcf49e21f 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -201,7 +201,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp) } argc = j; - if (numbered && start_number < 0) + if (start_number < 0) start_number = 1; if (numbered && keep_subject < 0) 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) { int shown; commit = list[nr]; - rev.nr = rev.total - nr; + rev.nr = total - nr + (start_number - 1); if (!use_stdout) reopen_stdout(commit, rev.nr, keep_subject); shown = log_tree_commit(&rev, commit); free(commit->buffer); 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 (rev.mime_boundary) printf("\n--%s%s--\n\n\n", diff --git a/git-commit.sh b/git-commit.sh index 0a01a0b96a..91f28f9a23 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -626,6 +626,9 @@ fi if test -z "$no_edit" 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" run_status } >>"$GIT_DIR"/COMMIT_EDITMSG |