On Thu, Aug 23, 2012 at 10:39 AM, Junio C Hamano gits...@pobox.com wrote:
David Aguilar dav...@gmail.com writes:
Would the ability to resolve the various merge situations using
the command-line be a wanted addition?
This would let a submodule or deleted/modified encountering
user do
On Fri, Aug 24, 2012 at 7:43 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
Still WIP but I'm getting closer. I dropped test-poisongen and started
to use podebug [2] instead. Less code in git. podebug does not preserve
shell variables yet. I'll follow that up at upstream [1].
With this
On Wednesday 22-August-2012 10:55:29 Jonathan del Strother wrote:
On 22 August 2012 17:58, Junio C Hamano gits...@pobox.com wrote:
Jonathan del Strother maill...@steelskies.com writes:
On 22 August 2012 13:10, Brian Foster brian.fos...@maxim-ic.com wrote:
...
In the past I've done:
On Thu, Aug 23, 2012 at 06:22:01PM -0400, Gokulramkumar Subramaniam wrote:
I am new to Git and I am trying to add my machine with Git but it is failing
through ssh method.
Error received:
$ ssh-add -l
2048 5f:6f:39:ed:b0:76:2e:d0:xx:xx:xx:xx:xx:xx:xx:xx id_rsa (RSA)
Gokul$ ssh -vT
Junio C Hamano gits...@pobox.com writes:
As a corollary, the is pu@{0} a fast-forward of pu@{1}? check does
not need merge base computation at all. The only thing it needs to
do is to prove pu@{1} is reachable from pu@{0}, and that can be done
the same way in which '1' can be proved
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
Thomas Rast tr...@student.ethz.ch writes:
At the very least it should be possible to change in_merge_bases() to
not do any of the post-filtering; perhaps like the patch below.
I do not recall the details but
Signed-off-by: Joachim Schmitz j...@schmitz-digital.de
---
This time I hopefully didn't screw up whitespace and line breaks.
Makefile| 18 ++
compat/win32/poll.c | 8 ++--
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index
Signed-off-by: Joachim Schmitz j...@schmitz-digital.de
---
As discussed now as a small helper function rather than #ifdef/#endif in the
primary flow of the code.
And hopefully without having screwed up whitespace and line breaks
sha1_file.c | 22 +++---
1 file changed, 15
This reverts be22d92 (http: avoid empty error messages for some curl errors,
2011-09-05) on platforms with older versions of libcURL.
Signed-off-by: Joachim Schmitz j...@schmitz-digital.de
---
Resend, regardless that Junio said this not to be needed, as I don't see it
applied yet.
Also tried to
Signed-off-by: Joachim Schmitz j...@schmitz-digital.de
---
compat/mkdir.c | 24
1 file changed, 24 insertions(+)
create mode 100644 compat/mkdir.c
diff --git a/compat/mkdir.c b/compat/mkdir.c
new file mode 100644
index 000..9e253fb
--- /dev/null
+++
Signed-off-by: Joachim Schmitz j...@schmitz-digital.de
---
git-compat-util.h | 5 +
1 file changed, 5 insertions(+)
diff --git a/git-compat-util.h b/git-compat-util.h
index 35b095e..34f040f 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -162,6 +162,11 @@
#define
Implementation includes getitimer(), but for now it is static.
Supports ITIMER_REAL only.
Signed-off-by: Joachim Schmitz j...@schmitz-digital.de
---
May need a header file for ITIMER_*, struct itimerval and the prototypes,
But for now, and the HP NonStop platform this isn't needed, here
sys/time
Signed-off-by: Joachim Schmitz j...@schmitz-digital.de
---
Seems it needs my mkdir() ignoretraile slash patch first to be applied
cleanly...
It is independent of it otherwise.
git-compat-util.h | 5 +
1 file changed, 5 insertions(+)
diff --git a/git-compat-util.h b/git-compat-util.h
index
On Fri, Aug 24, 2012 at 3:51 PM, Ævar Arnfjörð Bjarmason
ava...@gmail.com wrote:
[1] http://bugs.locamotion.org/show_bug.cgi?id=2450
[2] http://translate.sourceforge.net/wiki/toolkit/podebug
The reason I didn't do something like this to begin with is that
gettext/glibc doesn't have support
On Thu, Aug 23, 2012 at 9:20 PM, Thomas Rast tr...@student.ethz.ch wrote:
At the very least it should be possible to change in_merge_bases() to
not do any of the post-filtering; perhaps like the patch below. It
passes the test suite. The whole merge bases of A and a list of Bs
thing is
From: Junio C Hamano gits...@pobox.com
Sent: Friday, August 24, 2012 5:23 AM
Jeff King p...@peff.net writes:
It may be (?) that it is a good time to think about a 'datedepth'
capability to bypass the current counted-depth shallow fetch that
can
cause so much trouble. With a date limited
Thanks for the tip. It should give me a good starting point for what
I'm about to do, since notes seem to be able to add comments for
objects without changing the commit tree (which was one of the things
I was aiming for and quite frankly, one of the parts that worried me
on the implementation
From: Joachim Schmitz [mailto:j...@schmitz-digital.de]
Sent: Friday, August 24, 2012 11:45 AM
To: Junio C Hamano (gits...@pobox.com)
Cc: git@vger.kernel.org; Erik Faye-Lund (kusmab...@gmail.com)
Subject: [PATCH v2] Support non-WIN32 system lacking poll() while keeping the
WIN32 part intact
What is the status of libgit2 WRT the overall git project? I recall
that there was some discussion of basing bits of git on libgit2 once it
matures.
I ask because I'm starting a project to improve the abysmal speed of
git-subtree split. It's unbearably slow at the moment and as far as I
can
Branch names are usually in ASCII so they are not the problem. The
problem most likely comes from (no branch) translation, which is in
UTF-8 and makes length calculation just wrong.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
So far all git translations are utf-8 compatible. Branch
On Tue, Aug 21, 2012 at 10:52:03AM -0700, Junio C Hamano wrote:
diff.{type}.xfuncname seems to start searching backwards in
from the beginning of the hunk, not the first differing line.
[...]
@@ -4,4 +4,5 @@ int call_me(int maybe)
int main()
{
+ return 0;
}
On 08/24/12 09:29, Jeff King wrote:
On Tue, Aug 21, 2012 at 10:52:03AM -0700, Junio C Hamano wrote:
diff.{type}.xfuncname seems to start searching backwards in
from the beginning of the hunk, not the first differing line.
[...]
@@ -4,4 +4,5 @@ int call_me(int maybe)
int main()
{
On Fri, Aug 24, 2012 at 11:43:40AM +0200, Thomas Rast wrote:
Start from A and B. Follow from B to find 'x' and paint it in blue,
follow from A to find 'y' and paint it in amber. Follow from 'x' to
'1', paint it in blue. Follow from 'y' to '1', paint it in amber
but notice that it
Thomas Rast tr...@student.ethz.ch writes:
Well, yeah, you snipped this part from my original post :-)
} Even if this turns out to be flawed, we should also identify uses of
} in_merge_bases() where the real question was is_descendant_of() [I
} somewhat suspect that's all of them], and then
Thomas Rast tr...@student.ethz.ch writes:
Junio C Hamano gits...@pobox.com writes:
...
Start from A and B. Follow from B to find 'x' and paint it in blue,
follow from A to find 'y' and paint it in amber. Follow from 'x' to
'1', paint it in blue. Follow from 'y' to '1', paint it in amber
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Still WIP but I'm getting closer. I dropped test-poisongen and started
to use podebug [2] instead. Less code in git. podebug does not preserve
shell variables yet. I'll follow that up at upstream [1].
Thanks; this looks promising.
--
To
Joachim Schmitz j...@schmitz-digital.de writes:
There is a downside with this: In order to make use of it, in Makefile it
adds -Icompat/win32 to COMPAR_CFLAGS. This results in
compat/win32/dirent.h to be found, rather than /usr/include/dirent.h.
This should be fine for WIN32, but for
Jeff King p...@peff.net writes:
I thought you were just interested in speeding up is_descendent_of. You
should be able to do that without a generation number. Just start from A
and B as above, do the two-color painting, and do not add the parents of
any two-color commits (because you know
Joachim Schmitz j...@schmitz-digital.de writes:
Signed-off-by: Joachim Schmitz j...@schmitz-digital.de
---
As discussed now as a small helper function rather than #ifdef/#endif in the
primary flow of the code.
And hopefully without having screwed up whitespace and line breaks
The
On Fri, Aug 24, 2012 at 10:29:09AM -0400, Jeff King wrote:
Would this be sufficient? Instead of looking for the first line that
matches the beginning pattern going backwards starting from one line
before the displayed context, we start our examination at the first line
shown in the
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Branch names are usually in ASCII so they are not the problem. The
problem most likely comes from (no branch) translation, which is in
UTF-8 and makes length calculation just wrong.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
As the compat/mkdir.c file includes git-compat-util.h and expects
the declaration of the new function to be found in it, it does not
make any sense to have this as two patches. I'll squash them into
one for now, but it would have been even more complete to have an
update to the Makefile to
Philipp A. Hartmann p...@qo.cx writes:
All,
the following patch series proposes enhancements to the credential helper
implementations in the contrib section. The detailed development history
can be found at GitHub [1].
The first patch adds a GnomeKeyring credential backend. The
From: Junio C Hamano [mailto:gits...@pobox.com]
Sent: Friday, August 24, 2012 7:44 PM
To: Joachim Schmitz
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] Ignore trailing slash in mkdir() on platforms that
can't deal with this
As the compat/mkdir.c file includes git-compat-util.h and
From: Junio C Hamano [mailto:gits...@pobox.com]
Sent: Friday, August 24, 2012 6:44 PM
To: Joachim Schmitz
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] Prefer sysconf(_SC_OPEN_MAX) over
getrlimit(RLIMIT_NOFILE,...)
Joachim Schmitz j...@schmitz-digital.de writes:
Signed-off-by:
From: Junio C Hamano [mailto:gits...@pobox.com]
Sent: Friday, August 24, 2012 6:07 PM
To: Joachim Schmitz
Cc: git@vger.kernel.org; Erik Faye-Lund
Subject: Re: [PATCH v2] Support non-WIN32 system lacking poll() while keeping
the WIN32 part intact
Joachim Schmitz j...@schmitz-digital.de
Hi folks
On top of the patches Ive submitted so far, which were needed for HP NonStop,
but possibly useful for other platforms too, here is one that is at least in
parts NonStop specific
diff --git a/git-compat-util.h b/git-compat-util.h
index a047221..d6a142a 100644
--- a/git-compat-util.h
Joachim Schmitz j...@schmitz-digital.de writes:
Different, but related question: would poll.[ch] be allowed to #include
git-compat-util.h?
Seeing other existing generic wrappers directly under compat/,
e.g. fopen.c, mkdtemp.c, doing so, I would say why not.
Windows folks (I see Erik is
Joachim Schmitz j...@schmitz-digital.de writes:
Hi folks
On top of the patches I’ve submitted so far, which were needed for HP
NonStop,
but possibly useful for other platforms too, here is one that is at least in
parts NonStop specific
diff --git a/git-compat-util.h b/git-compat-util.h
Hi List,
A recent update to git 1.7.12 from 1.7.3.5 seems to have changed something -
trying to push to a smart http backend no longer prompts for a password and
hence fails the server auth.
The server is currently running git 1.7.9 behind apache 2.4.3 with an almost
verbatim copy of the
On Fri, Aug 24, 2012 at 09:19:28PM +0100, Iain Paton wrote:
A recent update to git 1.7.12 from 1.7.3.5 seems to have changed
something - trying to push to a smart http backend no longer prompts
for a password and hence fails the server auth.
[...]
Backtracking through the versions I've
On Fri, Aug 24, 2012 at 11:15:36AM -0700, Junio C Hamano wrote:
The third and fourth patches port the existing helpers to this generic
implementation.
It struck me somewhat odd to see a new one added as the first step
in the series, and then the generic, the third patch only to lose
Joachim Schmitz j...@schmitz-digital.de writes:
Reminds me of a related issue: in compat/fnmatch/fnmatch.c there is this:
#if HAVE_STRING_H || defined _LIBC
# include string.h
#else
# include strings.h
#endif
There's no place where HAVE_STRING_H get set
This looks wrong to me,...
This
I found a bug in git's handling of binary diff segments.
When applying binary diffs using -p0, the prefix (or --strip) argument
is ignored.
For example, try this:
git apply -p0 --binary 'EOF'
diff --git a/init.tar.gz a/init.tar.gz
new file mode 100644
index
Junio C Hamano wrote:
Eric Wong normalper...@yhbt.net writes:
I think having svn in svn.trimsvnlog twice is redundant and not ideal.
Perhaps just --trim-log and svn.trimlog?
Do we ever want to trim our log when relaying the Git commits back
to subversion? Having svn in trimsvnlog makes it
Junio C Hamano writes:
Hi,
Junio, for some reason I don't get mails from you, I've just discovered
your e-mails on gmane news list. Anyway many thanks for your comments,
I'll fix them and send updated patch next week.
+When committing to svn from git (as part of 'commit-diff', 'set-tree'
+or
Robert Luberda rob...@debian.org writes:
I think it would be saner to call them trailers to avoid
confusion.
Thanks, I haven't got any idea how to call them, especially because
existing git documentation refers to them just by using the word `line',
e.g.:
git-am.txt: Add a
On 08/24/12 11:44, Jeff King wrote:
With the old code, you'd get:
diff --git a/old b/new
index f384549..1066a25 100644
--- a/old
+++ b/new
@@ -2,3 +2,3 @@ one
two
-three
+three -- modified
four
So the hunk header is showing you
From: Travis Carden travis.car...@gmail.com
The former messages changed grammatical subject in the middle.
Signed-off-by: Travis Carden travis.car...@gmail.com
---
This is my first attempt at contributing to the Git project.
I'm kind of testing the water with a simple patch to see how
friendly
Tim Chase g...@tim.thechases.com writes:
If the documented purpose of diff -p (and by proxy
diff.{type}.xfuncname) is to show the name of the *function*
containing the changed lines,
Yeah, the documentation is misleading, but I do not offhand think of
a better phrasing. Perhaps you could
On 08/23/2012 10:54 AM, Jeff King wrote:
On Thu, Aug 23, 2012 at 10:10:31AM +0200, mhag...@alum.mit.edu wrote:
From: Michael Haggerty mhag...@alum.mit.edu
fetch_pack() remotes duplicates from the list (nr_heads, heads),
thereby shrinking the list. But previously, the caller was not
Colin McCabe cmcc...@alumni.cmu.edu writes:
I found a bug in git's handling of binary diff segments.
When applying binary diffs using -p0, the prefix (or --strip) argument
is ignored.
Thanks for a report. An ancient bug well spotted.
Perhaps this will help.
-- 8 --
Subject: apply: compute
52 matches
Mail list logo
