Michael Haggerty writes:
> This patch series has the side effect that all of the directories
> listed in GIT_CEILING_DIRECTORIES are accessed *unconditionally* to
> resolve any symlinks that are present in their paths. It is
> admittedly odd that a feature intended to avoid accessing expensive
>
Herman van Rink writes:
> Junio, Could you please consider merging the single commit from my
> subtree-updates branch? https://github.com/helmo/git/tree/subtree-updates
In general, in areas like contrib/ where there is a volunteer area
maintainer, unless the change something ultra-urgent (e.g. s
This function was added in f103f95b11d087f07c0c48bf784cd9197e18f203 in
the erroneous expectation that it would be used in the
reimplementation of longest_ancestor_length(). But it turned out to
be easier to use a function specialized for comparing path prefixes
(i.e., one that knows about slashes
longest_ancestor_length() relies on a textual comparison of directory
parts to find the part of path that overlaps with one of the paths in
prefix_list. But this doesn't work if any of the prefixes involves a
symbolic link, because the directories will look different even though
they might logical
Move the responsibility for normalizing the prefixes passed to
longest_ancestor_length() to its caller. In t0060, only test
longest_ancestor_lengths using normalized paths: remove empty entries
and non-absolute paths, strip trailing slashes from the paths, and
remove tests that thereby become redu
Change longest_ancestor_length() to take the prefixes argument as a
string_list rather than as a PATH_SEP-separated string. This will
make it easier to change the caller to alter the entries before
calling longest_ancestor_length().
Signed-off-by: Michael Haggerty
---
cache.h | 2 +-
Signed-off-by: Michael Haggerty
---
path.c | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/path.c b/path.c
index cbbdf7d..f455e8e 100644
--- a/path.c
+++ b/path.c
@@ -12,6 +12,7 @@
*/
#include "cache.h"
#include "strbuf.h"
+#include "string-list.h"
The function is like real_path(), except that it returns NULL on error
instead of dying.
Signed-off-by: Michael Haggerty
---
abspath.c | 5 +
cache.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/abspath.c b/abspath.c
index f8a526f..40cdc46 100644
--- a/abspath.c
+++ b/abspath.c
@@
Signed-off-by: Michael Haggerty
---
abspath.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/abspath.c b/abspath.c
index a7ab8e9..f8a526f 100644
--- a/abspath.c
+++ b/abspath.c
@@ -35,7 +35,14 @@ static const char *real_path_internal(const char *path, int
die_on_error)
{
st
It accepts a new parameter, die_on_error. If die_on_error is false,
it simply cleans up after itself and returns NULL rather than dying.
Signed-off-by: Michael Haggerty
---
abspath.c | 93 ---
1 file changed, 72 insertions(+), 21 delet
v3 of the series, reworked WRT v2:
* Change longest_ancestor_length() to take a string_list for its
prefixes argument (instead of a PATH_SEP-separated string).
* Move the responsibility for canonicalizing prefixes from
longest_ancestor_length() to its caller in
setup_git_directory_gently_1(
Nguyen Thai Ngoc Duy writes:
>> I suspect that this needs to be plugged to pathspec matching code;
>> otherwise "git log -- 'Docum*/**/*.txt'" would not show the log for
>> commits that touch Documentation/git.txt, which would be confusing
>> to the users.
>
> I do want non-recursive "*" in p
On Sat, Oct 20, 2012 at 4:03 AM, Junio C Hamano wrote:
> * nd/wildmatch (2012-10-15) 13 commits
>
> Allows pathname patterns in .gitignore and .gitattributes files
> with double-asterisks "foo/**/bar" to match any number of directory
> hierarchies.
>
> I suspect that this needs to be plugged t
On 2012年10月21日 07:46, Philip Oakley wrote:
At this point you have created the 'conflict' - You can't have two
different branches that both track the same identical remote branch
and expect that they can be both different and identical at the same
time.
Only one push (from two branches tryin
On Sat, 20 Oct 2012, Drew Northup wrote:
On Sun, Oct 14, 2012 at 12:57 AM, wrote:
On Sat, 13 Oct 2012, Junio C Hamano wrote:
da...@lang.hm writes:
I've got a directory tree that holds config data for all my
servers. This consists of one directory per server (which is updated
periodically fr
>From 425e4dc6992d07aa00039c5bb8e8c76def591fd3 Mon Sep 17 00:00:00 2001
From: Matt Arsenault
Date: Sat, 20 Oct 2012 18:48:45 -0700
Subject: [PATCH] git-p4: Fix not using -s option to describe
This solves errors in some cases when syncing renamed files.
Other places where describe is used use the
On Sun, Oct 14, 2012 at 12:57 AM, wrote:
> On Sat, 13 Oct 2012, Junio C Hamano wrote:
>> da...@lang.hm writes:
>>> I've got a directory tree that holds config data for all my
>>> servers. This consists of one directory per server (which is updated
>>> periodically from what is currently configure
From: "Cheeray Huang"
Hi,
I think I found a bug, when I used local branches to track remote
branch. But I'm not very sure, can anyone double check this? I'd like
to finger this out. I think you can reproduce this bug as below steps:
precondition:
Suppose that you have a remote branch in r
On 07/11/2012 06:14 PM, d...@cray.com wrote:
> Herman van Rink writes:
>
>>> It's hard to tell what's what with one big diff. Each command should
>>> get its own commit plus more if infrastructure work has to be done. I
>>> realize it's a bit of a pain to reformulate this but git rebase -i makes
On 10/16/2012 02:47 PM, James Nylen wrote:
> On Tue, Oct 9, 2012 at 4:26 PM, James Nylen wrote:
>> This new option does the reverse of --annotate, which is more useful
>> when contributing back to a library which is also included in the
>> repository for a larger project, and perhaps in other situ
On 10/19/2012 03:21 PM, Yann Dirson wrote:
> As the examples in git-subtree.txt show, the synopsis in the same file should
> surely get a patch along the lines of:
>
> -'git subtree' add -P
> +'git subtree' add -P
>
> Failure to specify the repository (by just specifying a local commit) fa
David Soria Parra:
The enum grep_header_field is unsigned.
Enumerations can be either unsigned or signed, it is up to the
compiler to decide. Even if you assign only positive number to named
enumeration values, there are compilers that make them signed. I've
been bitten by that enough.
--
Hi,
I think I found a bug, when I used local branches to track remote
branch. But I'm not very sure, can anyone double check this? I'd like
to finger this out. I think you can reproduce this bug as below steps:
precondition:
Suppose that you have a remote branch in repository, named origin/
The enum grep_header_field is unsigned. Therefore the field part of the
grep_pat structure is unsigned and cannot be less then 0. We remove the
tautological check for p->field < 0.
Signed-off-by: David Soria Parra
---
grep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gre
On Sat, Oct 20, 2012 at 5:43 PM, Mike Hommey wrote:
> On Sat, Oct 20, 2012 at 05:00:06PM +0200, Felipe Contreras wrote:
>> Changes since v1:
>>
>> * Improved documentation
>> * Use more common 'python' binary
>> * Warn, don't barf when a branch has multiple heads
>> * Fixed marks to fetch afte
On Sat, Oct 20, 2012 at 05:00:06PM +0200, Felipe Contreras wrote:
> Changes since v1:
>
> * Improved documentation
> * Use more common 'python' binary
> * Warn, don't barf when a branch has multiple heads
> * Fixed marks to fetch after cloned
> * Support for cloning/pulling remote repositorie
Signed-off-by: Felipe Contreras
---
I've looked at many hg<->git tools and none satisfy me. Too complicated, or too
slow, or to difficult to setup, etc.
The only one I've liked so far is hg-fast-export[1], which is indeed fast,
relatively simple, and relatively easy to use. But it's not properly
On 20.10.12 14:02, Torsten Bögershausen wrote:
> t9902 does not work on my Mac OS box,
> but only in one working directory.
>
> Any idea where the "check-ignore" comea from ?
> /Torsten
>
Oh, I find the answer myself:
git status
# Untracked files:
# (use "git add ..." to include in what wi
t9902 does not work on my Mac OS box,
but only in one working directory.
Any idea where the "check-ignore" comea from ?
/Torsten
[snip]
--- expected2012-10-20 11:54:35.0 +
+++ out2012-10-20 11:54:35.0 +
@@ -1 +1,2 @@
+check-ignore
checkout
This patch corrects t
Another UI experiment, thrown at git@vger to see if it sticks. I've
been using this for a week and it feels good in general. But it may be
too specific to my taste to be useful for more people.
This format utilizes the screen estate as much as possible. It relies
on colors, so monochrome users are
Global Financial Loan.doc
Description: MS-Word document
On Sat, Oct 20, 2012 at 2:50 AM, Junio C Hamano wrote:
> Not particularly interested in the cause, but not so strongly
> against it to veto it.
I wonder how many people keep old branches like I do, which are
usually far from remotes.
> Doesn't it make more sense to use a notes-cache that is keye
On 10/19/2012 10:13 PM, Junio C Hamano wrote:
> Ramkumar Ramachandra writes:
>
>> Thiago Farina wrote:
>>> [...]
>>> With some structure like:
>>>
>>> include/git.h
>>> src/git.c
>>>
>>> ...
>>>
>>> whatever.
>>> [...]
>>
>> Junio- is it reasonable to expect the directory-restructuring by 2.0?
>
Junio C Hamano wrote:
> We already encourage casting-in-stone a particular version of the
> sample hook when a new repository is created by copying them from
> the template directory. This prevents from surprising users when an
> updated version of Git changes the behaviour of these samples. Eve
34 matches
Mail list logo
