mirror of
https://github.com/git/git.git
synced 2024-11-17 14:34:49 +01:00
Merge branch 'js/fmt-patch' into next
* js/fmt-patch: git-format-patch: now built-in. fmt-patch: Support --attach diff family: add --check option Document that "git add" only adds non-ignored files.
This commit is contained in:
Junio C Hamano
commit
f6ef6b8523
13 changed files with 190 additions and 361 deletions
|
|
@ -14,11 +14,13 @@ DESCRIPTION
|
|||
A simple wrapper for git-update-index to add files to the index,
|
||||
for people used to do "cvs add".
|
||||
|
||||
It only adds non-ignored files, to add ignored files use
|
||||
"git update-index --add".
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
<file>...::
|
||||
Files to add to the index.
|
||||
Files to add to the index (see gitlink:git-ls-files[1]).
|
||||
|
||||
-n::
|
||||
Don't actually add the file(s), just show if they exist.
|
||||
|
|
@ -68,6 +70,7 @@ git-add git-*.sh::
|
|||
See Also
|
||||
--------
|
||||
gitlink:git-rm[1]
|
||||
gitlink:git-ls-files[1]
|
||||
|
||||
Author
|
||||
------
|
||||
|
|
|
|||
4
Makefile
4
Makefile
|
|
@ -116,7 +116,7 @@ SCRIPT_SH = \
|
|||
git-bisect.sh git-branch.sh git-checkout.sh \
|
||||
git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
|
||||
git-fetch.sh \
|
||||
git-format-patch.sh git-ls-remote.sh \
|
||||
git-ls-remote.sh \
|
||||
git-merge-one-file.sh git-parse-remote.sh \
|
||||
git-prune.sh git-pull.sh git-rebase.sh \
|
||||
git-repack.sh git-request-pull.sh git-reset.sh \
|
||||
|
|
@ -172,7 +172,7 @@ BUILT_INS = git-log$X git-whatchanged$X git-show$X \
|
|||
git-count-objects$X git-diff$X git-push$X \
|
||||
git-grep$X git-add$X git-rm$X git-rev-list$X \
|
||||
git-check-ref-format$X \
|
||||
git-init-db$X git-tar-tree$X git-upload-tar$X
|
||||
git-init-db$X git-tar-tree$X git-upload-tar$X git-format-patch$X
|
||||
|
||||
# what 'all' will build and 'install' will install, in gitexecdir
|
||||
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
|
||||
|
|
|
|||
|
|
@ -183,7 +183,12 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
|
|||
argv[i + 1]);
|
||||
output_directory = strdup(argv[i + 1]);
|
||||
i++;
|
||||
} else
|
||||
}
|
||||
else if (!strcmp(argv[i], "--attach"))
|
||||
rev.mime_boundary = git_version_string;
|
||||
else if (!strncmp(argv[i], "--attach=", 9))
|
||||
rev.mime_boundary = argv[i] + 9;
|
||||
else
|
||||
argv[j++] = argv[i];
|
||||
}
|
||||
argc = j;
|
||||
|
|
@ -224,8 +229,14 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
|
|||
shown = log_tree_commit(&rev, commit);
|
||||
free(commit->buffer);
|
||||
commit->buffer = NULL;
|
||||
if (shown)
|
||||
if (shown) {
|
||||
if (rev.mime_boundary)
|
||||
printf("\n--%s%s--\n\n\n",
|
||||
mime_boundary_leader,
|
||||
rev.mime_boundary);
|
||||
else
|
||||
printf("-- \n%s\n\n", git_version_string);
|
||||
}
|
||||
if (!use_stdout)
|
||||
fclose(stdout);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ static void show_commit(struct commit *commit)
|
|||
static char pretty_header[16384];
|
||||
pretty_print_commit(revs.commit_format, commit, ~0,
|
||||
pretty_header, sizeof(pretty_header),
|
||||
revs.abbrev, NULL);
|
||||
revs.abbrev, NULL, NULL);
|
||||
printf("%s%c", pretty_header, hdr_termination);
|
||||
}
|
||||
fflush(stdout);
|
||||
|
|
|
|||
10
commit.c
10
commit.c
|
|
@ -498,7 +498,7 @@ static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *com
|
|||
return offset;
|
||||
}
|
||||
|
||||
unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject)
|
||||
unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject, const char *after_subject)
|
||||
{
|
||||
int hdr = 1, body = 0;
|
||||
unsigned long offset = 0;
|
||||
|
|
@ -591,6 +591,14 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
|
|||
buf[offset++] = '\n';
|
||||
if (fmt == CMIT_FMT_ONELINE)
|
||||
break;
|
||||
if (after_subject) {
|
||||
int slen = strlen(after_subject);
|
||||
if (slen > space - offset - 1)
|
||||
slen = space - offset - 1;
|
||||
memcpy(buf + offset, after_subject, slen);
|
||||
offset += slen;
|
||||
after_subject = NULL;
|
||||
}
|
||||
subject = NULL;
|
||||
}
|
||||
while (offset && isspace(buf[offset-1]))
|
||||
|
|
|
|||
2
commit.h
2
commit.h
|
|
@ -51,7 +51,7 @@ enum cmit_fmt {
|
|||
};
|
||||
|
||||
extern enum cmit_fmt get_commit_format(const char *arg);
|
||||
extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject);
|
||||
extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject, const char *after_subject);
|
||||
|
||||
/** Removes the first commit from a list sorted by date, and adds all
|
||||
* of its parents.
|
||||
|
|
|
|||
119
diff.c
119
diff.c
|
|
@ -299,6 +299,7 @@ static void diffstat_consume(void *priv, char *line, unsigned long len)
|
|||
|
||||
static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
|
||||
static const char minuses[]= "----------------------------------------------------------------------";
|
||||
const char mime_boundary_leader[] = "------------";
|
||||
|
||||
static void show_stats(struct diffstat_t* data)
|
||||
{
|
||||
|
|
@ -397,6 +398,46 @@ static void show_stats(struct diffstat_t* data)
|
|||
total_files, adds, dels);
|
||||
}
|
||||
|
||||
struct checkdiff_t {
|
||||
struct xdiff_emit_state xm;
|
||||
const char *filename;
|
||||
int lineno;
|
||||
};
|
||||
|
||||
static void checkdiff_consume(void *priv, char *line, unsigned long len)
|
||||
{
|
||||
struct checkdiff_t *data = priv;
|
||||
|
||||
if (line[0] == '+') {
|
||||
int i, spaces = 0;
|
||||
|
||||
data->lineno++;
|
||||
|
||||
/* check space before tab */
|
||||
for (i = 1; i < len && (line[i] == ' ' || line[i] == '\t'); i++)
|
||||
if (line[i] == ' ')
|
||||
spaces++;
|
||||
if (line[i - 1] == '\t' && spaces)
|
||||
printf("%s:%d: space before tab:%.*s\n",
|
||||
data->filename, data->lineno, (int)len, line);
|
||||
|
||||
/* check white space at line end */
|
||||
if (line[len - 1] == '\n')
|
||||
len--;
|
||||
if (isspace(line[len - 1]))
|
||||
printf("%s:%d: white space at end: %.*s\n",
|
||||
data->filename, data->lineno, (int)len, line);
|
||||
} else if (line[0] == ' ')
|
||||
data->lineno++;
|
||||
else if (line[0] == '@') {
|
||||
char *plus = strchr(line, '+');
|
||||
if (plus)
|
||||
data->lineno = strtol(plus, line + len, 10);
|
||||
else
|
||||
die("invalid diff");
|
||||
}
|
||||
}
|
||||
|
||||
static unsigned char *deflate_it(char *data,
|
||||
unsigned long size,
|
||||
unsigned long *result_size)
|
||||
|
|
@ -624,6 +665,41 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
|
|||
}
|
||||
}
|
||||
|
||||
static void builtin_checkdiff(const char *name_a, const char *name_b,
|
||||
struct diff_filespec *one,
|
||||
struct diff_filespec *two)
|
||||
{
|
||||
mmfile_t mf1, mf2;
|
||||
struct checkdiff_t data;
|
||||
|
||||
if (!two)
|
||||
return;
|
||||
|
||||
memset(&data, 0, sizeof(data));
|
||||
data.xm.consume = checkdiff_consume;
|
||||
data.filename = name_b ? name_b : name_a;
|
||||
data.lineno = 0;
|
||||
|
||||
if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
|
||||
die("unable to read files to diff");
|
||||
|
||||
if (mmfile_is_binary(&mf2))
|
||||
return;
|
||||
else {
|
||||
/* Crazy xdl interfaces.. */
|
||||
xpparam_t xpp;
|
||||
xdemitconf_t xecfg;
|
||||
xdemitcb_t ecb;
|
||||
|
||||
xpp.flags = XDF_NEED_MINIMAL;
|
||||
xecfg.ctxlen = 0;
|
||||
xecfg.flags = 0;
|
||||
ecb.outf = xdiff_outf;
|
||||
ecb.priv = &data;
|
||||
xdl_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
|
||||
}
|
||||
}
|
||||
|
||||
struct diff_filespec *alloc_filespec(const char *path)
|
||||
{
|
||||
int namelen = strlen(path);
|
||||
|
|
@ -1180,6 +1256,25 @@ static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
|
|||
builtin_diffstat(name, other, p->one, p->two, diffstat, complete_rewrite);
|
||||
}
|
||||
|
||||
static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
|
||||
{
|
||||
const char *name;
|
||||
const char *other;
|
||||
|
||||
if (DIFF_PAIR_UNMERGED(p)) {
|
||||
/* unmerged */
|
||||
return;
|
||||
}
|
||||
|
||||
name = p->one->path;
|
||||
other = (strcmp(name, p->two->path) ? p->two->path : NULL);
|
||||
|
||||
diff_fill_sha1_info(p->one);
|
||||
diff_fill_sha1_info(p->two);
|
||||
|
||||
builtin_checkdiff(name, other, p->one, p->two);
|
||||
}
|
||||
|
||||
void diff_setup(struct diff_options *options)
|
||||
{
|
||||
memset(options, 0, sizeof(*options));
|
||||
|
|
@ -1205,7 +1300,8 @@ int diff_setup_done(struct diff_options *options)
|
|||
* recursive bits for other formats here.
|
||||
*/
|
||||
if ((options->output_format == DIFF_FORMAT_PATCH) ||
|
||||
(options->output_format == DIFF_FORMAT_DIFFSTAT))
|
||||
(options->output_format == DIFF_FORMAT_DIFFSTAT) ||
|
||||
(options->output_format == DIFF_FORMAT_CHECKDIFF))
|
||||
options->recursive = 1;
|
||||
|
||||
if (options->detect_rename && options->rename_limit < 0)
|
||||
|
|
@ -1288,6 +1384,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
|
|||
}
|
||||
else if (!strcmp(arg, "--stat"))
|
||||
options->output_format = DIFF_FORMAT_DIFFSTAT;
|
||||
else if (!strcmp(arg, "--check"))
|
||||
options->output_format = DIFF_FORMAT_CHECKDIFF;
|
||||
else if (!strcmp(arg, "--summary"))
|
||||
options->summary = 1;
|
||||
else if (!strcmp(arg, "--patch-with-stat")) {
|
||||
|
|
@ -1610,6 +1708,19 @@ static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
|
|||
run_diffstat(p, o, diffstat);
|
||||
}
|
||||
|
||||
static void diff_flush_checkdiff(struct diff_filepair *p,
|
||||
struct diff_options *o)
|
||||
{
|
||||
if (diff_unmodified_pair(p))
|
||||
return;
|
||||
|
||||
if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
|
||||
(DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
|
||||
return; /* no tree diffs in patch format */
|
||||
|
||||
run_checkdiff(p, o);
|
||||
}
|
||||
|
||||
int diff_queue_is_empty(void)
|
||||
{
|
||||
struct diff_queue_struct *q = &diff_queued_diff;
|
||||
|
|
@ -1740,6 +1851,9 @@ static void flush_one_pair(struct diff_filepair *p,
|
|||
case DIFF_FORMAT_DIFFSTAT:
|
||||
diff_flush_stat(p, options, diffstat);
|
||||
break;
|
||||
case DIFF_FORMAT_CHECKDIFF:
|
||||
diff_flush_checkdiff(p, options);
|
||||
break;
|
||||
case DIFF_FORMAT_PATCH:
|
||||
diff_flush_patch(p, options);
|
||||
break;
|
||||
|
|
@ -1867,6 +1981,9 @@ void diff_flush(struct diff_options *options)
|
|||
show_stats(diffstat);
|
||||
free(diffstat);
|
||||
diffstat = NULL;
|
||||
if (options->stat_sep)
|
||||
fputs(options->stat_sep, stdout);
|
||||
else
|
||||
putchar(options->line_termination);
|
||||
}
|
||||
for (i = 0; i < q->nr; i++) {
|
||||
|
|
|
|||
4
diff.h
4
diff.h
|
|
@ -44,6 +44,7 @@ struct diff_options {
|
|||
int rename_limit;
|
||||
int setup;
|
||||
int abbrev;
|
||||
const char *stat_sep;
|
||||
|
||||
int nr_paths;
|
||||
const char **paths;
|
||||
|
|
@ -52,6 +53,8 @@ struct diff_options {
|
|||
add_remove_fn_t add_remove;
|
||||
};
|
||||
|
||||
extern const char mime_boundary_leader[];
|
||||
|
||||
extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
|
||||
extern void diff_tree_release_paths(struct diff_options *);
|
||||
extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
|
||||
|
|
@ -153,6 +156,7 @@ extern int diff_queue_is_empty(void);
|
|||
#define DIFF_FORMAT_NAME 4
|
||||
#define DIFF_FORMAT_NAME_STATUS 5
|
||||
#define DIFF_FORMAT_DIFFSTAT 6
|
||||
#define DIFF_FORMAT_CHECKDIFF 7
|
||||
|
||||
extern void diff_flush(struct diff_options*);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,344 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2005 Junio C Hamano
|
||||
#
|
||||
|
||||
USAGE='[-n | -k] [-o <dir> | --stdout] [--signoff] [--check] [--diff-options] [--attach] <his> [<mine>]'
|
||||
LONG_USAGE='Prepare each commit with its patch since <mine> head forked from
|
||||
<his> head, one file per patch formatted to resemble UNIX mailbox
|
||||
format, for e-mail submission or use with git-am.
|
||||
|
||||
Each output file is numbered sequentially from 1, and uses the
|
||||
first line of the commit message (massaged for pathname safety)
|
||||
as the filename.
|
||||
|
||||
When -o is specified, output files are created in <dir>; otherwise
|
||||
they are created in the current working directory. This option
|
||||
is ignored if --stdout is specified.
|
||||
|
||||
When -n is specified, instead of "[PATCH] Subject", the first
|
||||
line is formatted as "[PATCH N/M] Subject", unless you have only
|
||||
one patch.
|
||||
|
||||
When --attach is specified, patches are attached, not inlined.'
|
||||
|
||||
. git-sh-setup
|
||||
|
||||
# Force diff to run in C locale.
|
||||
LANG=C LC_ALL=C
|
||||
export LANG LC_ALL
|
||||
|
||||
diff_opts=
|
||||
LF='
|
||||
'
|
||||
|
||||
outdir=./
|
||||
while case "$#" in 0) break;; esac
|
||||
do
|
||||
case "$1" in
|
||||
-c|--c|--ch|--che|--chec|--check)
|
||||
check=t ;;
|
||||
-a|--a|--au|--aut|--auth|--autho|--author|\
|
||||
-d|--d|--da|--dat|--date|\
|
||||
-m|--m|--mb|--mbo|--mbox) # now noop
|
||||
;;
|
||||
--at|--att|--atta|--attac|--attach)
|
||||
attach=t ;;
|
||||
-k|--k|--ke|--kee|--keep|--keep-|--keep-s|--keep-su|--keep-sub|\
|
||||
--keep-subj|--keep-subje|--keep-subjec|--keep-subject)
|
||||
keep_subject=t ;;
|
||||
-n|--n|--nu|--num|--numb|--numbe|--number|--numbere|--numbered)
|
||||
numbered=t ;;
|
||||
-s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
|
||||
signoff=t ;;
|
||||
--st|--std|--stdo|--stdou|--stdout)
|
||||
stdout=t ;;
|
||||
-o=*|--o=*|--ou=*|--out=*|--outp=*|--outpu=*|--output=*|--output-=*|\
|
||||
--output-d=*|--output-di=*|--output-dir=*|--output-dire=*|\
|
||||
--output-direc=*|--output-direct=*|--output-directo=*|\
|
||||
--output-director=*|--output-directory=*)
|
||||
outdir=`expr "$1" : '-[^=]*=\(.*\)'` ;;
|
||||
-o|--o|--ou|--out|--outp|--outpu|--output|--output-|--output-d|\
|
||||
--output-di|--output-dir|--output-dire|--output-direc|--output-direct|\
|
||||
--output-directo|--output-director|--output-directory)
|
||||
case "$#" in 1) usage ;; esac; shift
|
||||
outdir="$1" ;;
|
||||
-h|--h|--he|--hel|--help)
|
||||
usage
|
||||
;;
|
||||
-*' '* | -*"$LF"* | -*' '*)
|
||||
# Ignore diff option that has whitespace for now.
|
||||
;;
|
||||
-*) diff_opts="$diff_opts$1 " ;;
|
||||
*) break ;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
case "$keep_subject$numbered" in
|
||||
tt)
|
||||
die '--keep-subject and --numbered are incompatible.' ;;
|
||||
esac
|
||||
|
||||
tmp=.tmp-series$$
|
||||
trap 'rm -f $tmp-*' 0 1 2 3 15
|
||||
|
||||
series=$tmp-series
|
||||
commsg=$tmp-commsg
|
||||
filelist=$tmp-files
|
||||
|
||||
# Backward compatible argument parsing hack.
|
||||
#
|
||||
# Historically, we supported:
|
||||
# 1. "rev1" is equivalent to "rev1..HEAD"
|
||||
# 2. "rev1..rev2"
|
||||
# 3. "rev1" "rev2 is equivalent to "rev1..rev2"
|
||||
#
|
||||
# We want to take a sequence of "rev1..rev2" in general.
|
||||
# Also, "rev1.." should mean "rev1..HEAD"; git-diff users are
|
||||
# familiar with that syntax.
|
||||
|
||||
case "$#,$1$2" in
|
||||
1,?*..?*)
|
||||
# single "rev1..rev2"
|
||||
;;
|
||||
1,?*..)
|
||||
# single "rev1.." should mean "rev1..HEAD"
|
||||
set x "$1"HEAD
|
||||
shift
|
||||
;;
|
||||
1,*)
|
||||
# single rev1
|
||||
set x "$1..HEAD"
|
||||
shift
|
||||
;;
|
||||
2,?*..?*)
|
||||
# not traditional "rev1" "rev2"
|
||||
;;
|
||||
2,*)
|
||||
set x "$1..$2"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
|
||||
# Now we have what we want in $@
|
||||
for revpair
|
||||
do
|
||||
case "$revpair" in
|
||||
?*..?*)
|
||||
rev1=`expr "z$revpair" : 'z\(.*\)\.\.'`
|
||||
rev2=`expr "z$revpair" : 'z.*\.\.\(.*\)'`
|
||||
;;
|
||||
*)
|
||||
rev1="$revpair^"
|
||||
rev2="$revpair"
|
||||
;;
|
||||
esac
|
||||
git-rev-parse --verify "$rev1^0" >/dev/null 2>&1 ||
|
||||
die "Not a valid rev $rev1 ($revpair)"
|
||||
git-rev-parse --verify "$rev2^0" >/dev/null 2>&1 ||
|
||||
die "Not a valid rev $rev2 ($revpair)"
|
||||
git-cherry -v "$rev1" "$rev2" |
|
||||
while read sign rev comment
|
||||
do
|
||||
case "$sign" in
|
||||
'-')
|
||||
echo >&2 "Merged already: $comment"
|
||||
;;
|
||||
*)
|
||||
echo $rev
|
||||
;;
|
||||
esac
|
||||
done
|
||||
done >$series
|
||||
|
||||
me=`git-var GIT_AUTHOR_IDENT | sed -e 's/>.*/>/'`
|
||||
headers=`git-repo-config --get format.headers`
|
||||
case "$attach" in
|
||||
"") ;;
|
||||
*)
|
||||
mimemagic="050802040500080604070107"
|
||||
esac
|
||||
|
||||
case "$outdir" in
|
||||
*/) ;;
|
||||
*) outdir="$outdir/" ;;
|
||||
esac
|
||||
test -d "$outdir" || mkdir -p "$outdir" || exit
|
||||
|
||||
titleScript='
|
||||
/./d
|
||||
/^$/n
|
||||
s/^\[PATCH[^]]*\] *//
|
||||
s/[^-a-z.A-Z_0-9]/-/g
|
||||
s/\.\.\.*/\./g
|
||||
s/\.*$//
|
||||
s/--*/-/g
|
||||
s/^-//
|
||||
s/-$//
|
||||
s/$/./
|
||||
p
|
||||
q
|
||||
'
|
||||
|
||||
process_one () {
|
||||
perl -w -e '
|
||||
my ($keep_subject, $num, $signoff, $headers, $mimemagic, $commsg) = @ARGV;
|
||||
my ($signoff_pattern, $done_header, $done_subject, $done_separator, $signoff_seen,
|
||||
$last_was_signoff);
|
||||
|
||||
if ($signoff) {
|
||||
$signoff = "Signed-off-by: " . `git-var GIT_COMMITTER_IDENT`;
|
||||
$signoff =~ s/>.*/>/;
|
||||
$signoff_pattern = quotemeta($signoff);
|
||||
}
|
||||
|
||||
my @weekday_names = qw(Sun Mon Tue Wed Thu Fri Sat);
|
||||
my @month_names = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
|
||||
|
||||
sub show_date {
|
||||
my ($time, $tz) = @_;
|
||||
my $minutes = abs($tz);
|
||||
$minutes = int($minutes / 100) * 60 + ($minutes % 100);
|
||||
if ($tz < 0) {
|
||||
$minutes = -$minutes;
|
||||
}
|
||||
my $t = $time + $minutes * 60;
|
||||
my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday) = gmtime($t);
|
||||
return sprintf("%s, %d %s %d %02d:%02d:%02d %+05d",
|
||||
$weekday_names[$wday], $mday,
|
||||
$month_names[$mon], $year+1900,
|
||||
$hour, $min, $sec, $tz);
|
||||
}
|
||||
|
||||
print "From nobody Mon Sep 17 00:00:00 2001\n";
|
||||
open FH, "git stripspace <$commsg |" or die "open $commsg pipe";
|
||||
while (<FH>) {
|
||||
unless ($done_header) {
|
||||
if (/^$/) {
|
||||
$done_header = 1;
|
||||
}
|
||||
elsif (/^author (.*>) (.*)$/) {
|
||||
my ($author_ident, $author_date) = ($1, $2);
|
||||
my ($utc, $off) = ($author_date =~ /^(\d+) ([-+]?\d+)$/);
|
||||
$author_date = show_date($utc, $off);
|
||||
|
||||
print "From: $author_ident\n";
|
||||
print "Date: $author_date\n";
|
||||
}
|
||||
next;
|
||||
}
|
||||
unless ($done_subject) {
|
||||
unless ($keep_subject) {
|
||||
s/^\[PATCH[^]]*\]\s*//;
|
||||
s/^/[PATCH$num] /;
|
||||
}
|
||||
if ($headers) {
|
||||
print "$headers\n";
|
||||
}
|
||||
print "Subject: $_";
|
||||
if ($mimemagic) {
|
||||
print "MIME-Version: 1.0\n";
|
||||
print "Content-Type: multipart/mixed;\n";
|
||||
print " boundary=\"------------$mimemagic\"\n";
|
||||
print "\n";
|
||||
print "This is a multi-part message in MIME format.\n";
|
||||
print "--------------$mimemagic\n";
|
||||
print "Content-Type: text/plain; charset=UTF-8; format=fixed\n";
|
||||
print "Content-Transfer-Encoding: 8bit\n";
|
||||
}
|
||||
$done_subject = 1;
|
||||
next;
|
||||
}
|
||||
unless ($done_separator) {
|
||||
print "\n";
|
||||
$done_separator = 1;
|
||||
next if (/^$/);
|
||||
}
|
||||
|
||||
$last_was_signoff = 0;
|
||||
if (/Signed-off-by:/i) {
|
||||
if ($signoff ne "" && /Signed-off-by:\s*$signoff_pattern$/i) {
|
||||
$signoff_seen = 1;
|
||||
}
|
||||
}
|
||||
print $_;
|
||||
}
|
||||
if (!$signoff_seen && $signoff ne "") {
|
||||
if (!$last_was_signoff) {
|
||||
print "\n";
|
||||
}
|
||||
print "$signoff\n";
|
||||
}
|
||||
print "\n---\n\n";
|
||||
close FH or die "close $commsg pipe";
|
||||
' "$keep_subject" "$num" "$signoff" "$headers" "$mimemagic" $commsg
|
||||
|
||||
git-diff-tree -p --stat --summary $diff_opts "$commit"
|
||||
echo
|
||||
case "$mimemagic" in
|
||||
'');;
|
||||
*)
|
||||
echo "--------------$mimemagic"
|
||||
echo "Content-Type: text/x-patch;"
|
||||
echo " name=\"$commit.diff\""
|
||||
echo "Content-Transfer-Encoding: 8bit"
|
||||
echo "Content-Disposition: inline;"
|
||||
echo " filename=\"$commit.diff\""
|
||||
echo
|
||||
esac
|
||||
git-diff-tree -p $diff_opts "$commit"
|
||||
case "$mimemagic" in
|
||||
'')
|
||||
echo "-- "
|
||||
echo "@@GIT_VERSION@@"
|
||||
;;
|
||||
*)
|
||||
echo
|
||||
echo "--------------$mimemagic--"
|
||||
echo
|
||||
;;
|
||||
esac
|
||||
echo
|
||||
}
|
||||
|
||||
total=`wc -l <$series | tr -dc "[0-9]"`
|
||||
case "$total,$numbered" in
|
||||
1,*)
|
||||
numfmt='' ;;
|
||||
*,t)
|
||||
numfmt=`echo "$total" | wc -c`
|
||||
numfmt=$(($numfmt-1))
|
||||
numfmt=" %0${numfmt}d/$total"
|
||||
esac
|
||||
|
||||
i=1
|
||||
while read commit
|
||||
do
|
||||
git-cat-file commit "$commit" | git-stripspace >$commsg
|
||||
title=`sed -ne "$titleScript" <$commsg`
|
||||
case "$numbered" in
|
||||
'') num= ;;
|
||||
*)
|
||||
num=`printf "$numfmt" $i` ;;
|
||||
esac
|
||||
|
||||
file=`printf '%04d-%stxt' $i "$title"`
|
||||
if test '' = "$stdout"
|
||||
then
|
||||
echo "$file"
|
||||
process_one >"$outdir$file"
|
||||
if test t = "$check"
|
||||
then
|
||||
# This is slightly modified from Andrew Morton's Perfect Patch.
|
||||
# Lines you introduce should not have trailing whitespace.
|
||||
# Also check for an indentation that has SP before a TAB.
|
||||
grep -n '^+\([ ]* .*\|.*[ ]\)$' "$outdir$file"
|
||||
:
|
||||
fi
|
||||
else
|
||||
echo >&2 "$file"
|
||||
process_one
|
||||
fi
|
||||
i=`expr "$i" + 1`
|
||||
done <$series
|
||||
2
git.c
2
git.c
|
|
@ -47,7 +47,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
|
|||
{ "whatchanged", cmd_whatchanged },
|
||||
{ "show", cmd_show },
|
||||
{ "push", cmd_push },
|
||||
{ "fmt-patch", cmd_format_patch },
|
||||
{ "format-patch", cmd_format_patch },
|
||||
{ "count-objects", cmd_count_objects },
|
||||
{ "diff", cmd_diff },
|
||||
{ "grep", cmd_grep },
|
||||
|
|
|
|||
37
log-tree.c
37
log-tree.c
|
|
@ -20,7 +20,7 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
|
|||
int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
|
||||
const char *extra;
|
||||
int len;
|
||||
char* subject = NULL;
|
||||
char *subject = NULL, *after_subject = NULL;
|
||||
|
||||
opt->loginfo = NULL;
|
||||
if (!opt->verbose_header) {
|
||||
|
|
@ -52,6 +52,7 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
|
|||
*/
|
||||
|
||||
if (opt->commit_format == CMIT_FMT_EMAIL) {
|
||||
char *sha1 = sha1_to_hex(commit->object.sha1);
|
||||
if (opt->total > 0) {
|
||||
static char buffer[64];
|
||||
snprintf(buffer, sizeof(buffer),
|
||||
|
|
@ -63,8 +64,36 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
|
|||
else
|
||||
subject = "Subject: ";
|
||||
|
||||
printf("From %s Thu Apr 7 15:13:13 2005\n",
|
||||
sha1_to_hex(commit->object.sha1));
|
||||
printf("From %s Mon Sep 17 00:00:00 2001\n", sha1);
|
||||
if (opt->mime_boundary) {
|
||||
static char subject_buffer[1024];
|
||||
static char buffer[1024];
|
||||
snprintf(subject_buffer, sizeof(subject_buffer) - 1,
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: multipart/mixed;\n"
|
||||
" boundary=\"%s%s\"\n"
|
||||
"\n"
|
||||
"This is a multi-part message in MIME "
|
||||
"format.\n"
|
||||
"--%s%s\n"
|
||||
"Content-Type: text/plain; "
|
||||
"charset=UTF-8; format=fixed\n"
|
||||
"Content-Transfer-Encoding: 8bit\n\n",
|
||||
mime_boundary_leader, opt->mime_boundary,
|
||||
mime_boundary_leader, opt->mime_boundary);
|
||||
after_subject = subject_buffer;
|
||||
|
||||
snprintf(buffer, sizeof(buffer) - 1,
|
||||
"--%s%s\n"
|
||||
"Content-Type: text/x-patch;\n"
|
||||
" name=\"%s.diff\"\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Content-Disposition: inline;\n"
|
||||
" filename=\"%s.diff\"\n\n",
|
||||
mime_boundary_leader, opt->mime_boundary,
|
||||
sha1, sha1);
|
||||
opt->diffopt.stat_sep = buffer;
|
||||
}
|
||||
} else {
|
||||
printf("%s%s",
|
||||
opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
|
||||
|
|
@ -81,7 +110,7 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
|
|||
/*
|
||||
* And then the pretty-printed message itself
|
||||
*/
|
||||
len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev, subject);
|
||||
len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev, subject, after_subject);
|
||||
printf("%s%s%s", this_header, extra, sep);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ struct rev_info {
|
|||
enum cmit_fmt commit_format;
|
||||
struct log_info *loginfo;
|
||||
int nr, total;
|
||||
const char *mime_boundary;
|
||||
|
||||
/* special limits */
|
||||
int max_count;
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ static void show_one_commit(struct commit *commit, int no_name)
|
|||
struct commit_name *name = commit->object.util;
|
||||
if (commit->object.parsed)
|
||||
pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
|
||||
pretty, sizeof(pretty), 0, NULL);
|
||||
pretty, sizeof(pretty), 0, NULL, NULL);
|
||||
else
|
||||
strcpy(pretty, "(unavailable)");
|
||||
if (!strncmp(pretty, "[PATCH] ", 8))
|
||||
|
|
|
|||
Loading…
Reference in a new issue