Git development
 help / color / mirror / Atom feed
* Re: clone from url with email address as username?(escaping @ symbol)
From: Matthieu Moy @ 2009-09-29 14:30 UTC (permalink / raw)
  To: Sverre Rabbelier; +Cc: Ben Bennett, git
In-Reply-To: <fabb9a1e0909290725w616c3ea9vcb1d2c53950f7788@mail.gmail.com>

Sverre Rabbelier <srabbelier@gmail.com> writes:

> Heya,
>
> On Tue, Sep 29, 2009 at 16:20, Ben Bennett <benbennett@gmail.com> wrote:
>> Is there any escape sequence for the @ symbol when cloning?
>
> I thought @ is not allowed to be in an url? What do you need to
> escape it for?

If your username is "foo@bar.com", then the clone URL might well be

ssh://foo@bar.com@server.com/path/to/repo

The question is which @ is the login/server separator, and which one
is included in the login. A quick test with

git clone ssh://foo@bar.com@localhost/path/to/repo

shows me that Git does the right thing, i.e. uses "foo@bar.com" as the
login, without the need to escape it.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

^ permalink raw reply

* Re: clone from url with email address as username?(escaping @ symbol)
From: Sverre Rabbelier @ 2009-09-29 14:25 UTC (permalink / raw)
  To: Ben Bennett; +Cc: git
In-Reply-To: <970bc7c80909290720i1c5566fer1c1a3db744edc609@mail.gmail.com>

Heya,

On Tue, Sep 29, 2009 at 16:20, Ben Bennett <benbennett@gmail.com> wrote:
> Is there any escape sequence for the @ symbol when cloning?

I thought @ is not allowed to be in an url? What do you need to escape it for?

-- 
Cheers,

Sverre Rabbelier

^ permalink raw reply

* Re: git-diff/git-diff-files: Turn off copy-detection?
From: Marius Storm-Olsen @ 2009-09-29 14:24 UTC (permalink / raw)
  To: Johannes Sixt; +Cc: Git Mailing List
In-Reply-To: <4AC20E37.3090204@viscovery.net>

Johannes Sixt said the following on 29.09.2009 15:40:
> Marius Storm-Olsen schrieb:
>> Doing a 'git diff origin/4.5..origin/4.6 -- src/corelib' gives me this
>> excerpt:
>>
>> diff --git origin/4.5/src/corelib/tools/qtimeline.h
>> origin/4.6/src/corelib/animation/qabstractanimation.h
>> similarity index 58%
>> ...
> 
> You must have the config variable diff.renames set. But I would not expect
> that this setting applies to 'git diff-files', only to 'git diff'.

$ git config diff.renames
copies

That's it, thanks! Strange that nothing in the git-diff documentation 
pointed me in this direction? Obviously I didn't connect the dots 
between 'copy' and 'renames' either..


> You can also try 'git diff -C99 -M99' if you don't want to unset the
> config variable.

Thanks, I'll add that to my review script. Much appreciated!

--
.marius

^ permalink raw reply

* clone from url with email address as username?(escaping @ symbol)
From: Ben Bennett @ 2009-09-29 14:20 UTC (permalink / raw)
  To: git

Is there any escape sequence for the @ symbol when cloning?


Thanks,
Ben

^ permalink raw reply

* Re: [PATCH] git-blame.el: Change how blame information is shown.
From: David Kågedal @ 2009-09-29 13:39 UTC (permalink / raw)
  To: git
In-Reply-To: <1254230666-18283-1-git-send-email-davidk@lysator.liu.se>

>From: David@krank.kagedal.org, Kågedal@krank.kagedal.org, davidk@lysator.liu.se

Sorry about the broken from address.

-- 
David Kågedal

^ permalink raw reply

* Re: git-diff/git-diff-files: Turn off copy-detection?
From: Miklos Vajna @ 2009-09-29 13:42 UTC (permalink / raw)
  To: Marius Storm-Olsen; +Cc: Git Mailing List
In-Reply-To: <4AC20286.6020108@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 563 bytes --]

On Tue, Sep 29, 2009 at 02:50:14PM +0200, Marius Storm-Olsen <mstormo@gmail.com> wrote:
> So, not even related. They should really had shown up as new files, 
> IMO. (I guess git stores the creation of the file as a delta of the 
> indicated 'copy', but in this case I don't care about that :)

No, it does not (as long as we are not talking about packfiles). AFAIK
copy detection is disabled by default, so probably you have a setting
that enables it for you and you forgot about it. Are you sure you don't
have any settings like diff.renames = copies?

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply

* Re: git-diff/git-diff-files: Turn off copy-detection?
From: Johannes Sixt @ 2009-09-29 13:40 UTC (permalink / raw)
  To: Marius Storm-Olsen; +Cc: Git Mailing List
In-Reply-To: <4AC20286.6020108@gmail.com>

Marius Storm-Olsen schrieb:
> I'm trying to diff the header files between two version of a repo, to do
> an ABI review, but get too many diffs from 'similar copy', which makes
> the review hard. These are generally unrelated files, but due to large
> copyright header, and spaces, the actual changes are not large enough to
> be detected as new files. I'd therefore like to turn off copy detection
> completely, or at least set some kind of threshold before a file is
> considered a copy in the diff.
> 
> Doing a 'git diff origin/4.5..origin/4.6 -- src/corelib' gives me this
> excerpt:
> 
> diff --git origin/4.5/src/corelib/tools/qtimeline.h
> origin/4.6/src/corelib/animation/qabstractanimation.h
> similarity index 58%
> ...

You must have the config variable diff.renames set. But I would not expect
that this setting applies to 'git diff-files', only to 'git diff'.

You can also try 'git diff -C99 -M99' if you don't want to unset the
config variable.

-- Hannes

^ permalink raw reply

* Re: Alles wird Git, Berlin, Oct 3rd, 2009
From: Erik Faye-Lund @ 2009-09-29 12:51 UTC (permalink / raw)
  To: Christian Halstrick; +Cc: git
In-Reply-To: <loom.20090929T111919-714@post.gmane.org>

On Tue, Sep 29, 2009 at 11:30 AM, Christian Halstrick
<christian.halstrick@sap.com> wrote:
> Thank god msysgit has learned git send-email.

You're welcome ;)

-- 
Erik "kusma" Faye-Lund
kusmabite@gmail.com
(+47) 986 59 656

^ permalink raw reply

* git-diff/git-diff-files: Turn off copy-detection?
From: Marius Storm-Olsen @ 2009-09-29 12:50 UTC (permalink / raw)
  To: Git Mailing List

Hi,

I'm trying to diff the header files between two version of a repo, to 
do an ABI review, but get too many diffs from 'similar copy', which 
makes the review hard. These are generally unrelated files, but due to 
large copyright header, and spaces, the actual changes are not large 
enough to be detected as new files. I'd therefore like to turn off 
copy detection completely, or at least set some kind of threshold 
before a file is considered a copy in the diff.

Doing a 'git diff origin/4.5..origin/4.6 -- src/corelib' gives me this 
excerpt:

diff --git origin/4.5/src/corelib/tools/qtimeline.h 
origin/4.6/src/corelib/animation/qabstractanimation.h
similarity index 58%
...
diff --git origin/4.5/src/corelib/kernel/qsystemsemaphore.h 
origin/4.6/src/corelib/animation/qanimationgroup.h
similarity index 63%
...
diff --git origin/4.5/src/corelib/kernel/qsystemsemaphore.h 
origin/4.6/src/corelib/animation/qparallelanimationgroup.h
similarity index 63%
...
diff --git origin/4.5/src/corelib/io/qresource_iterator_p.h 
origin/4.6/src/corelib/animation/qpauseanimation.h
similarity index 68%
...
diff --git origin/4.5/src/corelib/kernel/qsystemsemaphore.h 
origin/4.6/src/corelib/animation/qpropertyanimation.h
similarity index 60%
...
diff --git origin/4.5/src/corelib/kernel/qsystemsemaphore.h 
origin/4.6/src/corelib/animation/qsequentialanimationgroup.h
similarity index 55%
...
diff --git origin/4.5/src/corelib/animation/qvariantanimation.h 
origin/4.6/src/corelib/animation/qvariantanimation.h
new file mode 100644
...
diff --git origin/4.5/src/corelib/arch/qatomic_arch.h 
origin/4.6/src/corelib/arch/qatomic_arch.h
index 52ab101..548a5e9 100644

So, not even related. They should really had shown up as new files, 
IMO. (I guess git stores the creation of the file as a delta of the 
indicated 'copy', but in this case I don't care about that :)

Thanks!

--
.marius

^ permalink raw reply

* Re: Compact view of history in gitk
From: Yakup Akbay @ 2009-09-29 12:44 UTC (permalink / raw)
  To: Johannes Sixt; +Cc: git
In-Reply-To: <4AC1F88E.7080802@viscovery.net>

Johannes Sixt wrote:
> Yakup Akbay schrieb:
>   
>> Think of the gitk version of the history below:
>>
>>                  E-*-*-*-F
>>                 /
>> A-*-*-*-*-*-*-B-C-*-*-*-D
>>               \
>>                G-*-*-H-*-*-*-I
>>                       \
>>                        J-*-*-*-*-*-K
>>
>>
>> I want an output like this:
>>
>>        E-~-F
>>       /
>> A-~-B-C-~-D
>>     \
>>      G-~-H-~-I
>>           \
>>            J-~-K
>>
>> Is there an option in gitk (or in any other tool) to get such a view?
>>     
>
> I think, --simplify-by-decoration comes close, even though it may not be
> 100% what you describe.
>
> -- Hannes
>   

Thanks Hannes, this is exactly what I need!

Yakup

^ permalink raw reply

* Re: Compact view of history in gitk
From: Johannes Sixt @ 2009-09-29 12:07 UTC (permalink / raw)
  To: Yakup Akbay; +Cc: git
In-Reply-To: <4AC1F435.4030802@ubicom.com>

Yakup Akbay schrieb:
> Think of the gitk version of the history below:
> 
>                  E-*-*-*-F
>                 /
> A-*-*-*-*-*-*-B-C-*-*-*-D
>               \
>                G-*-*-H-*-*-*-I
>                       \
>                        J-*-*-*-*-*-K
> 
> 
> I want an output like this:
> 
>        E-~-F
>       /
> A-~-B-C-~-D
>     \
>      G-~-H-~-I
>           \
>            J-~-K
> 
> Is there an option in gitk (or in any other tool) to get such a view?

I think, --simplify-by-decoration comes close, even though it may not be
100% what you describe.

-- Hannes

^ permalink raw reply

* Compact view of history in gitk
From: Yakup Akbay @ 2009-09-29 11:49 UTC (permalink / raw)
  To: git

Hi,

imagine a git history with many branches and many many commits in it,

which you cannot have a bird's eye view to the whole git history
(consider linux kernel). What I'm looking for is to see is a graphical
history representation with only the tip of all branches plus all merge
bases drwan like a molecul shape, where all intermediate commits are
replaced by a single symbol like '~'. 

Think of the gitk version of the history below:

                  E-*-*-*-F
                 /
A-*-*-*-*-*-*-B-C-*-*-*-D
               \
                G-*-*-H-*-*-*-I
                       \
                        J-*-*-*-*-*-K


I want an output like this:

        E-~-F
       /
A-~-B-C-~-D
     \
      G-~-H-~-I
           \
            J-~-K

Is there an option in gitk (or in any other tool) to get such a view? 

Yakup

^ permalink raw reply

* Re: Distribution size
From: Johannes Schindelin @ 2009-09-29 10:47 UTC (permalink / raw)
  To: Thomas Singer; +Cc: Marius Storm-Olsen, git, Marc Weber
In-Reply-To: <4AC1CE12.8040406@syntevo.com>

Hi,

On Tue, 29 Sep 2009, Thomas Singer wrote:

> > Also, you don't need everything in msysgit to distribute, only for 
> > development.
>
> How should I find out what is required to *run* all git commands, except 
> of trying it myself? Is there a document available somewhere?

Thomas, are you seriously asking to work for you for free?  What's in it 
for us?

Ciao,
Dscho

^ permalink raw reply

* Re: Alles wird Git, Berlin, Oct 3rd, 2009
From: Christian Halstrick @ 2009-09-29  9:30 UTC (permalink / raw)
  To: git
In-Reply-To: <alpine.DEB.1.00.0909282019160.4985@pacific.mpi-cbg.de>

Johannes Schindelin <Johannes.Schindelin <at> gmx.de> writes:

> As far as I am concerned, it is open to everyone who wants to meet some 
> Gits, even top-posters 

sorry for top-posting. It's so easy to top-post if you are forced to use
outlook. And sending a jgit patch with outlook and exchange servers is hell.
Thank god msysgit has learned git send-email.
 

^ permalink raw reply

* Git problems with adding files (first use)
From: A. S. Budden @ 2009-09-29  9:17 UTC (permalink / raw)
  To: git

Dear all,

I have just installed Git from the msysgit distribution
(Git-1.6.4-preview20090730.exe).  I've also installed TortoiseGit
(1.0.2.0).  I've been having a few problems adding files (either using
tortoise or the command line tools).

What I did (copied and pasted directly from the command window):

=============================================================
Z:\>mkdir testproject
Z:\>cd testproject
Z:\testproject>echo "test file" > file1.c
Z:\testproject>echo "test file" > file2.c
Z:\testproject>git init
Initialized empty Git repository in Z:/testproject/.git/
Z:\testproject>git add file1.c
error: unable to create temporary sha1 filename .git/objects/f7/tmp_obj_a02340:
No such file or directory

error: file1.c: failed to insert into database
error: unable to index file file1.c
fatal: adding files failed
=============================================================

Can anyone tell me what I'm doing wrong?  I've tried using tortoise
git and I've tried it on an existing project (rather than a bunch of
random files), but I can't seem to add files to the repository: I
always get the "No such file or directory" error.

