mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
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.
This commit is contained in:
commit
2a0a1398ff
3 changed files with 15 additions and 3 deletions
|
@ -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)
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue