On Sun, Sep 04, 2005 at 11:48:08AM -0700, Junio C Hamano wrote:
> Fredrik Kuivinen <[EMAIL PROTECTED]> writes:
>
> > In non-english locales diff(1) do sometimes output "\ No newline at end of
> > file" in some other language. Set LC_ALL to C before execing diff to avoid
> > this behaviour.
> >
> >
Signed-off-by: Daniel Barkalow
---
Documentation/technical/trivial-merge.txt | 92 +
1 files changed, 92 insertions(+), 0 deletions(-)
create mode 100644 Documentation/technical/trivial-merge.txt
7544be0a8eda7b796150729a7795c2639278da62
diff --git a/Documentation/t
Adds support for multiple ancestors, removes --emu23, much simplification.
Signed-off-by: Daniel Barkalow <[EMAIL PROTECTED]>
---
read-tree.c | 811 +++--
t/t1005-read-tree-m-2way-emu23.sh | 422 ---
2 files changed, 425 ins
Signed-off-by: Daniel Barkalow <[EMAIL PROTECTED]>
---
object.c | 11 +++
object.h |3 +++
2 files changed, 14 insertions(+), 0 deletions(-)
88cf2db55848e7a2cf655171c7e9fd74c70a0281
diff --git a/object.c b/object.c
--- a/object.c
+++ b/object.c
@@ -184,6 +184,17 @@ struct object_li
Signed-off-by: Daniel Barkalow <[EMAIL PROTECTED]>
---
tree.c | 21 +
tree.h |3 +++
2 files changed, 24 insertions(+), 0 deletions(-)
3bfcc20b6aeff3e1fbcce97a426383c9770a2105
diff --git a/tree.c b/tree.c
--- a/tree.c
+++ b/tree.c
@@ -1,5 +1,7 @@
#include "tree.h"
#in
Various messages have already described this series. There's still a
memory leak that should get resolved, but otherwise it should work. I'm
not entirely sure that all directory-file conflict cases are handled
properly, and some undefined cases behave differently. Also, I was a bit
careless wit
I've got a version of read-tree which accepts multiple ancestors and does
a merge using information from all of them.
The basic features are that it looks for an ancestor which would permit a
trivial merge, and uses that. However, if it finds ancestors which permit
different trivial merges, it
On Sun, Sep 04, 2005 at 12:25:16PM -0700, Junio C Hamano wrote:
> Fredrik Kuivinen <[EMAIL PROTECTED]> writes:
>
> > The message "\ No newline at end of file" which sometimes is produced
> > by diff(1) is locale dependent. We can't assume more than that it
> > begins with "\ ".
> >
> > Signed-off-
As I promised Junio a few weeks ago (via private email), here's an update to
git-send-email-script
that fixes a few annoying things it does.
1. No longer require --subject for most uses.
2. No longer require --in-reply-to for most uses.
3. If not given as command line parameters, don't prompt fo
Signed-off-by: Ryan Anderson <[EMAIL PROTECTED]>
---
Documentation/git-send-email-script.txt | 13 +
1 files changed, 9 insertions(+), 4 deletions(-)
60765e20aa12da748f43204e25cb582f88fb16c8
diff --git a/Documentation/git-send-email-script.txt
b/Documentation/git-send-email-scrip
Add a "--compose" option that uses $EDITOR to edit an "introductory" email to
the patch series.
Signed-off-by: Ryan Anderson <[EMAIL PROTECTED]>
---
git-send-email-script | 86 ++---
1 files changed, 81 insertions(+), 5 deletions(-)
b3c7bf0ee80c1d
On Sun, 4 Sep 2005, Junio C Hamano wrote:
> Daniel Barkalow <[EMAIL PROTECTED]> writes:
>
> > I got mostly done with this before Linus mentioned the possibility of
> > having multiple index entries in the same stage for a single path. I
> > finished it anyway, but I'm not sure that we won't want
Daniel Barkalow <[EMAIL PROTECTED]> writes:
> I got mostly done with this before Linus mentioned the possibility of
> having multiple index entries in the same stage for a single path. I
> finished it anyway, but I'm not sure that we won't want to know which of
> the common ancestors contributed w
Horst von Brand <[EMAIL PROTECTED]> writes:
> Junio C Hamano <[EMAIL PROTECTED]> wrote:
>> I had the same opinion. The counter-argument people raised when
>> this topic came up on the list was that it would help grepping
>> in the source tree.
>
> Grepping for what?
I am only a messenger for the
Junio C Hamano <[EMAIL PROTECTED]> wrote:
> Horst von Brand <[EMAIL PROTECTED]> writes:
> >> 3. Non-binaries are called '*-scripts'.
> >>
> >>In earlier discussions some people seem to like the
> >>distinction between *-script and others; I did not
> >>particularly like it, but I am th
Junio C Hamano wrote:
Peter Williams <[EMAIL PROTECTED]> writes:
*.pl is what is usually used for perl scripts.
My recollection may be faulty, but '*.pl' was meant to be used
for older Perl libraries back in perl4 days, and the standalone
scripts are to be named '*.perl' but many people mad
Peter Williams <[EMAIL PROTECTED]> writes:
> *.pl is what is usually used for perl scripts.
My recollection may be faulty, but '*.pl' was meant to be used
for older Perl libraries back in perl4 days, and the standalone
scripts are to be named '*.perl' but many people made the
mistake of naming th
Junio C Hamano wrote:
Horst von Brand <[EMAIL PROTECTED]> writes:
3. Non-binaries are called '*-scripts'.
In earlier discussions some people seem to like the
distinction between *-script and others; I did not
particularly like it, but I am throwing this in for
discussion.
I for one
Horst von Brand <[EMAIL PROTECTED]> writes:
>> 3. Non-binaries are called '*-scripts'.
>>
>>In earlier discussions some people seem to like the
>>distinction between *-script and others; I did not
>>particularly like it, but I am throwing this in for
>>discussion.
>
> I for one th
Junio C Hamano <[EMAIL PROTECTED]> wrote:
> I said:
>
> > I'll draw up a strawman tonight unless somebody else
> > does it first.
[...]
> 3. Non-binaries are called '*-scripts'.
>
>In earlier discussions some people seem to like the
>distinction between *-script and others; I di
Fredrik Kuivinen <[EMAIL PROTECTED]> writes:
> The message "\ No newline at end of file" which sometimes is produced
> by diff(1) is locale dependent. We can't assume more than that it
> begins with "\ ".
>
> Signed-off-by: Fredrik Kuivinen <[EMAIL PROTECTED]>
> ---
>
> The previous patch wasn't d
Daniel Barkalow <[EMAIL PROTECTED]> writes:
> I think this is actually quite a regular merge, and I think we should be
> able to offer some assistance. The situation with K is normal: case #3ALT.
> If someone introduces a file and there's no file or directory with that
> name in other trees, we
Fredrik Kuivinen <[EMAIL PROTECTED]> writes:
> In non-english locales diff(1) do sometimes output "\ No newline at end of
> file" in some other language. Set LC_ALL to C before execing diff to avoid
> this behaviour.
>
> Signed-off-by: Fredrik Kuivinen <[EMAIL PROTECTED]>
I was thinking about thi
The message "\ No newline at end of file" which sometimes is produced
by diff(1) is locale dependent. We can't assume more than that it
begins with "\ ".
Signed-off-by: Fredrik Kuivinen <[EMAIL PROTECTED]>
---
The previous patch wasn't doing the right thing. Hopefully I have
managed to get it ri
On Sun, 4 Sep 2005, Junio C Hamano wrote:
> Sam Ravnborg <[EMAIL PROTECTED]> writes:
>
> > If the problem is not fully understood it can be difficult to come up
> > with the proper solution. And with the example above the problem should
> > be really easy to understand.
> > Then we have the tree
In non-english locales diff(1) do sometimes output "\ No newline at end of
file" in some other language. Set LC_ALL to C before execing diff to avoid
this behaviour.
Signed-off-by: Fredrik Kuivinen <[EMAIL PROTECTED]>
---
diff.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
eb626
Junio C Hamano <[EMAIL PROTECTED]> writes:
>> Rsync works for me also. But HTTP is still broken.
>
> Sorry, a broken repo. Fix made on master should percolate
> through soonish.
HTTP clone works now, thanks.
--
Kalle Valo
-
To unsubscribe from this list: send the line "unsubscribe git" in
the
The message "\ No newline at end of file" which sometimes is produced by
diff(1) is locale dependent. We can't assume more than that it begins
with "\ ".
Signed-off-by: Fredrik Kuivinen <[EMAIL PROTECTED]>
---
For example, given two files, "foo" and "bar", with appropriate
contents 'diff -u foo b
On Sat, 3 Sep 2005, Junio C Hamano wrote:
> Daniel Barkalow <[EMAIL PROTECTED]> writes:
>
> > I think "fetch" is more applicable to what they do.
>
> OK. then they are git-http-fetch and friends. How about
> git-ssh-push? The counterpart of fetch-pack/clone-pack is
> called upload-pack, so wo
Kalle Valo <[EMAIL PROTECTED]> writes:
> Rsync works for me also. But HTTP is still broken.
Sorry, a broken repo. Fix made on master should percolate
through soonish.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo i
On Sun, 2005-09-04 at 17:31 +0200, Jan Dittmer wrote:
> David Woodhouse wrote:
> > On Fri, 2005-09-02 at 02:00 -0700, Linus Torvalds wrote:
> >
> >>Ahh. Please change that to
> >>
> >>rm -rf tmp-empty-tree
> >>mkdir tmp-empty-tree
> >>cd tmp-empty-tree
> >>git-init-
David Woodhouse wrote:
> On Fri, 2005-09-02 at 02:00 -0700, Linus Torvalds wrote:
>
>>Ahh. Please change that to
>>
>>rm -rf tmp-empty-tree
>>mkdir tmp-empty-tree
>>cd tmp-empty-tree
>>git-init-db
>>
>>because otherwise you'll almost certainly hit something else lat
Arch tags are full commits (without any changed files) as well. Trust Arch
to have put an unchanged tree in place (which seems to do reliably), and
just add a tag & new branch. Speeds up Arch imports significantly, and leaves
history in a much saner state.
Signed-off-by: Martin Langhoff <[EMAIL PR
If there is no GIT directory, archimport will assume it is an initial import.
It now also supports incremental imports, skipping "seen" commits. You can
now run it repeatedly to pull new commits from the Arch repository.
Signed-off-by: Martin Langhoff <[EMAIL PROTECTED]>
---
git-archimport-s
Martin Langhoff <[EMAIL PROTECTED]> writes:
>> error: Couldn't get
>> http://www.kernel.org/pub/scm/git/git.git/refs/heads/dbrt-test for
>> heads/dbrt-test
>
> Tried to repro, but takes ageson my puny cablemodem. Cloning via rsync
> seems to work well though.
Rsync works for me also. But HTTP i
On 9/4/05, Kalle Valo <[EMAIL PROTECTED]> wrote:
> I was trying to clone the git repository this morning and it fails
> every time:
> got 15891f81e0fa99333ad81e9271df5b2a72ba368e
> error: Couldn't get
> http://www.kernel.org/pub/scm/git/git.git/refs/heads/dbrt-test for
> heads/dbrt-test
Tried to
At least pretty_print_commit() expects to get NUL-terminated commit data to
work properly. unpack_sha1_rest(), which reads objects from separate files,
and unpack_non_delta_entry(), which reads non-delta-compressed objects from
pack files, already add the NUL byte after the object data, but patch_
I was trying to clone the git repository this morning and it fails
every time:
$ git clone http://www.kernel.org/pub/scm/git/git.git git
defaulting to local storage area
got 953e5842f8fcd40c3e7013a9793746719016db1b
got 394b750a6e25c2f085d950dbe04368e212f07ad8
got 86b13da46cd710a45a89968880c691452d
Junio C Hamano <[EMAIL PROTECTED]> writes:
> All true. Let's redraw that simplified scenario, and see if
> what I said still holds. It may be interesting to store my
> previous message and this one in a file and run diff between
> them.
There are a couple of things worth mentioning about the tw
Sam Ravnborg <[EMAIL PROTECTED]> writes:
> If the problem is not fully understood it can be difficult to come up
> with the proper solution. And with the example above the problem should
> be really easy to understand.
> Then we have the tree as used by hpa with a few more mergers in it. But
> the
40 matches
Mail list logo