Thanks in advance for your help.

Al

^ permalink raw reply

* Re: Distribution size
From: Thomas Singer @ 2009-09-29  9:06 UTC (permalink / raw)
  To: Marius Storm-Olsen; +Cc: git, Johannes Schindelin, Marc Weber
In-Reply-To: <4AC0B088.9090101@gmail.com>

Hi Marius,

> Also, you don't need everything in msysgit to distribute, only for development.

How should I find out what is required to *run* all git commands, except of
trying it myself? Is there a document available somewhere?

--
Best regards,
Thomas Singer
=============
syntevo GmbH
http://www.syntevo.com
http://blog.syntevo.com


Marius Storm-Olsen wrote:
> Thomas Singer said the following on 26.09.2009 17:17:
>>> Funny.  Git for Windows is less than 12MB [*1*].
>>
>> Well, the portable Git bundle compressed with 7zip is approx. 11MB,
>> the Git installer (maybe also using 7zip internally) is at approx.
>> the same size. Unpacked/installed on disk they are at 138MB/131MB.
>> If you try to compress it with zip, it will reduce to approx. 70MB
>> which still is quite large.
>>
>> We are interested, too, in having a small(er) bundle, because we
>> want to distribute Git binaries with our Git GUI front-end,
>> SmartGit, so the user will (have the option to) get an
>> all-inclusive-bundle.
> 
> [Please, never ever top-post on the Git mailing list, thanks]
> 
> Most of the git-*.exe are identical duplicates, so most of that can be
> nuked. Also, you don't need everything in msysgit to distribute, only
> for development. You should be able to make a fairly small distribution
> for usage only.
> 
> -- 
> .marius
> 
> 

^ permalink raw reply

* Re: Deciding between Git/Mercurial
From: Dilip M @ 2009-09-29  8:54 UTC (permalink / raw)
  To: Daniele Segato; +Cc: newsgroups, git
In-Reply-To: <9accb4400909290144t1363b5c6t8886bfa01e486c94@mail.gmail.com>

On Tue, Sep 29, 2009 at 2:14 PM, Daniele Segato <daniele.bilug@gmail.com> wrote:
> Can I propose to make this discussion cross-mailing list adding the hg
> mailing list to the CC?  I think it would be a good discussion if we don't
> end up flaming.  Let me know what you think about it

We will probably end in flames. Its same as comparing Vim and Emacs, Python
and Perl...

...this comparison is all ver web. Checkout!

http://importantshock.wordpress.com/2008/08/07/git-vs-mercurial/

My *personnel*  opinion is, If it is for project _only_ on UNIX, than GIT and
repo tool from Google will be killing combination.

If project is on both Windows & UNIX (But consider where do you compile your
code), than hg doesn't have matching!



-- 
Dilip

^ permalink raw reply

* Re: Deciding between Git/Mercurial
From: Daniele Segato @ 2009-09-29  8:44 UTC (permalink / raw)
  To: newsgroups; +Cc: git
In-Reply-To: <h9nlhj$heq$1@ger.gmane.org>

On Sun, Sep 27, 2009 at 2:24 PM, Anteru
<newsgroups@catchall.shelter13.net> wrote:
> I'm currently evaluating DVCS for a project, and we're at a point where
> it comes down to either Mercurial or Git. Right now, I'm advocating for
> Git, while my co-workers like Mercurial, so I'd like to provide some
> good arguments in favor of git. Unfortunately, I'm not a git expert, so
> I hope I can get some help here ...
>
> First of all, what's the matter with git and Windows, is there some
> long-term commitment to make git work on Windows as well as on Linux?
> I'm using msysgit on Windows, and personally I'm happy with it, but my
> co-workers constantly nag that Mercurial has superior portability ...


Can I propose to make this discussion cross-mailing list adding the hg
mailing list to the CC?
I think it would be a good discussion if we don't end up flaming.
Let me know what you think about it


about the Windows+Git compatibility, you may consider TortoiseGit too
for the not-CLI-oriented guys; I've seen it a while ago and it seems
pettry well integrated with windows


> Mercurial's revision number system: With git, I get an SHA1 hash for
> every commit, but it's not possible to see whether Hash1 is newer than
> Hash2, while Mecurial also adds a running number to each commit. What's
> the rationale behind this decision for git, and is it possible to
> emulate Mercurial's behavior somehow?


If you tag a commit then you should be able to see how many commits
there are from that one issuing a git describe
(found on the internet)
git commit -m'Commit One.'
git tag -a -m'Tag One.' 1.2.3
git describe    # => 1.2.3
git commit -m'Commit Two.'
git describe    # => 1.2.3-1-gaac161d
git commit -m'Commit Three.'
git describe    # => 1.2.3-2-g462715d
git tag -a -m'Tag Two.' 2.0.0
git describe    # => 2.0.0


> So far, my key arguments are that git is more robust (more projects
> using it, larger developer base), of course git's excellent performance
> and the much better support for SVN, which is important for us as we can
> slowly migrate from SVN->Git, while hgmercurial is still in the making
> (and Python's SVN->Hg switch is for instance waiting for it).

^ permalink raw reply

* Re: Deciding between Git/Mercurial
From: Sverre Rabbelier @ 2009-09-29  8:22 UTC (permalink / raw)
  To: Matthieu Moy; +Cc: Steven Noonan, Damien Wyart, Anteru, git
In-Reply-To: <vpqljjykvpf.fsf@bauges.imag.fr>

Heya,

On Tue, Sep 29, 2009 at 10:21, Matthieu Moy
<Matthieu.Moy@grenoble-inp.fr> wrote:
>  http://www.google.com/search?q=indefero+clone+google+code
>
> (most links are in French, but this is what they say)

Might I suggest for those that are no masters of the french language:

http://translate.google.com/translate_s?hl=en&clss=&q=indefero+clone+google+code&sl=en&tl=fr


-- 
Cheers,

Sverre Rabbelier

^ permalink raw reply

* Re: Deciding between Git/Mercurial
From: Matthieu Moy @ 2009-09-29  8:21 UTC (permalink / raw)
  To: Sverre Rabbelier; +Cc: Steven Noonan, Damien Wyart, Anteru, git
In-Reply-To: <fabb9a1e0909281433l461086e3k93a138ad4b9b86c6@mail.gmail.com>

Sverre Rabbelier <srabbelier@gmail.com> writes:

> Heya,
>
> On Mon, Sep 28, 2009 at 23:09, Steven Noonan <steven@uplinklabs.net> wrote:
>> The interface looks very similar to Google Code's. I wonder, is this
>> the same thing that Google is using, or is it just mimicking the
>> interface?
>
> Whow, it _does_ look a lot like Google Code, I doubt it's the same
> code as I don't think Google Code's verison is open source, pretty
> good copy either way.

Indefero is a clone of Google code.

  http://www.google.com/search?q=indefero+clone+google+code

(most links are in French, but this is what they say)

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

^ permalink raw reply

* Re: Deciding between Git/Mercurial
From: Mike Ralphson @ 2009-09-29  7:44 UTC (permalink / raw)
  To: Randal L. Schwartz, loic
  Cc: Sverre Rabbelier, Steven Noonan, Damien Wyart, Anteru, git
In-Reply-To: <86iqf2r5ch.fsf@blue.stonehenge.com>

2009/9/29 Randal L. Schwartz <merlyn@stonehenge.com>:
>>>>>> "Sverre" == Sverre Rabbelier <srabbelier@gmail.com> writes:
>
> Sverre> Whow, it _does_ look a lot like Google Code, I doubt it's the same
> Sverre> code as I don't think Google Code's verison is open source, pretty
> Sverre> good copy either way.
>
> I gotta get these guys on FLOSS Weekly.  Is anyone here a member of
> the team?

Not a member of the team, just a user (and bug reporter!), but I
believe Indefero is almost all the work of one pretty amazing guy, Dr
Loïc d'Anterroches, cc'd above.

Mike

^ permalink raw reply

* [PATCH 1/2] builtin-mailinfo.c: check error status from rewind and ftruncate
From: Junio C Hamano @ 2009-09-29  6:40 UTC (permalink / raw)
  To: git

A recent "cut at scissors" implementation rewinds and truncates the output
file to store the message when it sees a scissors mark, but it did not
check if these library calls succeeded.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin-mailinfo.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index d498b1c..3306d9e 100644
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -785,8 +785,10 @@ static int handle_commit_msg(struct strbuf *line)
 
 	if (use_scissors && is_scissors_line(line)) {
 		int i;
-		rewind(cmitmsg);
-		ftruncate(fileno(cmitmsg), 0);
+		if (rewind(cmitmsg))
+			die_errno("Could not rewind output message file");
+		if (ftruncate(fileno(cmitmsg), 0))
+			die_errno("Could not truncate output message file at scissors");
 		still_looking = 1;
 
 		/*
-- 
1.6.3

^ permalink raw reply related

* [PATCH 2/2] fast-import.c::validate_raw_date(): really validate the value
From: Junio C Hamano @ 2009-09-29  6:40 UTC (permalink / raw)
  To: git
In-Reply-To: <1254206409-13256-1-git-send-email-gitster@pobox.com>

When reading the "raw format" timestamp from the input stream, make sure
that the timezone offset is a reasonable value by imitating 7122f82
(date.c: improve guess between timezone offset and year., 2006-06-08).

We _might_ want to also check if the timestamp itself is reasonable, but
that is left for a separate commit.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 fast-import.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fast-import.c b/fast-import.c
index 7ef9865..6faaaac 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1744,10 +1744,12 @@ static int validate_raw_date(const char *src, char *result, int maxlen)
 {
 	const char *orig_src = src;
 	char *endp;
+	unsigned long num;
 
 	errno = 0;
 
-	strtoul(src, &endp, 10);
+	num = strtoul(src, &endp, 10);
+	/* NEEDSWORK: perhaps check for reasonable values? */
 	if (errno || endp == src || *endp != ' ')
 		return -1;
 
@@ -1755,8 +1757,9 @@ static int validate_raw_date(const char *src, char *result, int maxlen)
 	if (*src != '-' && *src != '+')
 		return -1;
 
-	strtoul(src + 1, &endp, 10);
-	if (errno || endp == src || *endp || (endp - orig_src) >= maxlen)
+	num = strtoul(src + 1, &endp, 10);
+	if (errno || endp == src + 1 || *endp || (endp - orig_src) >= maxlen ||
+	    1400 < num)
 		return -1;
 
 	strcpy(result, orig_src);
-- 
1.6.3

^ permalink raw reply related

* Re: Deciding between Git/Mercurial
From: Anteru @ 2009-09-29  6:32 UTC (permalink / raw)
  To: git
In-Reply-To: <m33a66br69.fsf@localhost.localdomain>

> First, you have to remember that this 'number of commit' thingy is
> *local* to your repository, so you cannot use commit numbers to
> communicate with other developers.  This is inherent and unavoidable
Ah cool, thanks for clarifying this.

>> So far, my key arguments are that git is more robust (more projects
>> using it, larger developer base), of course git's excellent performance
>> and the much better support for SVN, which is important for us as we can
>> slowly migrate from SVN->Git, while hgmercurial is still in the making
>> (and Python's SVN->Hg switch is for instance waiting for it).
> 
> hgmercurial? or hgsubversion?
hgsubversion of course, which is supposed to be what git-svn is already.
At the moment, I already use git with our SVN server, so I can show some
of the advantages (for instance, renaming works much better than with
SVN itself :) ), and I guess it also makes the migration easier as
everyone can try with Git locally and we switch from SVN to Git once
everyone has switched locally.

Thanks for all the input so far!

Cheers,
  Anteru

^ permalink raw reply

* [PATCH] typo fix: Directory `...' exist, ...: s/exist/exists/
From: Jim Meyering @ 2009-09-29  5:43 UTC (permalink / raw)
  To: git list

Using next, I saw this:

    Directory 'gnulib' exist, but is neither empty nor a git repository


>From 438a7c3a41f0e829779cccd901cf894300b6683e Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Tue, 29 Sep 2009 07:42:25 +0200
Subject: [PATCH] typo fix: Directory `...' exist, ...: s/exist/exists/


Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 git-submodule.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-submodule.sh b/git-submodule.sh
index bfbd36b..0462e52 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -98,7 +98,7 @@ module_clone()
 	if test -d "$path"
 	then
 		rmdir "$path" 2>/dev/null ||
-		die "Directory '$path' exist, but is neither empty nor a git repository"
+		die "Directory '$path' exists, but is neither empty nor a git repository"
 	fi

 	test -e "$path" &&
--
1.6.5.rc2.177.ga9dd6

^ permalink raw reply related


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox