* [PATCH 5/5] Documentation: minor grammatical fix in git-check-ref-format.txt.
From: David J. Mellor @ 2009-03-23 1:00 UTC (permalink / raw)
To: gitster; +Cc: git
In-Reply-To: <1237770017-7168-5-git-send-email-dmellor@whistlingcat.com>
Signed-off-by: David J. Mellor <dmellor@whistlingcat.com>
---
Documentation/git-check-ref-format.txt | 40 ++++++++++++++++----------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt
index 034223c..171b683 100644
--- a/Documentation/git-check-ref-format.txt
+++ b/Documentation/git-check-ref-format.txt
@@ -3,7 +3,7 @@ git-check-ref-format(1)
NAME
----
-git-check-ref-format - Make sure ref name is well formed
+git-check-ref-format - Ensures that a reference name is well formed
SYNOPSIS
--------
@@ -11,40 +11,40 @@ SYNOPSIS
DESCRIPTION
-----------
-Checks if a given 'refname' is acceptable, and exits non-zero if
-it is not.
+Checks if a given 'refname' is acceptable, and exits with a non-zero
+status if it is not.
A reference is used in git to specify branches and tags. A
-branch head is stored under `$GIT_DIR/refs/heads` directory, and
-a tag is stored under `$GIT_DIR/refs/tags` directory. git
-imposes the following rules on how refs are named:
+branch head is stored under the `$GIT_DIR/refs/heads` directory, and
+a tag is stored under the `$GIT_DIR/refs/tags` directory. git
+imposes the following rules on how references are named:
-. It can include slash `/` for hierarchical (directory)
+. They can include slash `/` for hierarchical (directory)
grouping, but no slash-separated component can begin with a
- dot `.`;
+ dot `.`.
-. It cannot have two consecutive dots `..` anywhere;
+. They cannot have two consecutive dots `..` anywhere.
-. It cannot have ASCII control character (i.e. bytes whose
+. They cannot have ASCII control characters (i.e. bytes whose
values are lower than \040, or \177 `DEL`), space, tilde `~`,
caret `{caret}`, colon `:`, question-mark `?`, asterisk `*`,
- or open bracket `[` anywhere;
+ or open bracket `[` anywhere.
-. It cannot end with a slash `/`.
+. They cannot end with a slash `/`.
-These rules makes it easy for shell script based tools to parse
-refnames, pathname expansion by the shell when a refname is used
+These rules make it easy for shell script based tools to parse
+reference names, pathname expansion by the shell when a reference name is used
unquoted (by mistake), and also avoids ambiguities in certain
-refname expressions (see linkgit:git-rev-parse[1]). Namely:
+reference name expressions (see linkgit:git-rev-parse[1]):
-. double-dot `..` are often used as in `ref1..ref2`, and in some
- context this notation means `{caret}ref1 ref2` (i.e. not in
- ref1 and in ref2).
+. A double-dot `..` is often used as in `ref1..ref2`, and in some
+ contexts this notation means `{caret}ref1 ref2` (i.e. not in
+ `ref1` and in `ref2`).
-. tilde `~` and caret `{caret}` are used to introduce postfix
+. A tilde `~` and caret `{caret}` are used to introduce the postfix
'nth parent' and 'peel onion' operation.
-. colon `:` is used as in `srcref:dstref` to mean "use srcref\'s
+. A colon `:` is used as in `srcref:dstref` to mean "use srcref\'s
value and store it in dstref" in fetch and push operations.
It may also be used to select a specific object such as with
'git-cat-file': "git cat-file blob v1.3.3:refs.c".
--
1.6.2.1
^ permalink raw reply related
* Re: [PATCH 3/4] builtin-fast-export.c: fix crash on tagged trees
From: Erik Faye-Lund @ 2009-03-23 1:01 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Erik Faye-Lund, git
In-Reply-To: <7vab7d9in4.fsf@gitster.siamese.dyndns.org>
> The comment is good but only if you make this the last patch that comes
> after the one that actually fixes the tag-to-tag (currently 4/4), no?
Ah, good catch! I'll reorder the commits. The order of the last two
patches isn't really important, so if it makes the comment more
senseful, I'm all for it ;)
--
Erik "kusma" Faye-Lund
kusmabite@gmail.com
(+47) 986 59 656
^ permalink raw reply
* Summer of Code - Cached Packs/Object Lists
From: thisnukes4u @ 2009-03-23 1:53 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 1019 bytes --]
Hey list,
My name is Thomas Coppi, and I am a junior studying Computer Science at New Mexico Tech. I've been using git for a few years now for managing coursework and personal projects, but have never looked much into the git source code or internals, so I figure that Summer of Code is a good way to get started.
I am particularly interested in the packfile caching project mentioned on the wiki, but I have a couple of questions:
1. Would it be possible to implement both the packfile and object list caching mechanisms, or might would one interfere with the other in some way?
2. With just a quick perusal of the daemon source, I noticed that it shells out to the upload-pack command. Where would it be appropriate to implement such a caching mechanism, in the daemon proper, the upload-pack code, or would both need to be updated?
Thanks in advance, and sorry if my questions seem a little bit newbish, as I mentioned this is my first time diving into git internals.
--
Thomas Coppi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 271 bytes --]
^ permalink raw reply
* Re: Summer of Code - Cached Packs/Object Lists
From: Shawn O. Pearce @ 2009-03-23 1:59 UTC (permalink / raw)
To: thisnukes4u; +Cc: git
In-Reply-To: <fsmi80et2dp57f5bdxUYAxe124vaj_firegpg@mail.gmail.com>
Please line wrap your email at something useful to others when
quoting, like 70-72 characters per line.
thisnukes4u@gmail.com wrote:
> I am particularly interested in the packfile caching project
> mentioned on the wiki, but I have a couple of questions:
>
> 1. Would it be possible to implement both the packfile and
> object list caching mechanisms, or might would one interfere with
> the other in some way?
You could do both. But I think most people on the list will argue
that doing both is overkill and only one is necessary, and further,
that only the one that offers the "biggest bank for the buck"
should be implemented.
Whole pack file caching has been discussed on list a few times as a
nice feature to have, but it raises some issues of cache management,
not to mention the issue I posed about it being relatively useless
on frequently changing repositories.
> 2. With just a quick perusal of the daemon source, I noticed
> that it shells out to the upload-pack command. Where would it be
> appropriate to implement such a caching mechanism, in the daemon
> proper, the upload-pack code, or would both need to be updated?
The daemon doesn't get enough data from the client in order to
perform any sort of caching.
So the caching has to happen in upload-pack, and/or pack-objects.
(upload-pack forks out to pack-objects to create the pack file to
send to the client)
--
Shawn.
^ permalink raw reply
* [PATCHv3 0/6] format-patch --attach/--inline uses filename not SHA1
From: Stephen Boyd @ 2009-03-23 2:14 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
In-Reply-To: <1237696363-6819-1-git-send-email-bebarino@gmail.com>
This patch series modifies the behavior of format-patch when used with the
--attach or --inline command line settings. Current behavior names the attached
or inlined patches with the SHA1 of the commit, which isn't very friendly or
easy for a human to use when downloading the attachments. This series replaces
the SHA1 values with the filename used by format-patch when it outputs the
patches to files.
New features in this version:
- %f format specifier exposing sanitized filenames to porcelain
- get_patch_filename() moved to log-tree
Stephen Boyd (6):
pretty.c: add %f format specifier to format_commit_message()
format-patch: construct patch filename in one function
format-patch: pass a commit to reopen_stdout()
format-patch: move get_patch_filename() into log-tree
format-patch: --attach/inline uses filename instead of SHA1
format-patch: --numbered-files and --stdout aren't mutually exclusive
Documentation/pretty-formats.txt | 1 +
builtin-log.c | 132 +++++----------
log-tree.c | 41 ++++-
log-tree.h | 6 +-
pretty.c | 38 +++++
revision.h | 2 +
t/t4013-diff-various.sh | 3 +-
..._--attach_--stdout_--suffix=.diff_initial..side | 61 +++++++
....format-patch_--attach_--stdout_initial..master | 12 +-
...format-patch_--attach_--stdout_initial..master^ | 8 +-
...ff.format-patch_--attach_--stdout_initial..side | 4 +-
...nline_--stdout_--numbered-files_initial..master | 170 ++++++++++++++++++++
...tdout_--subject-prefix=TESTCASE_initial..master | 12 +-
....format-patch_--inline_--stdout_initial..master | 12 +-
...format-patch_--inline_--stdout_initial..master^ | 8 +-
...ormat-patch_--inline_--stdout_initial..master^^ | 4 +-
...ff.format-patch_--inline_--stdout_initial..side | 4 +-
17 files changed, 389 insertions(+), 129 deletions(-)
create mode 100644 t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side
create mode 100644 t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master
^ permalink raw reply
* [PATCHv3 1/6] pretty.c: add %f format specifier to format_commit_message()
From: Stephen Boyd @ 2009-03-23 2:14 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
In-Reply-To: <cover.1237773604.git.bebarino@gmail.com>
This specifier represents the sanitized and filename friendly subject
line of a commit. No checks are made against the length of the string,
so users may need to trim the result to the desired length if using as a
filename. This is commonly used by format-patch to massage commit
subjects into filenames and output patches to files.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
Documentation/pretty-formats.txt | 1 +
pretty.c | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 5c6e678..2a845b1 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -121,6 +121,7 @@ The placeholders are:
- '%d': ref names, like the --decorate option of linkgit:git-log[1]
- '%e': encoding
- '%s': subject
+- '%f': sanitized subject line, suitable for a filename
- '%b': body
- '%Cred': switch color to red
- '%Cgreen': switch color to green
diff --git a/pretty.c b/pretty.c
index efa7024..97de415 100644
--- a/pretty.c
+++ b/pretty.c
@@ -493,6 +493,41 @@ static void parse_commit_header(struct format_commit_context *context)
context->commit_header_parsed = 1;
}
+static int istitlechar(char c)
+{
+ return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
+ (c >= '0' && c <= '9') || c == '.' || c == '_';
+}
+
+static void format_sanitized_subject(struct strbuf *sb, const char *msg)
+{
+ size_t trimlen;
+ int space = 0;
+
+ for (; *msg && *msg != '\n'; msg++) {
+ if (istitlechar(*msg))
+ {
+ if (space) {
+ strbuf_addch(sb, '-');
+ space = 0;
+ }
+ strbuf_addch(sb, *msg);
+ if (*msg == '.')
+ while (*(msg+1) == '.')
+ msg++;
+ }
+ else
+ space = 1;
+ }
+
+ // trim any trailing '.' or '-' characters
+ trimlen = 0;
+ while (sb->buf[sb->len - 1 - trimlen] == '.'
+ || sb->buf[sb->len - 1 - trimlen] == '-')
+ trimlen++;
+ strbuf_remove(sb, sb->len - trimlen, trimlen);
+}
+
const char *format_subject(struct strbuf *sb, const char *msg,
const char *line_separator)
{
@@ -683,6 +718,9 @@ static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
case 's': /* subject */
format_subject(sb, msg + c->subject_off, " ");
return 1;
+ case 'f': /* sanitized subject */
+ format_sanitized_subject(sb, msg + c->subject_off);
+ return 1;
case 'b': /* body */
strbuf_addstr(sb, msg + c->body_off);
return 1;
--
1.6.2
^ permalink raw reply related
* [PATCHv3 3/6] format-patch: pass a commit to reopen_stdout()
From: Stephen Boyd @ 2009-03-23 2:14 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
In-Reply-To: <616420f398701fafc45b5d5cebb1371534f88caa.1237773604.git.bebarino@gmail.com>
We use the commit to generate the patch filename in reopen_stdout()
before we redirect stdout. The cover letter codepath creates a dummy
commit with the desired subject line 'cover letter'.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
builtin-log.c | 68 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 40 insertions(+), 28 deletions(-)
diff --git a/builtin-log.c b/builtin-log.c
index 54ef248..392b16a 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -540,30 +540,29 @@ static FILE *realstdout = NULL;
static const char *output_directory = NULL;
static int outdir_offset;
-static int reopen_stdout(const char *oneline, struct rev_info *rev)
+static int reopen_stdout(struct commit *commit, struct rev_info *rev)
{
- char filename[PATH_MAX];
- int len = 0;
+ struct strbuf filename = STRBUF_INIT;
int suffix_len = strlen(fmt_patch_suffix) + 1;
if (output_directory) {
- len = snprintf(filename, sizeof(filename), "%s",
- output_directory);
- if (len >=
- sizeof(filename) - FORMAT_PATCH_NAME_MAX - suffix_len)
+ strbuf_addstr(&filename, output_directory);
+ if (filename.len >=
+ PATH_MAX - FORMAT_PATCH_NAME_MAX - suffix_len)
return error("name of output directory is too long");
- if (filename[len - 1] != '/')
- filename[len++] = '/';
+ if (filename.buf[filename.len - 1] != '/')
+ strbuf_addch(&filename, '/');
}
- strncpy(filename + len, oneline, PATH_MAX - len);
+ get_patch_filename(commit, rev->nr, fmt_patch_suffix, &filename);
if (!DIFF_OPT_TST(&rev->diffopt, QUIET))
- fprintf(realstdout, "%s\n", filename + outdir_offset);
+ fprintf(realstdout, "%s\n", filename.buf + outdir_offset);
- if (freopen(filename, "w", stdout) == NULL)
- return error("Cannot open patch file %s",filename);
+ if (freopen(filename.buf, "w", stdout) == NULL)
+ return error("Cannot open patch file %s", filename.buf);
+ strbuf_release(&filename);
return 0;
}
@@ -644,26 +643,43 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
const char *encoding = "utf-8";
struct diff_options opts;
int need_8bit_cte = 0;
- char filename[PATH_MAX];
+ struct commit *commit = NULL;
if (rev->commit_format != CMIT_FMT_EMAIL)
die("Cover letter needs email format");
- if (numbered_files)
- sprintf(filename, "0");
- else
- sprintf(filename, "%04d-cover-letter%s", 0, fmt_patch_suffix);
+ committer = git_committer_info(0);
+ head_sha1 = sha1_to_hex(head->object.sha1);
+
+ if (!numbered_files)
+ {
+ /*
+ * We fake a commit for the cover letter so we get the filename
+ * desired.
+ */
+ commit = xcalloc(1, sizeof(*commit));
+ commit->buffer = xmalloc(400);
+ snprintf(commit->buffer, 400,
+ "tree 0000000000000000000000000000000000000000\n"
+ "parent %s\n"
+ "author %s\n"
+ "committer %s\n\n"
+ "cover letter\n",
+ head_sha1, committer, committer);
+ }
- if (!use_stdout && reopen_stdout(filename, rev))
+ if (!use_stdout && reopen_stdout(commit, rev))
return;
- head_sha1 = sha1_to_hex(head->object.sha1);
+ if (commit)
+ {
+ free(commit->buffer);
+ free(commit);
+ }
log_write_email_headers(rev, head_sha1, &subject_start, &extra_headers,
&need_8bit_cte);
- committer = git_committer_info(0);
-
msg = body;
pp_user_info(NULL, CMIT_FMT_EMAIL, &sb, committer, DATE_RFC2822,
encoding);
@@ -767,7 +783,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
struct patch_ids ids;
char *add_signoff = NULL;
struct strbuf buf = STRBUF_INIT;
- struct strbuf patch_filename = STRBUF_INIT;
git_config(git_format_config, NULL);
init_revisions(&rev, prefix);
@@ -1071,11 +1086,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
gen_message_id(&rev, sha1_to_hex(commit->object.sha1));
}
- get_patch_filename(numbered_files ? NULL : commit, rev.nr,
- fmt_patch_suffix, &patch_filename);
- if (!use_stdout && reopen_stdout(patch_filename.buf, &rev))
+ if (!use_stdout && reopen_stdout(numbered_files ? NULL : commit,
+ &rev))
die("Failed to create output files");
- strbuf_setlen(&patch_filename, 0);
shown = log_tree_commit(&rev, commit);
free(commit->buffer);
commit->buffer = NULL;
@@ -1099,7 +1112,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (!use_stdout)
fclose(stdout);
}
- strbuf_release(&patch_filename);
free(list);
if (ignore_if_in_upstream)
free_patch_ids(&ids);
--
1.6.2
^ permalink raw reply related
* [PATCHv3 2/6] format-patch: construct patch filename in one function
From: Stephen Boyd @ 2009-03-23 2:14 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
In-Reply-To: <baa327d88b54efae40b6d9df09a2fe482672101e.1237773604.git.bebarino@gmail.com>
reopen_stdout() usually takes the oneline subject of a commit,
appends the patch suffix, prepends the output directory (if any) and
then reopens stdout as the resulting file. Now the patch filename (the
oneline subject and the patch suffix) is created in
get_patch_filename() and passed to reopen_stdout() which prepends the
output directory and reopens stdout as that file.
The original function to get the oneline description,
get_oneline_for_filename(), has been renamed to get_patch_filename() to
reflect its new functionality.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
builtin-log.c | 99 +++++++++++++++++++-------------------------------------
1 files changed, 34 insertions(+), 65 deletions(-)
diff --git a/builtin-log.c b/builtin-log.c
index c7a5772..54ef248 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -419,12 +419,6 @@ int cmd_log(int argc, const char **argv, const char *prefix)
/* format-patch */
#define FORMAT_PATCH_NAME_MAX 64
-static int istitlechar(char c)
-{
- return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
- (c >= '0' && c <= '9') || c == '.' || c == '_';
-}
-
static const char *fmt_patch_suffix = ".patch";
static int numbered = 0;
static int auto_number = 1;
@@ -519,61 +513,34 @@ static int git_format_config(const char *var, const char *value, void *cb)
}
-static const char *get_oneline_for_filename(struct commit *commit,
- int keep_subject)
+static void get_patch_filename(struct commit *commit, int nr,
+ const char *suffix, struct strbuf *buf)
{
- static char filename[PATH_MAX];
- char *sol;
- int len = 0;
- int suffix_len = strlen(fmt_patch_suffix) + 1;
-
- sol = strstr(commit->buffer, "\n\n");
- if (!sol)
- filename[0] = '\0';
- else {
- int j, space = 0;
-
- sol += 2;
- /* strip [PATCH] or [PATCH blabla] */
- if (!keep_subject && !prefixcmp(sol, "[PATCH")) {
- char *eos = strchr(sol + 6, ']');
- if (eos) {
- while (isspace(*eos))
- eos++;
- sol = eos;
- }
- }
+ int suffix_len = strlen(suffix) + 1;
+ int start_len = buf->len;
- for (j = 0;
- j < FORMAT_PATCH_NAME_MAX - suffix_len - 5 &&
- len < sizeof(filename) - suffix_len &&
- sol[j] && sol[j] != '\n';
- j++) {
- if (istitlechar(sol[j])) {
- if (space) {
- filename[len++] = '-';
- space = 0;
- }
- filename[len++] = sol[j];
- if (sol[j] == '.')
- while (sol[j + 1] == '.')
- j++;
- } else
- space = 1;
- }
- while (filename[len - 1] == '.'
- || filename[len - 1] == '-')
- len--;
- filename[len] = '\0';
+ strbuf_addf(buf, commit ? "%04d-" : "%d", nr);
+ if (commit)
+ {
+ format_commit_message(commit, "%f", buf, DATE_NORMAL);
+ /*
+ * Replace characters at the end with the suffix if the the
+ * filename is too long
+ */
+ if (buf->len + suffix_len > FORMAT_PATCH_NAME_MAX + start_len)
+ strbuf_splice(buf,
+ start_len + FORMAT_PATCH_NAME_MAX - suffix_len,
+ suffix_len, suffix, suffix_len);
+ else
+ strbuf_addstr(buf, suffix);
}
- return filename;
}
static FILE *realstdout = NULL;
static const char *output_directory = NULL;
static int outdir_offset;
-static int reopen_stdout(const char *oneline, int nr, struct rev_info *rev)
+static int reopen_stdout(const char *oneline, struct rev_info *rev)
{
char filename[PATH_MAX];
int len = 0;
@@ -589,14 +556,7 @@ static int reopen_stdout(const char *oneline, int nr, struct rev_info *rev)
filename[len++] = '/';
}
- if (!oneline)
- len += sprintf(filename + len, "%d", nr);
- else {
- len += sprintf(filename + len, "%04d-", nr);
- len += snprintf(filename + len, sizeof(filename) - len - 1
- - suffix_len, "%s", oneline);
- strcpy(filename + len, fmt_patch_suffix);
- }
+ strncpy(filename + len, oneline, PATH_MAX - len);
if (!DIFF_OPT_TST(&rev->diffopt, QUIET))
fprintf(realstdout, "%s\n", filename + outdir_offset);
@@ -684,12 +644,17 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
const char *encoding = "utf-8";
struct diff_options opts;
int need_8bit_cte = 0;
+ char filename[PATH_MAX];
if (rev->commit_format != CMIT_FMT_EMAIL)
die("Cover letter needs email format");
- if (!use_stdout && reopen_stdout(numbered_files ?
- NULL : "cover-letter", 0, rev))
+ if (numbered_files)
+ sprintf(filename, "0");
+ else
+ sprintf(filename, "%04d-cover-letter%s", 0, fmt_patch_suffix);
+
+ if (!use_stdout && reopen_stdout(filename, rev))
return;
head_sha1 = sha1_to_hex(head->object.sha1);
@@ -802,6 +767,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
struct patch_ids ids;
char *add_signoff = NULL;
struct strbuf buf = STRBUF_INIT;
+ struct strbuf patch_filename = STRBUF_INIT;
git_config(git_format_config, NULL);
init_revisions(&rev, prefix);
@@ -1104,10 +1070,12 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
}
gen_message_id(&rev, sha1_to_hex(commit->object.sha1));
}
- if (!use_stdout && reopen_stdout(numbered_files ? NULL :
- get_oneline_for_filename(commit, keep_subject),
- rev.nr, &rev))
+
+ get_patch_filename(numbered_files ? NULL : commit, rev.nr,
+ fmt_patch_suffix, &patch_filename);
+ if (!use_stdout && reopen_stdout(patch_filename.buf, &rev))
die("Failed to create output files");
+ strbuf_setlen(&patch_filename, 0);
shown = log_tree_commit(&rev, commit);
free(commit->buffer);
commit->buffer = NULL;
@@ -1131,6 +1099,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (!use_stdout)
fclose(stdout);
}
+ strbuf_release(&patch_filename);
free(list);
if (ignore_if_in_upstream)
free_patch_ids(&ids);
--
1.6.2
^ permalink raw reply related
* [PATCHv3 4/6] format-patch: move get_patch_filename() into log-tree
From: Stephen Boyd @ 2009-03-23 2:14 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
In-Reply-To: <00c4e51c2ff7786be6aedb4a451b8d1ff269d7b3.1237773604.git.bebarino@gmail.com>
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
builtin-log.c | 25 -------------------------
log-tree.c | 23 +++++++++++++++++++++++
log-tree.h | 4 ++++
3 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/builtin-log.c b/builtin-log.c
index 392b16a..a8d6037 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -417,7 +417,6 @@ int cmd_log(int argc, const char **argv, const char *prefix)
}
/* format-patch */
-#define FORMAT_PATCH_NAME_MAX 64
static const char *fmt_patch_suffix = ".patch";
static int numbered = 0;
@@ -512,30 +511,6 @@ static int git_format_config(const char *var, const char *value, void *cb)
return git_log_config(var, value, cb);
}
-
-static void get_patch_filename(struct commit *commit, int nr,
- const char *suffix, struct strbuf *buf)
-{
- int suffix_len = strlen(suffix) + 1;
- int start_len = buf->len;
-
- strbuf_addf(buf, commit ? "%04d-" : "%d", nr);
- if (commit)
- {
- format_commit_message(commit, "%f", buf, DATE_NORMAL);
- /*
- * Replace characters at the end with the suffix if the the
- * filename is too long
- */
- if (buf->len + suffix_len > FORMAT_PATCH_NAME_MAX + start_len)
- strbuf_splice(buf,
- start_len + FORMAT_PATCH_NAME_MAX - suffix_len,
- suffix_len, suffix, suffix_len);
- else
- strbuf_addstr(buf, suffix);
- }
-}
-
static FILE *realstdout = NULL;
static const char *output_directory = NULL;
static int outdir_offset;
diff --git a/log-tree.c b/log-tree.c
index 9565c18..9a790ab 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -179,6 +179,29 @@ static int has_non_ascii(const char *s)
return 0;
}
+void get_patch_filename(struct commit *commit, int nr, const char *suffix,
+ struct strbuf *buf)
+{
+ int suffix_len = strlen(suffix) + 1;
+ int start_len = buf->len;
+
+ strbuf_addf(buf, commit ? "%04d-" : "%d", nr);
+ if (commit)
+ {
+ format_commit_message(commit, "%f", buf, DATE_NORMAL);
+ /*
+ * Replace characters at the end with the suffix if the the
+ * filename is too long
+ */
+ if (buf->len + suffix_len > FORMAT_PATCH_NAME_MAX + start_len)
+ strbuf_splice(buf,
+ start_len + FORMAT_PATCH_NAME_MAX - suffix_len,
+ suffix_len, suffix, suffix_len);
+ else
+ strbuf_addstr(buf, suffix);
+ }
+}
+
void log_write_email_headers(struct rev_info *opt, const char *name,
const char **subject_p,
const char **extra_headers_p,
diff --git a/log-tree.h b/log-tree.h
index f2a9008..78dc5be 100644
--- a/log-tree.h
+++ b/log-tree.h
@@ -19,4 +19,8 @@ void log_write_email_headers(struct rev_info *opt, const char *name,
int *need_8bit_cte_p);
void load_ref_decorations(void);
+#define FORMAT_PATCH_NAME_MAX 64
+void get_patch_filename(struct commit *commit, int nr, const char *suffix,
+ struct strbuf *buf);
+
#endif
--
1.6.2
^ permalink raw reply related
* [PATCHv3 5/6] format-patch: --attach/inline uses filename instead of SHA1
From: Stephen Boyd @ 2009-03-23 2:14 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
In-Reply-To: <e8e0dcc738decb5f70dbc8e835263d7dc2834407.1237773604.git.bebarino@gmail.com>
Currently when format-patch is used with --attach or --inline the patch
attachment has the SHA1 of the commit for its filename. This replaces
the SHA1 with the filename used by format-patch when outputting to
files.
Fix tests relying on the SHA1 output and add a test showing how the
--suffix option affects the attachment filename output.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
builtin-log.c | 8 +-
log-tree.c | 18 ++++--
log-tree.h | 2 +-
revision.h | 2 +
t/t4013-diff-various.sh | 1 +
..._--attach_--stdout_--suffix=.diff_initial..side | 61 ++++++++++++++++++++
....format-patch_--attach_--stdout_initial..master | 12 ++--
...format-patch_--attach_--stdout_initial..master^ | 8 +-
...ff.format-patch_--attach_--stdout_initial..side | 4 +-
...tdout_--subject-prefix=TESTCASE_initial..master | 12 ++--
....format-patch_--inline_--stdout_initial..master | 12 ++--
...format-patch_--inline_--stdout_initial..master^ | 8 +-
...ormat-patch_--inline_--stdout_initial..master^^ | 4 +-
...ff.format-patch_--inline_--stdout_initial..side | 4 +-
14 files changed, 112 insertions(+), 44 deletions(-)
create mode 100644 t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side
diff --git a/builtin-log.c b/builtin-log.c
index a8d6037..83d8c03 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -607,7 +607,6 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
int nr, struct commit **list, struct commit *head)
{
const char *committer;
- char *head_sha1;
const char *subject_start = NULL;
const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
const char *msg;
@@ -624,7 +623,6 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
die("Cover letter needs email format");
committer = git_committer_info(0);
- head_sha1 = sha1_to_hex(head->object.sha1);
if (!numbered_files)
{
@@ -640,7 +638,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
"author %s\n"
"committer %s\n\n"
"cover letter\n",
- head_sha1, committer, committer);
+ sha1_to_hex(head->object.sha1), committer, committer);
}
if (!use_stdout && reopen_stdout(commit, rev))
@@ -652,7 +650,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
free(commit);
}
- log_write_email_headers(rev, head_sha1, &subject_start, &extra_headers,
+ log_write_email_headers(rev, head, &subject_start, &extra_headers,
&need_8bit_cte);
msg = body;
@@ -1012,6 +1010,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
const char *msgid = clean_message_id(in_reply_to);
string_list_append(msgid, rev.ref_message_ids);
}
+ rev.numbered_files = numbered_files;
+ rev.patch_suffix = fmt_patch_suffix;
if (cover_letter) {
if (thread)
gen_message_id(&rev, "cover");
diff --git a/log-tree.c b/log-tree.c
index 9a790ab..5c9e2cf 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -202,13 +202,14 @@ void get_patch_filename(struct commit *commit, int nr, const char *suffix,
}
}
-void log_write_email_headers(struct rev_info *opt, const char *name,
+void log_write_email_headers(struct rev_info *opt, struct commit *commit,
const char **subject_p,
const char **extra_headers_p,
int *need_8bit_cte_p)
{
const char *subject = NULL;
const char *extra_headers = opt->extra_headers;
+ const char *name = sha1_to_hex(commit->object.sha1);
*need_8bit_cte_p = 0; /* unknown */
if (opt->total > 0) {
@@ -247,6 +248,7 @@ void log_write_email_headers(struct rev_info *opt, const char *name,
if (opt->mime_boundary) {
static char subject_buffer[1024];
static char buffer[1024];
+ struct strbuf filename = STRBUF_INIT;
*need_8bit_cte_p = -1; /* NEVER */
snprintf(subject_buffer, sizeof(subject_buffer) - 1,
"%s"
@@ -265,18 +267,21 @@ void log_write_email_headers(struct rev_info *opt, const char *name,
mime_boundary_leader, opt->mime_boundary);
extra_headers = subject_buffer;
+ get_patch_filename(opt->numbered_files ? NULL : commit, opt->nr,
+ opt->patch_suffix, &filename);
snprintf(buffer, sizeof(buffer) - 1,
"\n--%s%s\n"
"Content-Type: text/x-patch;"
- " name=\"%s.diff\"\n"
+ " name=\"%s\"\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Disposition: %s;"
- " filename=\"%s.diff\"\n\n",
+ " filename=\"%s\"\n\n",
mime_boundary_leader, opt->mime_boundary,
- name,
+ filename.buf,
opt->no_inline ? "attachment" : "inline",
- name);
+ filename.buf);
opt->diffopt.stat_sep = buffer;
+ strbuf_release(&filename);
}
*subject_p = subject;
*extra_headers_p = extra_headers;
@@ -356,8 +361,7 @@ void show_log(struct rev_info *opt)
*/
if (opt->commit_format == CMIT_FMT_EMAIL) {
- log_write_email_headers(opt, sha1_to_hex(commit->object.sha1),
- &subject, &extra_headers,
+ log_write_email_headers(opt, commit, &subject, &extra_headers,
&need_8bit_cte);
} else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
diff --git a/log-tree.h b/log-tree.h
index 78dc5be..20b5caf 100644
--- a/log-tree.h
+++ b/log-tree.h
@@ -13,7 +13,7 @@ int log_tree_commit(struct rev_info *, struct commit *);
int log_tree_opt_parse(struct rev_info *, const char **, int);
void show_log(struct rev_info *opt);
void show_decorations(struct rev_info *opt, struct commit *commit);
-void log_write_email_headers(struct rev_info *opt, const char *name,
+void log_write_email_headers(struct rev_info *opt, struct commit *commit,
const char **subject_p,
const char **extra_headers_p,
int *need_8bit_cte_p);
diff --git a/revision.h b/revision.h
index ad123d7..5259ed5 100644
--- a/revision.h
+++ b/revision.h
@@ -86,6 +86,8 @@ struct rev_info {
struct log_info *loginfo;
int nr, total;
const char *mime_boundary;
+ const char *patch_suffix;
+ int numbered_files;
char *message_id;
struct string_list *ref_message_ids;
const char *add_signoff;
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 426e64e..6592a4f 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -246,6 +246,7 @@ format-patch --stdout initial..master
format-patch --stdout --no-numbered initial..master
format-patch --stdout --numbered initial..master
format-patch --attach --stdout initial..side
+format-patch --attach --stdout --suffix=.diff initial..side
format-patch --attach --stdout initial..master^
format-patch --attach --stdout initial..master
format-patch --inline --stdout initial..side
diff --git a/t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side b/t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side
new file mode 100644
index 0000000..52116d3
--- /dev/null
+++ b/t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side
@@ -0,0 +1,61 @@
+$ git format-patch --attach --stdout --suffix=.diff initial..side
+From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Mon, 26 Jun 2006 00:03:00 +0000
+Subject: [PATCH] Side
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"
+
+This is a multi-part message in MIME format.
+--------------g-i-t--v-e-r-s-i-o-n
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+---
+ dir/sub | 2 ++
+ file0 | 3 +++
+ file3 | 4 ++++
+ 3 files changed, 9 insertions(+), 0 deletions(-)
+ create mode 100644 file3
+
+
+--------------g-i-t--v-e-r-s-i-o-n
+Content-Type: text/x-patch; name="0001-Side.diff"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment; filename="0001-Side.diff"
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..7289e35 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++1
++2
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,4 @@
++A
++B
++1
++2
+
+--------------g-i-t--v-e-r-s-i-o-n--
+
+
+$
diff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master b/t/t4013/diff.format-patch_--attach_--stdout_initial..master
index e5ab744..ce49bd6 100644
--- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master
+++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..master
@@ -22,9 +22,9 @@ This is the second commit.
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
+Content-Type: text/x-patch; name="0001-Second.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment; filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
+Content-Disposition: attachment; filename="0001-Second.patch"
diff --git a/dir/sub b/dir/sub
index 35d242b..8422d40 100644
@@ -80,9 +80,9 @@ Content-Transfer-Encoding: 8bit
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
+Content-Type: text/x-patch; name="0002-Third.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment; filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
+Content-Disposition: attachment; filename="0002-Third.patch"
diff --git a/dir/sub b/dir/sub
index 8422d40..cead32e 100644
@@ -129,9 +129,9 @@ Content-Transfer-Encoding: 8bit
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
+Content-Type: text/x-patch; name="0003-Side.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment; filename="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
+Content-Disposition: attachment; filename="0003-Side.patch"
diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
diff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^ b/t/t4013/diff.format-patch_--attach_--stdout_initial..master^
index 2c71d20..5f1b238 100644
--- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^
+++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..master^
@@ -22,9 +22,9 @@ This is the second commit.
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
+Content-Type: text/x-patch; name="0001-Second.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment; filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
+Content-Disposition: attachment; filename="0001-Second.patch"
diff --git a/dir/sub b/dir/sub
index 35d242b..8422d40 100644
@@ -80,9 +80,9 @@ Content-Transfer-Encoding: 8bit
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
+Content-Type: text/x-patch; name="0002-Third.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment; filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
+Content-Disposition: attachment; filename="0002-Third.patch"
diff --git a/dir/sub b/dir/sub
index 8422d40..cead32e 100644
diff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..side b/t/t4013/diff.format-patch_--attach_--stdout_initial..side
index 38f7902..4a2364a 100644
--- a/t/t4013/diff.format-patch_--attach_--stdout_initial..side
+++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..side
@@ -20,9 +20,9 @@ Content-Transfer-Encoding: 8bit
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
+Content-Type: text/x-patch; name="0001-Side.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment; filename="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
+Content-Disposition: attachment; filename="0001-Side.patch"
diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master
index 58f8a7b..ca3f60b 100644
--- a/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master
+++ b/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master
@@ -22,9 +22,9 @@ This is the second commit.
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
+Content-Type: text/x-patch; name="0001-Second.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: inline; filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
+Content-Disposition: inline; filename="0001-Second.patch"
diff --git a/dir/sub b/dir/sub
index 35d242b..8422d40 100644
@@ -80,9 +80,9 @@ Content-Transfer-Encoding: 8bit
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
+Content-Type: text/x-patch; name="0002-Third.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: inline; filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
+Content-Disposition: inline; filename="0002-Third.patch"
diff --git a/dir/sub b/dir/sub
index 8422d40..cead32e 100644
@@ -129,9 +129,9 @@ Content-Transfer-Encoding: 8bit
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
+Content-Type: text/x-patch; name="0003-Side.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: inline; filename="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
+Content-Disposition: inline; filename="0003-Side.patch"
diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_initial..master
index 9e7bbdf..08f2301 100644
--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master
+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master
@@ -22,9 +22,9 @@ This is the second commit.
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
+Content-Type: text/x-patch; name="0001-Second.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: inline; filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
+Content-Disposition: inline; filename="0001-Second.patch"
diff --git a/dir/sub b/dir/sub
index 35d242b..8422d40 100644
@@ -80,9 +80,9 @@ Content-Transfer-Encoding: 8bit
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
+Content-Type: text/x-patch; name="0002-Third.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: inline; filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
+Content-Disposition: inline; filename="0002-Third.patch"
diff --git a/dir/sub b/dir/sub
index 8422d40..cead32e 100644
@@ -129,9 +129,9 @@ Content-Transfer-Encoding: 8bit
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
+Content-Type: text/x-patch; name="0003-Side.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: inline; filename="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
+Content-Disposition: inline; filename="0003-Side.patch"
diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^
index f881f64..07f1230 100644
--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^
+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^
@@ -22,9 +22,9 @@ This is the second commit.
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
+Content-Type: text/x-patch; name="0001-Second.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: inline; filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
+Content-Disposition: inline; filename="0001-Second.patch"
diff --git a/dir/sub b/dir/sub
index 35d242b..8422d40 100644
@@ -80,9 +80,9 @@ Content-Transfer-Encoding: 8bit
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
+Content-Type: text/x-patch; name="0002-Third.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: inline; filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
+Content-Disposition: inline; filename="0002-Third.patch"
diff --git a/dir/sub b/dir/sub
index 8422d40..cead32e 100644
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^
index 4f258b8..29e00ab 100644
--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^
+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^
@@ -22,9 +22,9 @@ This is the second commit.
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
+Content-Type: text/x-patch; name="0001-Second.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: inline; filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
+Content-Disposition: inline; filename="0001-Second.patch"
diff --git a/dir/sub b/dir/sub
index 35d242b..8422d40 100644
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..side b/t/t4013/diff.format-patch_--inline_--stdout_initial..side
index e86dce6..67633d4 100644
--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..side
+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..side
@@ -20,9 +20,9 @@ Content-Transfer-Encoding: 8bit
--------------g-i-t--v-e-r-s-i-o-n
-Content-Type: text/x-patch; name="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
+Content-Type: text/x-patch; name="0001-Side.patch"
Content-Transfer-Encoding: 8bit
-Content-Disposition: inline; filename="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
+Content-Disposition: inline; filename="0001-Side.patch"
diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
--
1.6.2
^ permalink raw reply related
* [PATCHv3 6/6] format-patch: --numbered-files and --stdout aren't mutually exclusive
From: Stephen Boyd @ 2009-03-23 2:14 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
In-Reply-To: <bb1484f1a621238d8689e471cc6affd8590cd382.1237773604.git.bebarino@gmail.com>
For example:
git format-patch --numbered-files --stdout --attach HEAD~~
will create two messages with files 1 and 2 attached respectively.
There is no effect when using --numbered-files and --stdout together
without an --attach or --inline, the --numbered-files option will be
ignored. Add a test to show this.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
t/t4013-diff-various.sh | 2 +-
...nline_--stdout_--numbered-files_initial..master | 170 ++++++++++++++++++++
2 files changed, 171 insertions(+), 1 deletions(-)
create mode 100644 t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 6592a4f..8b33321 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -251,7 +251,7 @@ format-patch --attach --stdout initial..master^
format-patch --attach --stdout initial..master
format-patch --inline --stdout initial..side
format-patch --inline --stdout initial..master^
-format-patch --inline --stdout initial..master
+format-patch --inline --stdout --numbered-files initial..master
format-patch --inline --stdout initial..master
format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
config format.subjectprefix DIFFERENT_PREFIX
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master
new file mode 100644
index 0000000..43b81eb
--- /dev/null
+++ b/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master
@@ -0,0 +1,170 @@
+$ git format-patch --inline --stdout --numbered-files initial..master
+From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Mon, 26 Jun 2006 00:01:00 +0000
+Subject: [PATCH 1/3] Second
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"
+
+This is a multi-part message in MIME format.
+--------------g-i-t--v-e-r-s-i-o-n
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+
+This is the second commit.
+---
+ dir/sub | 2 ++
+ file0 | 3 +++
+ file2 | 3 ---
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+ delete mode 100644 file2
+
+
+--------------g-i-t--v-e-r-s-i-o-n
+Content-Type: text/x-patch; name="1"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="1"
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..8422d40 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++C
++D
+diff --git a/file0 b/file0
+index 01e79c3..b414108 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++4
++5
++6
+diff --git a/file2 b/file2
+deleted file mode 100644
+index 01e79c3..0000000
+--- a/file2
++++ /dev/null
+@@ -1,3 +0,0 @@
+-1
+-2
+-3
+
+--------------g-i-t--v-e-r-s-i-o-n--
+
+
+
+From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Mon, 26 Jun 2006 00:02:00 +0000
+Subject: [PATCH 2/3] Third
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"
+
+This is a multi-part message in MIME format.
+--------------g-i-t--v-e-r-s-i-o-n
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+---
+ dir/sub | 2 ++
+ file1 | 3 +++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+ create mode 100644 file1
+
+
+--------------g-i-t--v-e-r-s-i-o-n
+Content-Type: text/x-patch; name="2"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="2"
+
+diff --git a/dir/sub b/dir/sub
+index 8422d40..cead32e 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -2,3 +2,5 @@ A
+ B
+ C
+ D
++E
++F
+diff --git a/file1 b/file1
+new file mode 100644
+index 0000000..b1e6722
+--- /dev/null
++++ b/file1
+@@ -0,0 +1,3 @@
++A
++B
++C
+
+--------------g-i-t--v-e-r-s-i-o-n--
+
+
+
+From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Mon, 26 Jun 2006 00:03:00 +0000
+Subject: [PATCH 3/3] Side
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"
+
+This is a multi-part message in MIME format.
+--------------g-i-t--v-e-r-s-i-o-n
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+---
+ dir/sub | 2 ++
+ file0 | 3 +++
+ file3 | 4 ++++
+ 3 files changed, 9 insertions(+), 0 deletions(-)
+ create mode 100644 file3
+
+
+--------------g-i-t--v-e-r-s-i-o-n
+Content-Type: text/x-patch; name="3"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="3"
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..7289e35 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++1
++2
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,4 @@
++A
++B
++1
++2
+
+--------------g-i-t--v-e-r-s-i-o-n--
+
+
+$
--
1.6.2
^ permalink raw reply related
* Re: Summer of Code - Cached Packs/Object Lists
From: Thomas Coppi @ 2009-03-23 2:49 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
In-Reply-To: <20090323015936.GM23521@spearce.org>
[-- Attachment #1: Type: text/plain, Size: 887 bytes --]
On Sun, Mar 22, 2009 at 7:59 PM, Shawn O. Pearce <spearce@spearce.org> wrote:
> Please line wrap your email at something useful to others when
> quoting, like 70-72 characters per line.
Sorry about that.
> You could do both. But I think most people on the list will argue
> that doing both is overkill and only one is necessary, and further,
> that only the one that offers the "biggest bank for the buck"
> should be implemented.
Alright, that seems reasonable. Given that I think I would lean
towards implementing an object list caching mechanism, since that seems
to be more generally applicable. The logic for this would then need to
be in the rev-list code(as mentioned in the JGit discussion), correct?
Oh, and I forgot to mention in my previous email that I am also
available on freenode IRC under the nick tcoppi.
Thanks again,
--
Thomas Coppi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 271 bytes --]
^ permalink raw reply
* Re: Summer of Code - Cached Packs/Object Lists
From: Shawn O. Pearce @ 2009-03-23 2:52 UTC (permalink / raw)
To: Thomas Coppi; +Cc: git
In-Reply-To: <fsmk86y8vqj4f56b08UYAxe124vaj_firegpg@mail.gmail.com>
Thomas Coppi <thisnukes4u@gmail.com> wrote:
> On Sun, Mar 22, 2009 at 7:59 PM, Shawn O. Pearce <spearce@spearce.org> wrote:
>> You could do both. ??But I think most people on the list will argue
>> that doing both is overkill and only one is necessary, and further,
>> that only the one that offers the "biggest bank for the buck"
>> should be implemented.
>
> Alright, that seems reasonable. Given that I think I would lean
> towards implementing an object list caching mechanism, since that seems
> to be more generally applicable. The logic for this would then need to
> be in the rev-list code(as mentioned in the JGit discussion), correct?
Probably. IIRC upload-pack forks a rev-list to produce the
object list, and pipes that into the forked pack-objects' stdin.
Thus rev-list is probably what would need to know how to include
the cached list to its output.
--
Shawn.
^ permalink raw reply
* Re: Git for Windows 1.6.2.1-preview20090322
From: Jeff King @ 2009-03-23 2:53 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Johannes Sixt, git, msysgit
In-Reply-To: <alpine.DEB.1.00.0903230015020.10279@pacific.mpi-cbg.de>
On Mon, Mar 23, 2009 at 12:25:57AM +0100, Johannes Schindelin wrote:
> > A few people have asked about filter-branch on Windows recently;
>
> I am not aware of any. But then, I think nobody mentioned it on the
> msysgit list (which would be the correct place), and I am likely to have
> missed it if it was sent elsewhere.
They were less feature request and more mentioned in the middle of other
discussions. I am thinking specifically of:
http://thread.gmane.org/gmane.comp.version-control.git/112253/focus=112439
http://thread.gmane.org/gmane.comp.version-control.git/111722/focus=112103
> Actually, not only Hannes' version runs the test t7003 okay, but also
> 4msysgit's version.
>
> But let's reduce the differences between git.git and 4msysgit.git further
> first.
OK. I just wanted to make you aware of the existing threads and Hannes'
message, since as you mentioned they _weren't_ on the msysgit list.
-Peff
^ permalink raw reply
* Re: [PATCH 1/5] Documentation: removed some uses of the passive voice in git-bisect.txt.
From: David J. Mellor @ 2009-03-23 3:11 UTC (permalink / raw)
To: gitster; +Cc: git
In-Reply-To: <1237770017-7168-2-git-send-email-dmellor@whistlingcat.com>
Signed-off-by: David J. Mellor <dmellor@whistlingcat.com>
---
Amended to drop spurious uses of "you" as suggested in:
http://article.gmane.org/gmane.comp.version-control.git/114210
Documentation/git-bisect.txt | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 93d9fc0..a356a2b 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -81,7 +81,7 @@ will have been left with the first bad kernel revision in "refs/bisect/bad".
Bisect reset
~~~~~~~~~~~~
-To return to the original head after a bisect session, you issue the
+To return to the original head after a bisect session, issue the
following command:
------------------------------------------------
@@ -95,8 +95,8 @@ the bisection state).
Bisect visualize
~~~~~~~~~~~~~~~~
-To see the currently remaining suspects in 'gitk', the following command
-is issued during the bisection process:
+To see the currently remaining suspects in 'gitk', issue the following
+command during the bisection process:
------------
$ git bisect visualize
@@ -115,7 +115,7 @@ $ git bisect view --stat
Bisect log and bisect replay
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-After having marked revisions as good or bad, you issue the following
+After having marked revisions as good or bad, issue the following
command to show what has been done so far:
------------
@@ -135,7 +135,7 @@ $ git bisect replay that-file
Avoiding testing a commit
~~~~~~~~~~~~~~~~~~~~~~~~~
-If in the middle of a bisect session, you know that the next suggested
+If, in the middle of a bisect session, you know that the next suggested
revision is not a good one to test (e.g. the change the commit
introduces is known not to work in your environment and you know it
does not have anything to do with the bug you are chasing), you may
@@ -151,8 +151,8 @@ $ git reset --hard HEAD~3 # try 3 revisions before what
# was suggested
------------
-Then compile and test the chosen revision. Afterwards the revision
-is marked as good or bad in the usual manner.
+Then you compile and test the chosen revision. Afterwards you mark
+the revision as good or bad in the usual manner.
Bisect skip
~~~~~~~~~~~~
@@ -175,8 +175,8 @@ using the "'<commit1>'..'<commit2>'" notation. For example:
$ git bisect skip v2.5..v2.6
------------
-The effect of this would be that no commit between `v2.5` excluded and
-`v2.6` included could be tested.
+This tells the bisect process that no commit between `v2.5` excluded and
+`v2.6` included should be tested.
Note that if you also want to skip the first commit of the range you
would issue the command:
@@ -185,8 +185,8 @@ would issue the command:
$ git bisect skip v2.5 v2.5..v2.6
------------
-This would cause the commits between `v2.5` included and `v2.6` included
-to be skipped.
+This tells the bisect process that the commits between `v2.5` included
+and `v2.6` included should be skipped.
Cutting down bisection by giving more parameters to bisect start
--
1.6.2.1
^ permalink raw reply related
* Merge format documented?
From: Andreas Gruenbacher @ 2009-03-23 3:19 UTC (permalink / raw)
To: git
Hello,
is the format that git normally uses for indicating merge conflicts in files
(the <<< === >>> markers) documented somewhere? How exactly does it differ
from the diff3 format (<<< ||| === >>>)? Diff3's -m mode seems to come close
to what git does, except that git doesn't produce the ||| section:
$ seq 1 7 > a
$ seq 1 7 | sed -e 's/4/4b/' > b
$ seq 1 7 | sed -e 's/3/3c/' > c
$ diff3 -m c a b
> 1
> 2
> <<<<<<< c
> 3c
> 4
> ||||||| a
> 3
> 4
> =======
> 3
> 4b
> >>>>>>> b
> 5
> 6
> 7
Git's output in this case is:
> 1
> 2
> <<<<<<< this-branch
> 3c
> 4
> =======
> 3
> 4b
> >>>>>>> merged-branch
> 5
> 6
> 7
Does git ever output a ||| section?
Thanks,
Andreas
^ permalink raw reply
* Importing Bzr revisions
From: David Reitter @ 2009-03-23 3:33 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
Suppose I have a bzr branch that has been converted (somehow) to a git
branch, is it then possible to merge new revisions from the bzr branch
into the git one?
How would I go about doing that?
Thanks
- David
PS.: please cc me in replies.
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 2193 bytes --]
^ permalink raw reply
* Re: [PATCH 1/4] test-suite: adding a test for fast-export with tag variants
From: Junio C Hamano @ 2009-03-23 3:41 UTC (permalink / raw)
To: Erik Faye-Lund; +Cc: Erik Faye-Lund, git
In-Reply-To: <40aa078e0903221755n23457ba6m689aad34c0ec8214@mail.gmail.com>
Erik Faye-Lund <kusmabite@googlemail.com> writes:
> On Mon, Mar 23, 2009 at 1:39 AM, Junio C Hamano <gitster@pobox.com> wrote:
> ...
>> These tests seem to only care about fast-export not dying, but don't we
>> also want to check if they produce correct results?
>
> Well, yeah. But I was working mainly on fixing a crash-bug here, and I
> don't think I know enough about the correct output of fast-export to
> pull this off. Perhaps tighting up the test is something someone else
> would care to do?
Surely; for a starter, saying something like this:
+# NEEDSWORK: not just check return status, but validate the output
+test_expect_failure 'tree_tag' 'git fast-export tree_tag'
+test_expect_failure 'tree_tag-obj' 'git fast-export tree_tag-obj'
+test_expect_failure 'tag-obj_tag' 'git fast-export tag-obj_tag'
+test_expect_failure 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
would do, and will invite others to fill the gap when they have time.
Thanks.
^ permalink raw reply
* Re: Merge format documented?
From: Junio C Hamano @ 2009-03-23 3:50 UTC (permalink / raw)
To: Andreas Gruenbacher; +Cc: git
In-Reply-To: <200903230419.50000.agruen@suse.de>
Andreas Gruenbacher <agruen@suse.de> writes:
> is the format that git normally uses for indicating merge conflicts in files
> (the <<< === >>> markers) documented somewhere? How exactly does it differ
> from the diff3 format (<<< ||| === >>>)? Diff3's -m mode seems to come close
> to what git does, except that git doesn't produce the ||| section:
It is an imitation of output from "merge" program of RCS suite Paul you
know maintains ;-) Recent versions of git supports merge.conflictstyle
configuration variable and --conflict option in 'git-checkout' to write
the conflicts out in a format that is an imitation of "diff3 -m" output.
As far as I know, neither "git" format is documented anywhere, but I
didn't find an official format specification of the "upstream" formats,
and that is why I keep saying "imitation" in the above paragraph ;-)
^ permalink raw reply
* Re: [PATCH] gitk: make use of themed widgets where available
From: Paul Mackerras @ 2009-03-23 5:34 UTC (permalink / raw)
To: Pat Thoyts; +Cc: git
In-Reply-To: <87ljrre7nr.fsf@users.sourceforge.net>
Pat Thoyts writes:
> This patch improves the appearence of gitk on Windows XP and Vista
> by making use of the themed widgets that are provided in Tk 8.5
> and above. For good Vista support 8.6 will be needed.
>
> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Thanks for the patch. It does seem to do a bit more than the commit
description says, though:
- It adds a toggle-fullscreen function. I'd prefer that was done in a
separate patch.
- It makes various changes to the layout in the non-ttk case - in
particular various message widgets get turned into label widgets.
Are label widgets entirely equivalent to message widgets?
Also, the patch has been corrupted by your mailer: on lines containing
only a "+", the "+" has been deleted.
I have a few questions about specific things you've done in the patch:
> +proc ttk_toplevel {w args} {
> + variable use_ttk
> + eval [linsert $args 0 ::toplevel $w]
> + if {$use_ttk} {
> + place [ttk::frame $w._toplevel_background] -x 0 -y 0 -relwidth 1 -relheight 1
What is the effect of this line, or what would happen if it wasn't
there?
> proc show_error {w top msg} {
> + variable use_ttk
> + set ttk [expr {$use_ttk ? "ttk" : ""}]
Is there a strong reason for using variable here rather than global,
or is it just habit?
It looks to me as though $ttk might as well be a global variable,
rather than computing it from $use_ttk everywhere that we need it.
> @@ -1945,8 +1975,10 @@ proc makewindow {} {
> }
> . configure -menu .bar
>
> + place [${ttk}::frame ._main_background] -x 0 -y 0 -relwidth 1 -relheight 1
Once again, what's the reason for using place and the extra frame?
> + if {$use_ttk} {
> + #set p1 [expr {[winfo screenwidth .] - (40 * $charspc)}]
> + #set p0 [expr {[winfo screenwidth .] - (100 * $charspc)}]
> + #.tf.histframe.pwclist sashpos 0 585
> + #.tf.histframe.pwclist sashpos 1 868
> + } else {
> + eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
> + eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
> + }
Looks like that could be cleaned up a bit.
> - set gm [tk_optionMenu .tf.lbar.gdttype gdttype \
> - [mc "containing:"] \
> - [mc "touching paths:"] \
> - [mc "adding/removing string:"]]
> + if {$use_ttk} {
> + set values [list [mc "containing:"] [mc "touching paths:"] \
> + [mc "adding/removing string:"]]
> + set gm [ttk::combobox .tf.lbar.gdttype -width 10\
> + -values $values -textvariable gdtype]
> + } else {
> + set gm [tk_optionMenu .tf.lbar.gdttype gdttype \
> + [mc "containing:"] \
> + [mc "touching paths:"] \
> + [mc "adding/removing string:"]]
> + }
We could profitably use a helper function here that would take the
list of alternatives and make the combobox/optionMenu.
> - $top.tohead conf -state readonly
> + $top.tohead configure -state readonly
Do all the other instances of conf need to be changed to configure,
and if so, why?
> - checkbutton $top.showlocal -text [mc "Show local changes"] \
> - -font optionfont -variable showlocalchanges
> + ${ttk}::checkbutton $top.showlocal -text [mc "Show local changes"] \
> + -variable showlocalchanges
Why do we lose the -font optionfont?
Thanks,
Paul.
^ permalink raw reply
* Re: [PATCH 1/5] Documentation: removed some uses of the passive voice in git-bisect.txt.
From: Junio C Hamano @ 2009-03-23 5:43 UTC (permalink / raw)
To: David J. Mellor; +Cc: git
In-Reply-To: <1237770017-7168-2-git-send-email-dmellor@whistlingcat.com>
Thanks; applied (with the "s/you issue/issue/" fix-up from v2).
^ permalink raw reply
* [PATCH] t0060: fix whitespace in "wc -c" invocation
From: Jeff King @ 2009-03-23 6:22 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Johannes Sixt, Mike Ralphson, git
Some platforms like to stick extra whitespace in the output
of "wc -c"; using the result without quotes gets the shell
to collapse the whitespace.
Signed-off-by: Jeff King <peff@peff.net>
---
On top of 'next'.
I noticed the breakage on Solaris; I suspect AIX is broken, too.
t/t0060-path-utils.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index 86000e2..53cf1f8 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -17,7 +17,7 @@ norm_path() {
# which means that the path / accounts for this many characters:
rootoff=$(test-path-utils normalize_path_copy / | wc -c)
# Account for the trailing LF:
-if test "$rootoff" = 2; then
+if test $rootoff = 2; then
rootoff= # we are on Unix
else
rootoff=$(($rootoff-1))
--
1.6.2.1.276.gd47fa
^ permalink raw reply related
* Re: [RFC/PATCH 1/8] user-manual: remove some git-foo usage
From: Jeff King @ 2009-03-23 6:31 UTC (permalink / raw)
To: Felipe Contreras; +Cc: git
In-Reply-To: <1237745121-6325-2-git-send-email-felipe.contreras@gmail.com>
On Sun, Mar 22, 2009 at 08:05:14PM +0200, Felipe Contreras wrote:
> Every commit has a 40-hexdigit id, sometimes called the "object name" or the
> -"SHA1 id", shown on the first line of the "git-show" output. You can usually
> +"SHA1 id", shown on the first line of the "git show" output. You can usually
I think some of these were intentionally left in the original mass
dashes to spaces conversion. The intent was that one could use the
git-show form in talking about the command in text.
However, I think I actually prefer the version given by your patch. I
just wanted to point out that this is a decision to change how we
mention these in the documentation and not simply a fix for things that
got missed in the conversion. Others may disagree on how it looks.
It seems like you added monospace backticks in most locations. Is there
a reason not to standardize on that and use `git show` here?
> [[Updating-a-repository-With-git-fetch]]
> -Updating a repository with git-fetch
> +Updating a repository with git fetch
> ------------------------------------
I think this one should probably be `git fetch`.
-Peff
^ permalink raw reply
* Re: [RFC/PATCH 2/8] docbook: improve css style
From: Jeff King @ 2009-03-23 6:42 UTC (permalink / raw)
To: Felipe Contreras; +Cc: git
In-Reply-To: <1237745121-6325-3-git-send-email-felipe.contreras@gmail.com>
On Sun, Mar 22, 2009 at 08:05:15PM +0200, Felipe Contreras wrote:
> tt.literal, code.literal {
> color: navy;
> + font-size: 1em;
> +}
Isn't 1em already the default size? Or are you trying to override some
other size specification elsewhere? It's hard to tell what the goal is
because your commit message merely says "improve".
-Peff
^ permalink raw reply
* Re: [RFC/PATCH 3/8] docbook: radical style change
From: Jeff King @ 2009-03-23 6:50 UTC (permalink / raw)
To: Felipe Contreras; +Cc: git
In-Reply-To: <1237745121-6325-4-git-send-email-felipe.contreras@gmail.com>
On Sun, Mar 22, 2009 at 08:05:16PM +0200, Felipe Contreras wrote:
> Use smaller 'sans-serial' font. Sans-Serial fonts are supposed to be
> easier to read in screens. This format is similar to the one of
> Wikipedia.
I started to look up "sans-serial" before I realized it seems to be just
a typo for "sans-serif" (or is there something I'm missing)?
Is there a reason to apply this style change just to docbook-generated
HTML? Most of the HTML documentation is generated directly from
asciidoc.
> html body {
> margin: 1em 5% 1em 5%;
> - line-height: 1.2;
> + line-height: 1em;
> + font-family: sans-serif;
> + font-size: small;
Personally, I think collapsing the line spacing looks worse.
I'm not sure I see the point of putting "small" text for the entire
body. Since it covers the whole page, you are not "small" with respect
to anything else, but are basically just overriding the user's choice
through their browser of what is a reasonable default text size.
-Peff
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox