* Pulling one commit at a time.
From: Sanjiv Gupta @ 2009-08-23 16:48 UTC (permalink / raw)
To: git
In-Reply-To: <F536B7C316F9474E9F7091239725AC9A02FA7F44@CHN-CL-MAIL01.mchp-main.com>
Hi,
This is my first post here.
I just wanted to know how can I pull one commit at a time from public
repository.
e.g.
when I first cloned from the public repo, it was at X. now it
has reached Y. I just want to pull x+1.
how to do that?
In SVN, we can just do $ svn update -r next_rev_num
thanks
- Sanjiv
^ permalink raw reply
* Re: [PATCH 14/14] Add README and gitignore file for MSVC build
From: Thiago Farina @ 2009-08-23 16:26 UTC (permalink / raw)
To: Marius Storm-Olsen; +Cc: Johannes.Schindelin, msysgit, git, lznuaa
In-Reply-To: <e82f1930173966ebb6b2d2815e037a26e079f969.1250860247.git.mstormo@gmail.com>
Hi,
On Fri, Aug 21, 2009 at 10:30 AM, Marius Storm-Olsen<mstormo@gmail.com> wrote:
> From: Frank Li <lznuaa@gmail.com>
>
> +3. Open gitbuild\gitbuild.sln with VS2008. Then press F7.
F7 does nothing in VS2008, to build the solution you have to press
Ctrl+Shift+B. To build and start debugging you have to press F5, and
for start without debbuging support is Ctrl+F5.
Regards
^ permalink raw reply
* Re: [RFC] gitweb.perl t9500 t9501
From: Mark A Rada @ 2009-08-23 15:29 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Jakub Narebski, git
In-Reply-To: <7v3a7j2scq.fsf@alter.siamese.dyndns.org>
On 22-Aug-09, at 10:09 PM, Junio C Hamano wrote:
> Mark A Rada <marada@uwaterloo.ca> writes:
>
>> I have not been telling git-format-patch to use a specific width for
>> the diffstat, is the standard width supposed to be 70?
>
> Perhaps there is some misconception here.
>
Yup, my bad, told my MUA to send as text/plain, but it didn't,
so I was seeing perfectly fine e-mails when I received them,
but gmane showed me how mangled everything was. I'll find a
better MUA and resend later, thanks for your patience with me.
--
Mark A Rada (ferrous26)
marada@uwaterloo.ca
^ permalink raw reply
* Re: [PATCH 2/2 (v3)] reset: make the output more user-friendly.
From: Reece Dunn @ 2009-08-23 11:45 UTC (permalink / raw)
To: Matthieu Moy; +Cc: Junio C Hamano, git
In-Reply-To: <vpqiqgevmju.fsf@bauges.imag.fr>
2009/8/23 Matthieu Moy <Matthieu.Moy@imag.fr>:
> For example, the output of 'git status' is very nice to newbies:
>
> # On branch master
> # Changed but not updated:
> # (use "git add <file>..." to update what will be committed)
Shouldn't this be something like: (use "git add <file>..." to add new
and modified files to be committed) -- I am saying this as "update"
can also refer to removing files, or discarding changes.
> # (use "git checkout -- <file>..." to discard changes in working directory)
> #
> # modified: git.c
> #
> no changes added to commit (use "git add" and/or "git commit -a")
>
> But out of these 8 lines, only two contain real informations, and the
> (use "git bla") are just noise to expert users.
Yes and no. Using git for quite a while now, the day-to-day operations
are second nature, but other slightly obscure commands (how exactly do
I remove a staged file?) are useful to have.
> I've been thinking of a configuration option, like "core.expertuser"
> or "ui.expertuser" that would let users disable these informative
> messages on demand. I'm not sure how good the idea is.
The "core.expertuser" option does not really say what this is doing
(should the expertuser option list the sha1's for the commits, trees
and objects it is adding?).
I would call it something like "core.interactive-help",
"core.inplace-help" or "core.inline-help", as that is what the (use
...) lines are.
- Reece
^ permalink raw reply
* Re: Lowlevel documentation
From: Eric Schaefer @ 2009-08-23 11:34 UTC (permalink / raw)
To: Matthias Kestenholz; +Cc: Git Mailing List
In-Reply-To: <1f6632e50908230325id8422b1t520831869aadcbce@mail.gmail.com>
2009/8/23 Matthias Kestenholz <mk@feinheit.ch>:
> I think you are referring to this blog post:
>
> http://tom.preston-werner.com/2009/05/19/the-git-parable.html
Yes, thats the one.
Thank Matthias, thanks Björn. Schönen Sonntag noch,
Eric
^ permalink raw reply
* Re: [PATCH 2/2 (v3)] reset: make the output more user-friendly.
From: Matthieu Moy @ 2009-08-23 10:42 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vmy5r1cpo.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> Two conflicting/competing thoughts come to mind:
>
> 1. Perhaps we should add a similar "explanation" for the list of paths
> with changes upon switching branches with "git checkout" for
> consistency.
Actually, I had never paid much attention to this message for
checkout. Just checked, and I got it wrong too ;-). I thought checkout
was showing me the files it was modifying, that wasn't it.
That said, I'm not a heavy user of local branches, so I'm a bad judge
on what should be the behavior.
> 2. Such an "explanation" of what the output means would help the first
> time people, but would everybody stay "first time" forever? Would the
> explanation become just another wasted line in valuable screen real
> estate after people gain experience?
Yes, and this is a much more general issue than just checkout/reset.
For example, the output of 'git status' is very nice to newbies:
# On branch master
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: git.c
#
no changes added to commit (use "git add" and/or "git commit -a")
But out of these 8 lines, only two contain real informations, and the
(use "git bla") are just noise to expert users.
I've been thinking of a configuration option, like "core.expertuser"
or "ui.expertuser" that would let users disable these informative
messages on demand. I'm not sure how good the idea is.
--
Matthieu
^ permalink raw reply
* Re: Continue git clone after interruption
From: Sam Vilain @ 2009-08-23 10:37 UTC (permalink / raw)
To: Nicolas Pitre
Cc: Jakub Narebski, Tomasz Kontusz, git, Johannes Schindelin,
Scott Chacon
In-Reply-To: <alpine.LFD.2.00.0908220155240.6044@xanadu.home>
On Sat, 2009-08-22 at 04:13 -0400, Nicolas Pitre wrote:
> > Ok, but right now there's no way to specify that you want a thin pack,
> > where the allowable base objects are *newer* than the commit range you
> > wish to include.
>
> Sure you can. Try this:
>
> ( echo "-$(git rev-parse v1.6.4)"; \
> git rev-list --objects v1.6.2..v1.6.3 ) | \
> git pack-objects --progress --stdout > foo.pack
>
> That'll give you a thin pack for the _new_ objects that _appeared_
> between v1.6.2 and v1.6.3, but which external delta base objects are
> found in v1.6.4.
Aha. I guess I had made an assumption about where that '-' lets
pack-objects find deltas from that aren't true.
> > What I said in my other e-mail where I showed how well it works taking
> > a given bundle, and slicing it into a series of thin packs, was that it
> > seems to add a bit of extra size to the resultant packs - best I got for
> > slicing up the entire git.git run was about 20%. If this can be
> > reduced to under 10% (say), then sending bundle slices would be quite
> > reasonable by default for the benefit of making large fetches
> > restartable, or even spreadable across multiple mirrors.
>
> In theory you could have about no overhead. That all depends how you
> slice the pack. If you want a pack to contain a fixed number of commits
> (such that all objects introduced by a given commit are all in the same
> pack) then you are of course putting a constraint on the possible delta
> matches and compression result might be suboptimal. In comparison, with
> a single big pack a given blob can delta against a blob from a
> completely distant commit in the history graph if that provides a better
> compression ratio.
[...]
> If you were envisioning _clients_ à la BitTorrent putting up pack slices
> instead, then in that case the slices have to be well defined entities,
> like packs containing objects for known range of commits, but then we're
> back to the delta inefficiency I mentioned above.
I'll do some more experiments to try to quantify this in light of this
new information; I still think that if the overhead is marginal there
are significant wins to this approach.
> And again this might
> work only if a lot of people are interested in the same repository at
> the same time, and of course most people have no big insentive to "seed"
> once they got their copy. So I'm not sure if that might work that well
> in practice.
Throw away terms like "seeding" and replace with "mirroring". Sites
which currently house mirrors could potentially be helping serve git
repos, too. Popular projects could have many mirrors and on the edges
of the internet, git servers could mirror many projects for users in
their country.
Sam
^ permalink raw reply
* Re: Lowlevel documentation
From: Björn Steinbrink @ 2009-08-23 10:33 UTC (permalink / raw)
To: Eric Schaefer; +Cc: Git Mailing List
In-Reply-To: <34f8975d0908230304k41ea18b4xf57bdb3099ddfced@mail.gmail.com>
On 2009.08.23 12:04:44 +0200, Eric Schaefer wrote:
> Hi,
>
> a couple of week ago I read a blog post, a paper or an article about
> how a simple scm could be designed step by step and how this would
> become git in the end. It explained really nicely how things in git
> work and why. Does anybody know which document I am talking about? I
> can't find it anymore...
I guess you're talking about the git parable:
http://tom.preston-werner.com/2009/05/19/the-git-parable.html
Björn
^ permalink raw reply
* Re: Lowlevel documentation
From: Matthias Kestenholz @ 2009-08-23 10:25 UTC (permalink / raw)
To: Eric Schaefer; +Cc: Git Mailing List
In-Reply-To: <34f8975d0908230304k41ea18b4xf57bdb3099ddfced@mail.gmail.com>
On Sun, Aug 23, 2009 at 12:04 PM, Eric
Schaefer<eric.schaefer@ericschaefer.org> wrote:
> Hi,
>
> a couple of week ago I read a blog post, a paper or an article about
> how a simple scm could be designed step by step and how this would
> become git in the end. It explained really nicely how things in git
> work and why. Does anybody know which document I am talking about? I
> can't find it anymore...
>
I think you are referring to this blog post:
http://tom.preston-werner.com/2009/05/19/the-git-parable.html
Matthias
^ permalink raw reply
* Lowlevel documentation
From: Eric Schaefer @ 2009-08-23 10:04 UTC (permalink / raw)
To: Git Mailing List
Hi,
a couple of week ago I read a blog post, a paper or an article about
how a simple scm could be designed step by step and how this would
become git in the end. It explained really nicely how things in git
work and why. Does anybody know which document I am talking about? I
can't find it anymore...
Thanks,
Eric
^ permalink raw reply
* Re: [PATCH-v2/RFC 3/6] xutils: fix ignore-all-space on incomplete line
From: Junio C Hamano @ 2009-08-23 8:56 UTC (permalink / raw)
To: Nanako Shiraishi; +Cc: Thell Fowler, git, Johannes.Schindelin
In-Reply-To: <20090823171819.6117@nanako3.lavabit.com>
Nanako Shiraishi <nanako3@lavabit.com> writes:
> Quoting Junio C Hamano <gitster@pobox.com>
>
>> How about doing it like this patch instead? This counterproposal replaces
>> your 3 patches starting from [3/6].
>>
>> -- >8 --
>> Subject: xutils: Fix xdl_recmatch() on incomplete lines
>>
>> Thell Fowler noticed that various "ignore whitespace" options to
>> git diff does not work well with whitespace glitches on an incomplete
>> line.
>
> I think this should be "options to git diff don't work".
Soory, I kant speel; thanks.
> (1) Why do you post patches to the list, instead of committing them
> yourself?
So that others can catch silly mistakes of mine, like the one you just
caught.
I play three separate roles here, two of which I should send patches out
while playing them.
* Just like everybody else, I find itches to scratch from time to time,
and I build my own topic branches locally for the changes to scratch
them, just like other contributors.
They are indeed committed and often immediately merged to 'pu', but I
send out format-patch output for them, because I firmly believe that
the development _process_, not just the end result, should be in the
open. Everybody's patch should go through the list, get reviewed and
improved by help from others. So should mine.
* I read others' patches, review, comment, and suggest improvements and
make counterproposals, just like others on the list.
The "how about" patches when I am playing this role are often not meant
as the final shape of the patch but to show the direction to improve
upon. They are output from "git diff", not format-patch nor even "git
diff --cached"---I do not commit, nor even add them to the index---and
after I send out e-mails, I typically reset them away to work on
something else, because they are usually not my itch.
* I accept patches that were reviewed favorably on the list by running
"git am" on them.
> (2) How do I apply a patch like this one to try to my tree? Am I
> expected to edit the mail message to remove everything before the shears
> mark before running the git-am command?
That is how I have been doing it. My workflow is:
(1) First read patches in my primary mailbox, while copying promising
ones to a separate mailbox;
(2) And then go through the separate mailbox as a separate pass, while
fixing obvious typos and minor coding style violations still inside
mailbox; and finally
(3) Run "git am" on the (possibly edited) patch to apply.
Because I'll be editing the messages (both log and code) _anyway_,
removing everything before the scissors mark is not much of a trouble.
Having said that, I could use something like this.
-- >8 -- cut here -- >8 --
Subject: [PATCH] Teach mailinfo to ignore everything before -- >8 -- mark
This teaches mailinfo the scissors -- >8 -- mark; the command ignores
everything before it in the message body.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin-mailinfo.c | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index b0b5d8f..461c47e 100644
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -712,6 +712,34 @@ static inline int patchbreak(const struct strbuf *line)
return 0;
}
+static int scissors(const struct strbuf *line)
+{
+ size_t i, len = line->len;
+ int scissors_dashes_seen = 0;
+ const char *buf = line->buf;
+
+ for (i = 0; i < len; i++) {
+ if (isspace(buf[i]))
+ continue;
+ if (buf[i] == '-') {
+ scissors_dashes_seen |= 02;
+ continue;
+ }
+ if (i + 1 < len && !memcmp(buf + i, ">8", 2)) {
+ scissors_dashes_seen |= 01;
+ i++;
+ continue;
+ }
+ if (i + 7 < len && !memcmp(buf + i, "cut here", 8)) {
+ i += 7;
+ continue;
+ }
+ /* everything else --- not scissors */
+ break;
+ }
+ return scissors_dashes_seen == 03;
+}
+
static int handle_commit_msg(struct strbuf *line)
{
static int still_looking = 1;
@@ -723,10 +751,17 @@ static int handle_commit_msg(struct strbuf *line)
strbuf_ltrim(line);
if (!line->len)
return 0;
- if ((still_looking = check_header(line, s_hdr_data, 0)) != 0)
+ still_looking = check_header(line, s_hdr_data, 0);
+ if (still_looking)
return 0;
}
+ if (scissors(line)) {
+ fseek(cmitmsg, 0L, SEEK_SET);
+ still_looking = 1;
+ return 0;
+ }
+
/* normalize the log message to UTF-8. */
if (metainfo_charset)
convert_to_utf8(line, charset.buf);
--
1.6.4.1
^ permalink raw reply related
* [PATCH] gitweb: pull ref markes pull out of subject <a> tag
From: Giuseppe Bilotta @ 2009-08-23 8:28 UTC (permalink / raw)
To: git; +Cc: Jakub Narebski, Junio C Hamano, Giuseppe Bilotta
Since 4afbaefffa9095fe1391b4b61289a7dc954e9f7b ref markers that
accompain the subject in views such as shortlog and history point to
something different from the subject itself. Therefore, they should not
be included in the same <a> tag.
Benefits of the change are:
* better compliance to the XHTML standards, that forbid links within
links even though the restriction cannot be imposed via DTD; this also
benefits visualization in some older browsers;
* when hovering the subject, only the subject itself is underlined; when
hovering the ref markers, only the text in the hovered ref marker is
underlined; previously, hovering any written part of the subject
column led to complete underlying of everything at the same time,
with unpleasing effects.
---
gitweb/gitweb.perl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
The next step would be to find a way to layout decently the case when
some shortlog entries have a _humongous_ amount of ref markers. See
for example http://git.oblomov.eu/acecad/shortlog
I honestly doubt these cases happen in normal git repositories, but it
might still be worth taking them into consideration. Possibilities
include hard-limiting the title column maximum width (in browsers for
which the corresponding attributes and rules work), manual insertion of
hard line breaks <br/> every n-th ref marker, or something more dynamic
such as hiding most of the ref markers when they are more than, say, 5,
and showing them on hover.
Suggestions? Comments?
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index ce6e8f6..bb9648b 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1524,10 +1524,10 @@ sub format_subject_html {
$long =~ s/[[:cntrl:]]/?/g;
return $cgi->a({-href => $href, -class => "list subject",
-title => to_utf8($long)},
- esc_html($short) . $extra);
+ esc_html($short)) . $extra;
} else {
return $cgi->a({-href => $href, -class => "list subject"},
- esc_html($long) . $extra);
+ esc_html($long)) . $extra;
}
}
--
1.6.3.rc1.192.gdbfcb
^ permalink raw reply related
* Re: [PATCH-v2/RFC 3/6] xutils: fix ignore-all-space on incomplete line
From: Nanako Shiraishi @ 2009-08-23 8:18 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Thell Fowler, git, Johannes.Schindelin
In-Reply-To: <7vvdkfx8rl.fsf@alter.siamese.dyndns.org>
Quoting Junio C Hamano <gitster@pobox.com>
> How about doing it like this patch instead? This counterproposal replaces
> your 3 patches starting from [3/6].
>
> -- >8 --
> Subject: xutils: Fix xdl_recmatch() on incomplete lines
>
> Thell Fowler noticed that various "ignore whitespace" options to
> git diff does not work well with whitespace glitches on an incomplete
> line.
I think this should be "options to git diff don't work".
I have two unrelated questions.
(1) Why do you post patches to the list, instead of committing them yourself?
(2) How do I apply a patch like this one to try to my tree? Am I expected to edit the mail message to remove everything before the shears mark before running the git-am command?
--
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
^ permalink raw reply
* Re: [PATCH-v2/RFC 3/6] xutils: fix ignore-all-space on incomplete line
From: Junio C Hamano @ 2009-08-23 7:57 UTC (permalink / raw)
To: Thell Fowler; +Cc: git, Johannes.Schindelin
In-Reply-To: <1250999357-10827-3-git-send-email-git@tbfowler.name>
Thell Fowler <git@tbfowler.name> writes:
> @@ -191,12 +191,14 @@ int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
> int i1, i2;
>
> if (flags & XDF_IGNORE_WHITESPACE) {
> - for (i1 = i2 = 0; i1 < s1 && i2 < s2; ) {
> + for (i1 = i2 = 0; i1 < s1 || i2 < s2; ) {
> if (isspace(l1[i1]))
> - while (isspace(l1[i1]) && i1 < s1)
> + while ((isspace(l1[i1]) && i1 < s1)
> + || (i1 + 1 == s1 && l1[s1] != '\n'))
This is wrong. If you ran out l1/s1/i1 but you still have remaining
characters in l2/s2/i2, you do not want to even look at l1[i1].
You can fudge this by sprinkling more "(i1 < s1) &&" in many places (and
reordering how your inner while() loop checks (i1 < s1) and l1[i1]), but I
do not think that is the right direction.
The thing is, the loop control in this function is extremely hard to read
to begin with, and now it is "if we haven't run out both", the complexity
seeps into the inner logic.
How about doing it like this patch instead? This counterproposal replaces
your 3 patches starting from [3/6].
-- >8 --
Subject: xutils: Fix xdl_recmatch() on incomplete lines
Thell Fowler noticed that various "ignore whitespace" options to
git diff does not work well with whitespace glitches on an incomplete
line.
The loop control of this function incorrectly handled incomplete lines,
and it was extremely difficult to follow. This restructures the loops for
three variants of "ignore whitespace" logic.
The basic idea of the re-written logic is this.
- An initial loop runs while the characters from both strings we are
looking at match. We declare unmatch immediately when we find
something that does not match and return false from the loop. And we
break out of the loop if we ran out of either side of the string.
The way we skip spaces inside this loop varies depending on the style
of ignoring whitespaces.
- After the loop, the lines can match only if the remainder consists of
nothing but whitespaces. This part of the logic is shared across all
three styles.
The new code is more obvious and should be much easier to follow.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
xdiff/xutils.c | 111 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 77 insertions(+), 34 deletions(-)
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 9411fa9..dd8b7e7 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -186,50 +186,93 @@ long xdl_guess_lines(mmfile_t *mf) {
return nl + 1;
}
+static int remainder_all_ws(const char *l1, const char *l2,
+ int i1, int i2, long s1, long s2)
+{
+ if (i1 < s1) {
+ while (i1 < s1 && isspace(l1[i1]))
+ i1++;
+ return (s1 == i1);
+ }
+ if (i2 < s2) {
+ while (i2 < s2 && isspace(l2[i2]))
+ i2++;
+ return (s2 == i2);
+ }
+ return 1;
+}
+
int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
{
- int i1, i2;
+ int i1 = 0, i2 = 0;
if (flags & XDF_IGNORE_WHITESPACE) {
- for (i1 = i2 = 0; i1 < s1 && i2 < s2; ) {
- if (isspace(l1[i1]))
- while (isspace(l1[i1]) && i1 < s1)
- i1++;
- if (isspace(l2[i2]))
- while (isspace(l2[i2]) && i2 < s2)
- i2++;
- if (i1 < s1 && i2 < s2 && l1[i1++] != l2[i2++])
- return 0;
+ while (1) {
+ while (i1 < s1 && isspace(l1[i1]))
+ i1++;
+ while (i2 < s2 && isspace(l2[i2]))
+ i2++;
+ if (i1 < s1 && i2 < s2) {
+ if (l1[i1++] != l2[i2++])
+ return 0;
+ continue;
+ }
+ break;
}
- return (i1 >= s1 && i2 >= s2);
+
+ /*
+ * we ran out one side; the remaining side must be all
+ * whitespace to match.
+ */
+ return remainder_all_ws(l1, l2, i1, i2, s1, s2);
} else if (flags & XDF_IGNORE_WHITESPACE_CHANGE) {
- for (i1 = i2 = 0; i1 < s1 && i2 < s2; ) {
- if (isspace(l1[i1])) {
- if (!isspace(l2[i2]))
+ while (1) {
+ if (i1 < s1 && i2 < s2) {
+ /* Skip matching spaces */
+ if (isspace(l1[i1]) && isspace(l2[i2])) {
+ while (i1 < s1 && isspace(l1[i1]))
+ i1++;
+ while (i2 < s2 && isspace(l2[i2]))
+ i2++;
+ }
+ }
+ if (i1 < s1 && i2 < s2) {
+ /*
+ * We still have both sides; do they match?
+ */
+ if (l1[i1++] != l2[i2++])
return 0;
- while (isspace(l1[i1]) && i1 < s1)
- i1++;
- while (isspace(l2[i2]) && i2 < s2)
- i2++;
- } else if (l1[i1++] != l2[i2++])
- return 0;
+ continue;
+ }
+ break;
}
- return (i1 >= s1 && i2 >= s2);
+
+ /*
+ * If we do not want -b to imply --ignore-space-at-eol
+ * then you would need to add this:
+ *
+ * if (!(flags & XDF_IGNORE_WHITESPACE_AT_EOL))
+ * return (s1 <= i1 && s2 <= i2);
+ *
+ */
+
+ /*
+ * we ran out one side; the remaining side must be all
+ * whitespace to match.
+ */
+ return remainder_all_ws(l1, l2, i1, i2, s1, s2);
+
} else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL) {
- for (i1 = i2 = 0; i1 < s1 && i2 < s2; ) {
- if (l1[i1] != l2[i2]) {
- while (i1 < s1 && isspace(l1[i1]))
- i1++;
- while (i2 < s2 && isspace(l2[i2]))
- i2++;
- if (i1 < s1 || i2 < s2)
- return 0;
- return 1;
- }
- i1++;
- i2++;
+ while (1) {
+ if (i1 < s1 && i2 < s2 && l1[i1++] == l2[i2++])
+ continue;
+ break;
}
- return i1 >= s1 && i2 >= s2;
+ /*
+ * we ran out one side; the remaining side must be all
+ * whitespace to match.
+ */
+ return remainder_all_ws(l1, l2, i1, i2, s1, s2);
} else
return s1 == s2 && !memcmp(l1, l2, s1);
}
^ permalink raw reply related
* Re: [PATCH-v2/RFC 2/6] xutils: fix hash with whitespace on incomplete line
From: Junio C Hamano @ 2009-08-23 7:51 UTC (permalink / raw)
To: Thell Fowler; +Cc: git, Johannes.Schindelin
In-Reply-To: <1250999357-10827-2-git-send-email-git@tbfowler.name>
Thell Fowler <git@tbfowler.name> writes:
> - Make xdl_hash_record_with_whitespace stop hashing before the
> eof when ignoring space change or space at eol on an incomplete
> line.
>
> Resolves issue with a final trailing space being included in the
> hash on an incomplete line by treating the eof in the same fashion
> as a newline.
Please study the style of existing commit messages and imitate them.
> Signed-off-by: Thell Fowler <git@tbfowler.name>
> ---
> xdiff/xutils.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/xdiff/xutils.c b/xdiff/xutils.c
> index 04ad468..c6512a5 100644
> --- a/xdiff/xutils.c
> +++ b/xdiff/xutils.c
> @@ -248,12 +248,12 @@ static unsigned long xdl_hash_record_with_whitespace(char const **data,
> if (flags & XDF_IGNORE_WHITESPACE)
> ; /* already handled */
> else if (flags & XDF_IGNORE_WHITESPACE_CHANGE
> - && ptr[1] != '\n') {
> + && ptr[1] != '\n' && ptr + 1 < top) {
> ha += (ha << 5);
> ha ^= (unsigned long) ' ';
> }
> else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL
> - && ptr[1] != '\n') {
> + && ptr[1] != '\n' && ptr + 1 < top) {
> while (ptr2 != ptr + 1) {
> ha += (ha << 5);
> ha ^= (unsigned long) *ptr2;
Thanks.
The issue you identified and tried to fix is a worthy one. But before the
pre-context of this hunk, I notice these lines:
if (isspace(*ptr)) {
const char *ptr2 = ptr;
while (ptr + 1 < top && isspace(ptr[1])
&& ptr[1] != '\n')
ptr++;
If you have trailing whitespaces on an incomplete line, ptr initially
points at the first such whitespace, ptr2 points at the same location, and
then the while() loop advances ptr to point at the last byte on the line,
which in turn will be the last byte of the file. And the codepath with
your updates still try to access ptr[1] that is beyond that last byte.
I would write it like this patch instead.
The intent is the same as your patch, but it avoids accessing ptr[1] when
that is beyond the end of the buffer, and the logic is easier to follow as
well.
-- >8 --
Subject: xutils: fix hashing an incomplete line with whitespaces at the end
Upon seeing a whitespace, xdl_hash_record_with_whitespace() first skipped
the run of whitespaces (excluding LF) that begins there, ensuring that the
pointer points the last whitespace character in the run, and assumed that
the next character must be LF at the end of the line. This does not work
when hashing an incomplete line, that lacks the LF at the end.
Introduce "at_eol" variable that is true when either we are at the end of
line (looking at LF) or at the end of an incomplete line, and use that
instead throughout the code.
Noticed by Thell Fowler.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
xdiff/xutils.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 04ad468..9411fa9 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -242,18 +242,20 @@ static unsigned long xdl_hash_record_with_whitespace(char const **data,
for (; ptr < top && *ptr != '\n'; ptr++) {
if (isspace(*ptr)) {
const char *ptr2 = ptr;
+ int at_eol;
while (ptr + 1 < top && isspace(ptr[1])
&& ptr[1] != '\n')
ptr++;
+ at_eol = (top <= ptr + 1 || ptr[1] == '\n');
if (flags & XDF_IGNORE_WHITESPACE)
; /* already handled */
else if (flags & XDF_IGNORE_WHITESPACE_CHANGE
- && ptr[1] != '\n') {
+ && !at_eol) {
ha += (ha << 5);
ha ^= (unsigned long) ' ';
}
else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL
- && ptr[1] != '\n') {
+ && !at_eol) {
while (ptr2 != ptr + 1) {
ha += (ha << 5);
ha ^= (unsigned long) *ptr2;
^ permalink raw reply related
* Re: git-mail-commits (Re: What's a good setup for submitting patches to the list properly?)
From: Christian Couder @ 2009-08-23 7:11 UTC (permalink / raw)
To: Nicolas Sebrecht; +Cc: Thell Fowler, git, Julian Phillips
In-Reply-To: <20090822205656.GA3526@vidovic>
On Saturday 22 August 2009, Nicolas Sebrecht wrote:
> The 22/08/09, Christian Couder wrote:
> > There is "git send-email" that is bundled with git. But I use
> > git-mail-commits from Julian Philips. I am very happy with it. Thanks
> > Julian!
>
> Isn't there any public repo for it?
Not that I know of, but I think it would be a good idea to publish it
(perhaps in contrib/).
Julian?
Regards,
Christian.
^ permalink raw reply
* Re: hitting home directory's parent
From: Daniel Convissor @ 2009-08-23 5:12 UTC (permalink / raw)
To: Git Mailing List
In-Reply-To: <20090822181607.GA25823@coredump.intra.peff.net>
Hi Jeff:
On Sat, Aug 22, 2009 at 02:16:07PM -0400, Jeff King wrote:
>
> Without looking, I would not be surprised if it is a side effect of
> git trying to look up help-related config.
That explains what's happening. cmd_help() calls git_config(). Though
it seems it would be more, uh, helpful, if help produced basic usage
output no matter what, and then produce the more detailed config based
output if possible.
> Probably it is calling "setup_git_directory_gently" and ignoring an
> error return, but there is a die() inside that function. The bug
> then is that the _gently form is calling die().
Yep. setup.c, lines 391 and 392 (master branch):
if (chdir(".."))
die_errno("Cannot change to '%s/..'", cwd);
> As for fixing the setup code, I am sadly way behind on my git queue and
> not likely to catch up to this anytime soon. So if anybody feels like
> taking a stab at it, that would be very welcome.
Is there a bug tracker y'all use where I can enter a ticket?
Thanks,
--Dan
--
T H E A N A L Y S I S A N D S O L U T I O N S C O M P A N Y
data intensive web and database programming
http://www.AnalysisAndSolutions.com/
4015 7th Ave #4, Brooklyn NY 11232 v: 718-854-0335 f: 718-854-0409
^ permalink raw reply
* Re: hitting home directory's parent
From: Daniel Convissor @ 2009-08-23 4:42 UTC (permalink / raw)
To: Git Mailing List
In-Reply-To: <fcaeb9bf0908220920g29ec24e9v23d0504d10ca6cfb@mail.gmail.com>
Hi Duy:
On Sat, Aug 22, 2009 at 11:20:39PM +0700, Nguyen Thai Ngoc Duy wrote:
> On Sat, Aug 22, 2009 at 10:05 PM, Daniel
> Convissor<danielc@analysisandsolutions.com> wrote:
> > Hi Duy:
> >
> > On Sat, Aug 22, 2009 at 11:10:18AM +0700, Nguyen Thai Ngoc Duy wrote:
> >>
> >> I guess it tried to find .git directory upward. I think you can set
> >> GIT_CEILING_DIRECTORIES to make it stop at /home/danielc. Excerpt from
> >> git.txt
> >
> > That didn't change the situation.
>
> I'd suggest you to degrade Git to a version earlier than 1.6.1, when
> the error was not added. :-D
:) Might be easier to use "svn ci" instead. :)
> But did it at least change the error message? Here is what I got when
> "chmod 000 /tmp/a":
No. It produced the same exact error message:
fatal: Cannot change to /home/danielc/..: Permission denied
Thanks,
--Dan
--
T H E A N A L Y S I S A N D S O L U T I O N S C O M P A N Y
data intensive web and database programming
http://www.AnalysisAndSolutions.com/
4015 7th Ave #4, Brooklyn NY 11232 v: 718-854-0335 f: 718-854-0409
^ permalink raw reply
* Re: Commit performance, or lack thereof
From: Junio C Hamano @ 2009-08-23 2:20 UTC (permalink / raw)
To: James Cloos; +Cc: git
In-Reply-To: <m3r5v39zzz.fsf@lugabout.jhcloos.org>
James Cloos <cloos@jhcloos.com> writes:
> Starting in the kernel tree, if one edits and adds a single file and
> then commits it w/o specifying the file name as an argument to commit,
> ...
> OTOH, if one does specify the filename as an argument to commit,...
When you do:
git add something && git commit
the commit step is just "write the index out as a tree, create a commit
object to wrap that tree object". It never has to look at your work tree
and is a very cheap operation.
On the other hand, if you do:
some other random things && git commit pathspec
the commit step involves a lot more operations. It has to do:
- create a temporary index from HEAD (i.e. ignore the modification to
the real index you did so far with your earlier "git add");
- rehash all the paths in the work tree that matches the pathspec and
add them to that temporary index; and finally
- write the temporary index out as a tree, create a commit object to
wrap that tree object.
The second step has to go to your work tree, and if you have a slow disk,
or your buffer cache is cold, you naturally have to pay.
So it is not surprising at all if you observe that the latter takes more
time and resource than the former, although there could be something wrong
in your set-up that you need to spend 300M for it. It is fundamentally a
more expensive operation.
^ permalink raw reply
* Re: [PATCH 2/2 (v3)] reset: make the output more user-friendly.
From: Junio C Hamano @ 2009-08-23 2:33 UTC (permalink / raw)
To: Matthieu Moy; +Cc: git
In-Reply-To: <vpq8whc8euu.fsf@bauges.imag.fr>
Matthieu Moy <Matthieu.Moy@imag.fr> writes:
> Intuitively, I would have thought that "git reset" was reporting what
> it was doing, as it was doing it. So to me (before experimenting a bit
> more and looking at the source code),
>
> M foo.txt
> M bar.txt
>
> would mean "I've just reseted foo.txt and bar.txt, which were locally
> modified", while actually "git reset" can very well show this message
> after reseting only foo.txt, just informing the user that bar.txt is
> also modified. So, at least to me, the semantics was very unclear, and
> while I would have understood immediately with the one-liner message.
>
> In short: no strong objection to remove this message, but to me it is
> usefull.
Thanks for sharing the reasoning.
Two conflicting/competing thoughts come to mind:
1. Perhaps we should add a similar "explanation" for the list of paths
with changes upon switching branches with "git checkout" for
consistency.
2. Such an "explanation" of what the output means would help the first
time people, but would everybody stay "first time" forever? Would the
explanation become just another wasted line in valuable screen real
estate after people gain experience?
I am leaning towards #1 right now.
^ permalink raw reply
* Re: hitting home directory's parent
From: Nguyen Thai Ngoc Duy @ 2009-08-23 4:07 UTC (permalink / raw)
To: Jeff King; +Cc: Daniel Convissor, Git Mailing List
In-Reply-To: <20090822181607.GA25823@coredump.intra.peff.net>
On Sun, Aug 23, 2009 at 1:16 AM, Jeff King<peff@peff.net> wrote:
> On Sat, Aug 22, 2009 at 11:20:39PM +0700, Nguyen Thai Ngoc Duy wrote:
>
>> > I did read a bit farther in the manual and initialized a new repository.
>> > Issuing "git --help" once inside that new repository works. Requiring
>> > the --help command to be called from inside a repository, or even that
>> > it's looking for a repository at all, seems unwise. All it should do is
>> > display the usage information and exit.
>>
>> For simple things like --help, I agree Git should not do extra work
>> such as searching for Git repository, which is the cause. That was on
>> Jeff's plan IIRC.
>
> Without looking, I would not be surprised if it is a side effect of
> git trying to look up help-related config. So I don't think it is a
> problem exactly that it checks to see if it is in a repo (which would
> impact config lookup), but that inability to find a repo is a hard
> error.
>
> Probably it is calling "setup_git_directory_gently" and ignoring an
> error return, but there is a die() inside that function. The bug
> then is that the _gently form is calling die().
It is (and should be worked around with GIT_CEILING_DIRECTORIES).
Unfortunately in my test, it could not chdir() back when it failed to
find gitdir. chdir() was called with an absolute directory, and one
directory in that path was inaccesible, leading another die("Cannot
come back to cwd"). This one is fatal and should not be ignored. I
don't know whether having an inaccesible parent directory is a real
scenario, as lots of tools would break.
--
Duy
^ permalink raw reply
* [PATCH] post-receive-email: allow customizing of subject/intro/footer
From: Mike Frysinger @ 2009-08-23 3:51 UTC (permalink / raw)
To: git
The format of the subject/intro/footer are noise imo, but rather than
debate the issue, let the user customize the output using the existing
git config hooks section. The default output is retained for each part.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
contrib/hooks/post-receive-email | 76 +++++++++++++++++++++++++++++---------
1 files changed, 58 insertions(+), 18 deletions(-)
diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index 2a66063..a812143 100755
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -38,6 +38,15 @@
# hooks.emailprefix
# All emails have their subjects prefixed with this prefix, or "[SCM]"
# if emailprefix is unset, to aid filtering
+# hooks.emailsubject
+# Allow customizing of the subject. Default is a description of what
+# ref changed and how/why.
+# hooks.emailbodyintro
+# Allow customizing of the body intro. Default is friendly paragraph that
+# explains why the user is receiving this e-mail and what has changed.
+# hooks.emailfooter
+# Allow customizing of the footer. Default is name of the script and the
+# repo description.
# hooks.showrev
# The shell command used to format each revision in the email, with
# "%s" replaced with the commit id. Defaults to "git rev-list -1
@@ -55,6 +64,10 @@
# "X-Git-Newrev", and "X-Git-Reftype" to enable fine tuned filtering and
# give information for debugging.
#
+# All variables that start with 'email' have substitution performed on them.
+# Patterns like @foo@ are replaced with the contents of the variable foo.
+# See subst_vars() for the specific keywords available for substitution.
+#
# ---------------------------- Functions
@@ -190,36 +203,47 @@ generate_email()
generate_email_footer
}
+subst_vars()
+{
+ sep=$(printf '\001')
+ # let this be used in a pipeline or by itself
+ ( [ "$#" -ne 0 ] && echo "$@" || cat ) | sed \
+ -e "s${sep}@change_type@${sep}${change_type}${sep}g" \
+ -e "s${sep}@describe@${sep}${describe}${sep}g" \
+ -e "s${sep}@newrev@${sep}${newrev}${sep}g" \
+ -e "s${sep}@oldrev@${sep}${oldrev}${sep}g" \
+ -e "s${sep}@projectdesc@${sep}${projectdesc}${sep}g" \
+ -e "s${sep}@refname@${sep}${refname}${sep}g" \
+ -e "s${sep}@refname_type@${sep}${refname_type}${sep}g" \
+ -e "s${sep}@oldrev@${sep}${oldrev}${sep}g" \
+ -e "s${sep}@short_refname@${sep}${short_refname}${sep}g"
+}
+
generate_email_header()
{
# --- Email (all stdout will be the email)
# Generate header
+ (
cat <<-EOF
To: $recipients
- Subject: ${emailprefix}$projectdesc $refname_type, $short_refname, ${change_type}d. $describe
- X-Git-Refname: $refname
- X-Git-Reftype: $refname_type
- X-Git-Oldrev: $oldrev
- X-Git-Newrev: $newrev
+ Subject: ${emailprefix}${emailsubject}
+ X-Git-Refname: @refname@
+ X-Git-Reftype: @refname_type@
+ X-Git-Oldrev: @oldrev@
+ X-Git-Newrev: @newrev@
+ EOF
- This is an automated email from the git hooks/post-receive script. It was
- generated because a ref change was pushed to the repository containing
- the project "$projectdesc".
+ if [ -n "${emailbodyintro}" ] ; then
+ printf '\n%s\n' "${emailbodyintro}"
+ fi
- The $refname_type, $short_refname has been ${change_type}d
- EOF
+ printf '\n%s\n' "The @refname_type@, @short_refname@ has been @change_type@d"
+ ) | subst_vars
}
generate_email_footer()
{
- SPACE=" "
- cat <<-EOF
-
-
- hooks/post-receive
- --${SPACE}
- $projectdesc
- EOF
+ subst_vars "${emailfooter}"
}
# --------------- Branches
@@ -671,6 +695,22 @@ recipients=$(git config hooks.mailinglist)
announcerecipients=$(git config hooks.announcelist)
envelopesender=$(git config hooks.envelopesender)
emailprefix=$(git config hooks.emailprefix || echo '[SCM] ')
+emailsubject=$(git config hooks.emailsubject || \
+ echo '@projectdesc@ @refname_type@, @short_refname@, @change_type@d. @describe@')
+emailbodyintro=$(git config hooks.emailbodyintro || cat <<-EOF
+ This is an automated email from the git hooks/post-receive script. It was
+ generated because a ref change was pushed to the repository containing
+ the project "@projectdesc@".
+ EOF
+)
+emailfooter=$(git config hooks.emailfooter || SPACE=" " cat <<-EOF
+
+
+ hooks/post-receive
+ --${SPACE}
+ @projectdesc@
+ EOF
+)
custom_showrev=$(git config hooks.showrev)
# --- Main loop
--
1.6.4
^ permalink raw reply related
* [PATCH-v2/RFC 6/6] t4015: add tests for trailing-space on incomplete line
From: Thell Fowler @ 2009-08-23 3:49 UTC (permalink / raw)
To: git; +Cc: Johannes.Schindelin, Thell Fowler
In-Reply-To: <1250999285-10683-1-git-send-email-git@tbfowler.name>
- Add 7 --no-index tests to t4015-diff-whitespace.sh to check
that ignore options work on incomplete lines.
Signed-off-by: Thell Fowler <git@tbfowler.name>
---
t/t4015-diff-whitespace.sh | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 6d13da3..193ddbe 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -395,4 +395,37 @@ test_expect_success 'combined diff with autocrlf conversion' '
'
+# Ignore trailing-space testing on incomplete lines.
+prepare_diff_file () {
+ printf "%s%$2s" foo "" >"$1"
+ if [ $3 = "+nl" ]
+ then
+ printf "\n" >>"$1"
+ fi
+}
+
+diff_trailing () {
+ foo="foo___"
+ prepare_diff_file "left" "$2" "$3"
+ lfoo=$( expr substr $foo 1 $((3+$2)) )
+ lfoo=${lfoo}"$3"
+
+ prepare_diff_file "right" "$4" "$5"
+ rfoo=$( expr substr $foo 1 $((3+$4)) )
+ rfoo=${rfoo}"$5"
+
+ label="-$1 $lfoo $rfoo"
+
+ test_expect_success "$label" \
+ "! git diff --no-index -$1 -- left right | grep -q foo"
+}
+
+diff_trailing w 0 +nl 1 -nl
+diff_trailing w 0 -nl 1 -nl
+diff_trailing b 0 +nl 0 -nl
+diff_trailing b 1 +nl 0 -nl
+diff_trailing b 1 -nl 0 -nl
+diff_trailing -ignore-space-at-eol 0 +nl 0 -nl
+diff_trailing -ignore-space-at-eol 2 +nl 2 -nl
+
test_done
--
1.6.4.176.g556a4
^ permalink raw reply related
* [PATCH-v2/RFC 2/6] xutils: fix hash with whitespace on incomplete line
From: Thell Fowler @ 2009-08-23 3:49 UTC (permalink / raw)
To: git; +Cc: Johannes.Schindelin, Thell Fowler
In-Reply-To: <1250999285-10683-1-git-send-email-git@tbfowler.name>
- Make xdl_hash_record_with_whitespace stop hashing before the
eof when ignoring space change or space at eol on an incomplete
line.
Resolves issue with a final trailing space being included in the
hash on an incomplete line by treating the eof in the same fashion
as a newline.
Signed-off-by: Thell Fowler <git@tbfowler.name>
---
xdiff/xutils.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 04ad468..c6512a5 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -248,12 +248,12 @@ static unsigned long xdl_hash_record_with_whitespace(char const **data,
if (flags & XDF_IGNORE_WHITESPACE)
; /* already handled */
else if (flags & XDF_IGNORE_WHITESPACE_CHANGE
- && ptr[1] != '\n') {
+ && ptr[1] != '\n' && ptr + 1 < top) {
ha += (ha << 5);
ha ^= (unsigned long) ' ';
}
else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL
- && ptr[1] != '\n') {
+ && ptr[1] != '\n' && ptr + 1 < top) {
while (ptr2 != ptr + 1) {
ha += (ha << 5);
ha ^= (unsigned long) *ptr2;
--
1.6.4.176.g556a4
^ permalink raw reply related
* [PATCH-v2/RFC 5/6] xutils: fix ignore-space-at-eol on incomplete line
From: Thell Fowler @ 2009-08-23 3:49 UTC (permalink / raw)
To: git; +Cc: Johannes.Schindelin, Thell Fowler
In-Reply-To: <1250999285-10683-1-git-send-email-git@tbfowler.name>
- Allow xdl_recmatch to process to the eof.
Resolves issue with --ignore-space-at-eol processing where an
incomplete line terminated processing early before a final check
could be done on the other side.
Signed-off-by: Thell Fowler <git@tbfowler.name>
---
xdiff/xutils.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 54bb235..3e26488 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -229,7 +229,7 @@ int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
}
return (i1 >= s1 && i2 >= s2);
} else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL) {
- for (i1 = i2 = 0; i1 < s1 && i2 < s2; ) {
+ for (i1 = i2 = 0; i1 <= s1 && i2 <= s2; ) {
if (l1[i1] != l2[i2]) {
while (i1 < s1 && isspace(l1[i1]))
i1++;
--
1.6.4.176.g556a4
^ permalink raw reply related
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