From 88a1531435b4cb565d290ed5146352beda52206c Mon Sep 17 00:00:00 2001 From: Martin Waitz Date: Fri, 26 May 2006 01:42:18 +0200 Subject: [PATCH 1/3] Add instructions to commit template. New users can be irritated by the git status text in their editor. Let's give them a short help. Signed-off-by: Martin Waitz Signed-off-by: Junio C Hamano --- git-commit.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git-commit.sh b/git-commit.sh index 6785826fef..1983d45828 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 From add5c8a562fc0e80ad4eb3d1e2a9f9f47df053a6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 26 May 2006 11:30:49 -0700 Subject: [PATCH 2/3] built-in format-patch: various fixups. - The --start-number handling introduced breakage in the normal code path. It started numbering at 0 when not --numbered, for example. - When generating one file per patch, we needlessly added an extra blank line in front for second and subsequent files. Signed-off-by: Junio C Hamano --- builtin-log.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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", From b931aa5a48f9fb3c26a565d5f19866923f13b692 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 26 May 2006 18:59:17 +0200 Subject: [PATCH 3/3] Call builtin ls-tree in git-cat-file -p Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano --- builtin-cat-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)