On 13/03/2013 19:57, Junio C Hamano wrote:
Kevin Bracey ke...@bracey.fi writes:
- echo Added $4 in both, but differently.
+ echo ERROR: Added $4 in both, but differently.
+ ret=1
The problem you identified may be worth fixing, but I do not think
this
From 59fb432e17a1aae9de26bbaaca7f09cc7f03b471 Mon Sep 17 00:00:00 2001
From: Eric Cousineau eacousin...@gmail.com
Date: Thu, 14 Mar 2013 01:19:53 -0500
Subject: [PATCH] submodule-foreach: Added in --post-order=command per Jens
Lehmann's suggestion
Signed-off-by: Eric Cousineau
On Tue, Mar 12, 2013 at 03:04:56PM -0400, Jeff King wrote:
On Tue, Mar 12, 2013 at 04:44:35PM +0100, Heiko Voigt wrote:
Can we throw in a comment at the top here with the expected usage? In
particular, do_config_from is expecting the caller to have filled in
certain fields (at this
On Tue, Mar 12, 2013 at 03:29:59PM -0400, Jeff King wrote:
On Tue, Mar 12, 2013 at 05:42:54PM +0100, Heiko Voigt wrote:
Your series does not actually add any callers of the new function. The
obvious patch 5/4 would be to plumb it into git config --blob, and
then we can just directly
On Wed, Mar 13, 2013 at 10:44:25AM -0700, Junio C Hamano wrote:
+# Note that this is scheduled to change in Git 2.0, when
+# git add -u will become full-tree by default.
+test_expect_success 'update did not touch files at root' '
+ cat expect -\EOF
+ check
+ top
+ EOF
+
Am 3/13/2013 22:21, schrieb Antoine Pelisse:
Currently, it's not possible to use the space-ignoring options (-b, -w,
--ignore-space-at-eol) with combined diff. It makes it pretty impossible
to read a merge between a branch that changed all tabs to spaces, and a
branch with functional changes.
On Thu, Mar 14, 2013 at 07:39:33AM +0100, Heiko Voigt wrote:
I am on the fence. I do not want to create more work for you, but I do
think it may come in handy, if only for doing submodule things from
shell. And it is hopefully not a very large patch. I'd say try it, and
if starts looking
On Thu, Mar 14, 2013 at 03:10:46AM -0400, Jeff King wrote:
I looked into this a little. The first sticking point is that
git_config_with_options needs to support the alternate source. Here's a
sketch of what I think the solution should look like, on top of your
patches.
Here it is again,
On Wed, Mar 13, 2013 at 08:41:29PM -0700, David Aguilar wrote:
On Wed, Mar 13, 2013 at 1:33 PM, John Keeping j...@keeping.me.uk wrote:
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index eb1d3f8..8102ce1 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -370,6
On Wed, Mar 13, 2013 at 10:21 PM, Torsten Bögershausen tbo...@web.de wrote:
+ statusUno::
+ If collecting untracked files in linkgit:git-status[1]
+ takes more than 2 seconds, hint the user that the option
+ `-uno` could be used to stop collecting
On Thu, Mar 14, 2013 at 2:38 AM, Junio C Hamano gits...@pobox.com wrote:
Karsten Blees karsten.bl...@gmail.com writes:
However, AFAIK inotify doesn't work recursively, so the daemon
would at least have to track the directory structure to be able to
register / unregister inotify handlers as
On 03/14/2013 06:24 AM, Jeff King wrote:
On Thu, Mar 14, 2013 at 05:41:58AM +0100, Michael Haggerty wrote:
Here is analysis of our options as I see them:
1. Accept that tags outside of refs/tags are not reliably advertised in
their peeled form. Document this deficiency and either:
This patch adds the option to specify SHA-1 commit hash using
--points-at option of git tag to create a tag pointing to
the historical commit.
This was pretty easy in the past for the lightweight tags that are just simple
pointers (by creating .git/refs/tags/$tagname with SHA-1 hash) but it was
This patch adds the option to specify SHA-1 commit hash using --points-at
option of git tag to create a tag pointing to a historical commit.
This was pretty easy in the past for the lightweight tags that are just simple
pointers (by creating .git/refs/tags/$tagname with SHA-1 hash) but it was not
Junio C Hamano gits...@pobox.com writes:
It still has the same the user saw
it mentioned on stackoverflow and sets it without understanding that
the behaviour is getting changed effect.
I'm not so worried about this point, as the mechanism is temporary, and
it will take time before answers on
Alberto Bertogli albert...@blitiri.com.ar writes:
I wanted to let you know about git-arr, which is a git repository
browser that can generate static HTML instead of having to run
dynamically.
Can it run incrementally? I mean, if you have launched it for one
revision, does re-running it on the
Just thinking out loud. If I'm not mistaken, a directory's mtime is
only changed when files are added are removed in that directory. And
that's all we care about in read_directory. So if we keep a secondary
index containing the list of all (tracked and untracked) .gitignore
files and all untracked
On Thu, Mar 14, 2013 at 01:34:54PM +0100, Michal Novotny wrote:
This patch adds the option to specify SHA-1 commit hash using --points-at
option of git tag to create a tag pointing to a historical commit.
What does this do that git tag name commit doesn't?
This was pretty easy in the past for
On Thu, Mar 14, 2013 at 12:28:53PM +0100, Michael Haggerty wrote:
Perhaps if peel_ref() *were* 100% reliable, we might be able to use it
to avoid object lookups in some other places.
In theory, some of the many uses of deref_tag could be adopted. However,
we do not always have the refname
Since ancient times, we have been calling curl_global_init with the
CURL_GLOBAL_ALL-flag, which initializes SSL (and the Win32 socket
stack on Windows).
Initializing SSL takes quite some time on Windows, so let's avoid
doing it when it's not needed.
timing of echo | ./git-remote-http.exe origin
On Thu, Mar 14, 2013 at 2:51 PM, Erik Faye-Lund kusmab...@gmail.com wrote:
Since ancient times, we have been calling curl_global_init with the
CURL_GLOBAL_ALL-flag, which initializes SSL (and the Win32 socket
stack on Windows).
Initializing SSL takes quite some time on Windows, so let's avoid
On 03/14/2013 02:36 PM, John Keeping wrote:
On Thu, Mar 14, 2013 at 01:34:54PM +0100, Michal Novotny wrote:
This patch adds the option to specify SHA-1 commit hash using --points-at
option of git tag to create a tag pointing to a historical commit.
What does this do that git tag name commit
Kevin Bracey ke...@bracey.fi writes:
I disagree here. At the minute, it does set ret to 1 (but further down
the code - bringing it up here next to the ERROR print clarifies
that), and will report the merge as failed, conflict in the 3-way
merge or not. Which I think is correct.
OK. I agree
Duy Nguyen pclo...@gmail.com writes:
On Wed, Mar 13, 2013 at 10:21 PM, Torsten Bögershausen tbo...@web.de wrote:
+ statusUno::
+ If collecting untracked files in linkgit:git-status[1]
+ takes more than 2 seconds, hint the user that the option
+ `-uno`
Jeff King p...@peff.net writes:
On Thu, Mar 14, 2013 at 01:24:48AM -0400, Jeff King wrote:
So the only question is how much work we want to put into making sure
the new reader handles the old writer correctly. Doing 2c is obviously
more rigorous, and it is not that much work to add the
John Keeping j...@keeping.me.uk writes:
+write_script .git/CHECK_SYMLINKS \EOF
+#!/bin/sh
+test -L $2/file
+test -L $2/file2
+test -L $2/sub/sub
+echo $?
+EOF
Please drop #!/bin/sh from the above; it is misleading and
pointless.
After all, you are using write_script to avoid having to
Hi kusma,
On Thu, 14 Mar 2013, Erik Faye-Lund wrote:
Since ancient times, we have been calling curl_global_init with the
CURL_GLOBAL_ALL-flag, which initializes SSL (and the Win32 socket
stack on Windows).
Initializing SSL takes quite some time on Windows, so let's avoid
doing it when
Johannes Sixt j.s...@viscovery.net writes:
This form of 'echo' is not sufficiently portable. How about:
tr -d Q -\EOF test
always coalesce
eol space coalesce Q
...
EOF
Much better.
+test_expect_success 'check combined output (no ignore space)' '
+git show
On Thu, Mar 14, 2013 at 4:23 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
Hi kusma,
On Thu, 14 Mar 2013, Erik Faye-Lund wrote:
Since ancient times, we have been calling curl_global_init with the
CURL_GLOBAL_ALL-flag, which initializes SSL (and the Win32 socket
stack on
Michal Novotny minov...@redhat.com writes:
Oh, interesting. It's working now and I didn't know that as it was not
working some time ago I've been trying this approach. Maybe it's been
added recently...
Pretty much from the very beginning git tag name commit has
been the way to create a tag,
On Thu, Mar 14, 2013 at 4:31 PM, Junio C Hamano gits...@pobox.com wrote:
Johannes Sixt j.s...@viscovery.net writes:
This form of 'echo' is not sufficiently portable. How about:
tr -d Q -\EOF test
always coalesce
eol space coalesce Q
...
EOF
Much better.
When core.sharedRepository is used, set_shared_perm() in path.c
needs lstat() to return the correct POSIX permissions.
The default for cygwin is core.ignoreCygwinFSTricks = false, which
means that a simplified and fast implementation of lstat() is used.
Especially the file permission bits are
Erik Faye-Lund kusmab...@gmail.com writes:
diff --git a/http.c b/http.c
index 3b312a8..528a736 100644
--- a/http.c
+++ b/http.c
@@ -343,7 +343,8 @@ void http_init(struct remote *remote, const char *url,
int proactive_auth)
git_config(http_options, NULL);
-
Erik Faye-Lund kusmab...@gmail.com writes:
I wonder whether we want to have something like this instead:
flags = CURL_GLOBAL_ALL;
if (prefixcmp(url, https:))
flags = ^CURL_GLOBAL_SSL;
curl_global_init(flags);
I do see that CURL_GLOBAL_ALL is
Hi Junio,
On Thu, 14 Mar 2013, Junio C Hamano wrote:
Erik Faye-Lund kusmab...@gmail.com writes:
diff --git a/http.c b/http.c
index 3b312a8..528a736 100644
--- a/http.c
+++ b/http.c
@@ -343,7 +343,8 @@ void http_init(struct remote *remote, const char *url,
int proactive_auth)
On Thu, Mar 14, 2013 at 09:43:00AM +, John Keeping wrote:
On Wed, Mar 13, 2013 at 09:45:47AM -0700, Junio C Hamano wrote:
Does the temporary checkout correctly apply the smudge filter and
crlf conversion, by the way? If not, regardless of the topic in
this thread, that may want to be
Johannes Schindelin johannes.schinde...@gmx.de writes:
Hence my earlier suggestion (with the obvious tyop '^' instead of '~').
You will also find the information in my mail (unless you plonk my mails)
that ...
Our mails simply crossed. Comparing the two messages I think we are
in complete
On 14/03/2013 16:56, Junio C Hamano wrote:
Kevin Bracey ke...@bracey.fi writes:
Maybe the virtual base itself should be different. Maybe it should put
a ??? marker in place of every unique line. So you get:
Left ABCEFGH
Right XABCDEFJH - Merge result |XABC|DEFG|JH
VBase ?ABC?EF??H
John Keeping j...@keeping.me.uk writes:
The path passed to get_stream_filter is only used to decide what filters
apply to the file, so shouldn't it be using ce-name and not path
for the same reason that the call to convert_to_working_tree() further
down the same function does?
Correct and
On 14/03/2013 19:31, Kevin Bracey wrote:
On 14/03/2013 16:56, Junio C Hamano wrote:
Well, yes, but I would assume that we would forcibly select normal
diff here somehow, if we aren't already. We should be - turning
ABCDEFGH vs ABCD into ABCDEFGH|EFGH= is silly.
Doh. But anyway, we don't
binqOz6kpO7KB.bin
Description: iso-8859-1
Hi
I have started branch from master
then on master were changes in whitespace (code formatting)
in branch on that lines changes were not.
Now when I try to merge branch to master I get lost changes at space on master
So I try to ignore space change
git merge -Xignore-space-change my_branch
I
This is from the recent difftool --dir-diff discussion. With these
patches applied I think difftool --dir-diff should correctly apply
filters to the files that it checks out with no changes to the
git-difftool code.
John Keeping (2):
t2003: modernize style
entry: fix streaming filter path
- Description goes on the test_expect_* line
- Open SQ of test goes on the test_expect_* line
- Closing SQ of test goes on its own line
- Use TAB for indent
Also remove three comments that appear to relate to the development of
the patch before it was committed.
Signed-off-by: John Keeping
Changes since v1:
- A new second patch to make it safer to compare symlink targets in
tests
- Test in patch 3 (formerly patch 2) re-written thanks to feedback from
David Aguilar
This series is based on next, although I think Git's clever enough to
ignore the changes in the context of the
Signed-off-by: John Keeping j...@keeping.me.uk
---
Documentation/git-difftool.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index e0e12e9..e575fea 100644
--- a/Documentation/git-difftool.txt
+++
When we add tests for symlinks in git difftool --dir-diff it's easier
to check the target path if we don't have to worry about double slashes
separating directories. Remove the trailing slash (if present) from
$workdir before creating the symlinks in order to avoid this.
Signed-off-by: John
Some users like to edit files in their diff tool when using git
difftool --dir-diff --symlink to compare against the working tree but
difftool currently only created symlinks when a file contains unstaged
changes.
Change this behaviour so that symlinks are created whenever the
right-hand side of
Currently, it's not possible to use the space-ignoring options (-b, -w,
--ignore-space-at-eol) with combined diff. It makes it pretty impossible
to read a merge between a branch that changed all tabs to spaces, and a
branch with functional changes.
Pass diff flags to diff engine, so that combined
John Keeping j...@keeping.me.uk writes:
When we add tests for symlinks in git difftool --dir-diff it's easier
to check the target path if we don't have to worry about double slashes
separating directories. Remove the trailing slash (if present) from
$workdir before creating the symlinks in
John Keeping j...@keeping.me.uk writes:
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 3aab6e1..70e09b6 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -340,6 +340,28 @@ test_expect_success PERL 'difftool --dir-diff' '
stdin_contains file output
'
Antoine Pelisse apeli...@gmail.com writes:
+test_expect_success 'check combined output (no ignore space)' '
+ git show actual.tmp
+ sed -e 1,/^@@@/d actual.tmp actual
+ tr -d Q -\EOF expected
+ --always coalesce
+ - eol space coalesce
+ - space change coalesce
John Keeping j...@keeping.me.uk writes:
diff --git a/t/t2003-checkout-cache-mkdir.sh b/t/t2003-checkout-cache-mkdir.sh
index 63fd0a8..4c97468 100755
--- a/t/t2003-checkout-cache-mkdir.sh
+++ b/t/t2003-checkout-cache-mkdir.sh
@@ -90,4 +90,30 @@ test_expect_success SYMLINKS 'use --prefix=tmp-
Hello folks,
Just want to confirm that this is not a bug:
code
bunde.c: 443
printf_ln(Q_(The bundle requires this ref,
The bundle requires these %d refs,
r-nr),
r-nr);
/code
Harring Figueiredo harri...@gmail.com writes:
Just want to confirm that this is not a bug:
...
printf_ln(Q_(The bundle requires this ref,
The bundle requires these %d refs,
r-nr),
On Thu, Mar 14, 2013 at 02:28:31PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 3aab6e1..70e09b6 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -340,6 +340,28 @@ test_expect_success
John Keeping j...@keeping.me.uk writes:
+for f in file file2 sub/sub
+do
+ echo $f
+ readlink $2/$f
+done actual
+EOF
When you later want to enhance the test to check a combination of
difftool arguments where some paths are expected to become links and
others are expected to
Hi Junio,
On Thu, 14 Mar 2013, Junio C Hamano wrote:
Erik Faye-Lund kusmab...@gmail.com writes:
I wonder whether we want to have something like this instead:
flags = CURL_GLOBAL_ALL;
if (prefixcmp(url, https:))
flags = ^CURL_GLOBAL_SSL;
Johannes Schindelin johannes.schinde...@gmx.de writes:
Apparently, ftps is also handled by cURL and most likely requires SSL.
How about optimizing for the common case and instead of prefixcmp(url,
https:)) ask for !prefixcmp(url, http:)?
I think that is a very sensible way to go.
As to ALL
Antoine Pelisse apeli...@gmail.com writes:
I would like to discuss some improvements.
;-)
The current implementation doesn't look for optimal solution but for the
easiest/greedy solution.
Yes, you nailed it.
Does it make any sense? And is it worth implementing?
Probably yes, and
On Thu, Mar 14, 2013 at 11:45 PM, Junio C Hamano gits...@pobox.com wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
Apparently, ftps is also handled by cURL and most likely requires SSL.
How about optimizing for the common case and instead of prefixcmp(url,
https:)) ask for
Got it!
From the recommended site:
--
In the English singular case, the number – always 1 – can be replaced
with one:
printf (ngettext (One file removed, %d files removed, n), n);
This works because the ‘printf’ function discards excess arguments
that are not consumed by the format
On Thu, Mar 14, 2013 at 01:43:16PM +0100, Matthieu Moy wrote:
Alberto Bertogli albert...@blitiri.com.ar writes:
I wanted to let you know about git-arr, which is a git repository
browser that can generate static HTML instead of having to run
dynamically.
Can it run incrementally? I
git pull passed -q and -v only to git merge, but they can be useful for
git rebase as well, so pass them there, too. In particular, using -q
shuts up the Already up-to-date. message. Add test cases to prove it.
Signed-off-by: Peter Eisentraut pe...@eisentraut.org
---
git-pull.sh |
On 03/14/2013 02:40 PM, Jeff King wrote:
On Thu, Mar 14, 2013 at 12:28:53PM +0100, Michael Haggerty wrote:
Perhaps if peel_ref() *were* 100% reliable, we might be able to use it
to avoid object lookups in some other places.
In theory, some of the many uses of deref_tag could be adopted.
Antoine Pelisse apeli...@gmail.com writes:
While if we invert the two parents order we will have:
- 3
--1
--2
- 4
-3
-4
While clearly, in both cases, the optimal solution would be close to:
- 3
--1
--2
-3
--4
We should shoot for better readability as the primary goal. When I
am
66 matches
Mail list logo
