On 2013-09-13 21.51, Junio C Hamano wrote:
> Jiang Xin writes:
>
>> In test cases for relative_path, path with one leading character
>> (such as /a, /x) may be recogonized as "a:/" or "x:/" if there is
>> such doc drive on MINGW platform. Use an umambigous leading path
>> "/foo" instead.
>
> "DO
Felipe Contreras (5):
branch: trivial style fix
sha1-name: trivial style cleanup
merge: simplify ff-only option
t: replace pulls with merges
pull: cleanup documentation
Documentation/git-pull.txt | 4 ++--
builtin/branch.c | 3 +--
builtin/merge.c
Signed-off-by: Felipe Contreras
---
builtin/branch.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 0836890..c5aa0ba 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -968,9 +968,8 @@ int cmd_branch(int argc, const char **argv
Signed-off-by: Felipe Contreras
---
sha1_name.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/sha1_name.c b/sha1_name.c
index 65ad066..9f3e340 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -343,7 +343,6 @@ static int get_short_sha1(const char *name, int len,
unsigned char *sha1,
ret
This is what the code intended.
No functional changes.
Signed-off-by: Felipe Contreras
---
t/annotate-tests.sh| 2 +-
t/t4200-rerere.sh | 2 +-
t/t9114-git-svn-dcommit-merge.sh | 2 +-
t/t9500-gitweb-standalone-no-errors.sh | 2 +-
4 files changed,
'origin/master' is very clear, no need to specify the 'remotes/' prefix,
or babysit the user.
Signed-off-by: Felipe Contreras
---
Documentation/git-pull.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 6ef8d
No functional changes.
Signed-off-by: Felipe Contreras
---
builtin/merge.c | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 34a6166..da9fc08 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -186,13 +186,6 @@ static int o
If the version is 'v1.8.4-rc1' that is the version, and there's no need
to change it to anything else, like 'v1.8.4.rc1'.
If RedHat, or somebody else, needs a specific version, they can use the
'version' file, like everybody else.
Signed-off-by: Felipe Contreras
---
GIT-VERSION-GEN | 4 +---
1
The current versioning scheme doesn't work properly:
git-1.8.4 < git-1.8.4.rc1
git-1.8.4 < git-1.8.4-rc1
git-1.8.4 > git-1.8.4~rc1
Since v1.8.4 final is obviously greater than v1.8.4-rc1, we need to use
a tilde so RPM detects it properly as a greater version number.
This works in rpm-4.10,
Felipe Contreras (3):
version-gen: cleanup
version-gen: avoid messing the version
build: fix rpm versioning
GIT-VERSION-GEN | 36 +++-
Makefile| 2 +-
2 files changed, 20 insertions(+), 18 deletions(-)
--
1.8.4-fc
--
To unsubscribe from this list:
No functional changes.
Signed-off-by: Felipe Contreras
---
GIT-VERSION-GEN | 36
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 06026ea..e96538d 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -6,
On 13.09.13 07:08, Jiang Xin wrote:
> Tvangeste found that the "relative_path" function could not work
> properly on Windows if "in" and "prefix" have dos driver prefix.
> ($gmane/234434)
>
> e.g., When execute: test-path-utils relative_path "C:/a/b" "D:/x/y",
> should return "C:/a/b", but returns
On Fri, Sep 13, 2013 at 1:16 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> If the version is 'v1.8.4-rc1' that is the version, and there's no need
>> to change it to anything else, like 'v1.8.4.rc1'.
>>
>> If RedHat, or somebody else, needs a specific version, they can use the
>> 'ver
2556b996 (status: disable display of '#' comment prefix by default;
2013-09-06) introduced tests which fail on Mac OS X due to unportable
use of \t (for TAB) in a sed expression. POSIX [1][2] also disallows
it. Fix this.
[1]:
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/sed.html#tag_
On Fri, 13 Sep 2013, Nicolas Pitre wrote:
> On Fri, 13 Sep 2013, Duy Nguyen wrote:
>
> > On Fri, Sep 13, 2013 at 8:27 PM, Nicolas Pitre wrote:
> > > However I can see that, as you say, the same base object is repeatedly
> > > referenced. This means that we need to parse it over and over again
>
On Sat, 14 Sep 2013, Duy Nguyen wrote:
> On Sat, Sep 14, 2013 at 4:26 AM, Thomas Rast wrote:
> > I tried the perf script below, but at least for the git repo the only
> > thing I can see is noise.
>
> --stdout does not set do_check_packed_object_crc, you need to run
> pack-objects without --stdo
On Fri, 13 Sep 2013, Duy Nguyen wrote:
> On Fri, Sep 13, 2013 at 8:27 PM, Nicolas Pitre wrote:
> > On Thu, 12 Sep 2013, Nguyễn Thái Ngọc Duy wrote:
> >
> >> The intention is to store flat v4 trees in delta base cache to avoid
> >> repeatedly expanding copy sequences in v4 trees. When the user nee
On Sat, Sep 14, 2013 at 4:26 AM, Thomas Rast wrote:
> Junio C Hamano writes:
>
>> Nguyễn Thái Ngọc Duy writes:
>>
>>> Current code makes pack-objects always do check_pack_crc() in
>>> unpack_entry() even if right after that we find out there's a cached
>>> version and pack access is not needed.
Junio C Hamano writes:
> You can explicitly include the system header from your compatibility
> layer, i.e.
> ...
> and then in config.mak.uname, do something like this:
> ...
> COMPAT_CFLAGS += -DSYSTEM_STRING_H_HEADER=$(SYSTEM_STRING_H_HEADER)
You need to have one level of quoting to ke
Philip Oakley writes:
> The Git cli will accept dot '.' (period) as the relative path
> to the current repository. Explain this action.
>
> Signed-off-by: Philip Oakley
> ---
> Documentation/gitcli.txt | 4
> 1 file changed, 4 insertions(+)
>
> diff --git a/Documentation/gitcli.txt b/Docum
Philip Oakley writes:
> branch..remote can be set to '.' (period) as the repository
> path (URL) as part of the remote name dwimmery. Tell the reader.
>
> Such relative paths are not 'special'. Correct the branch..merge
> note.
Looks good.
It naturally follows that this is also valid:
Philip Oakley writes:
> Signed-off-by: Philip Oakley
> ---
> Documentation/urls.txt | 7 +++
> 1 file changed, 7 insertions(+)
>
> diff --git a/Documentation/urls.txt b/Documentation/urls.txt
> index 9ccb246..5350a63 100644
> --- a/Documentation/urls.txt
> +++ b/Documentation/urls.txt
> @@
Consider that the return values of allow_empty() could either be
negative, zero, or one. However, there is no reason to be overtly
conservative about it: we might as well return positive values as well
since the callsite has no problems with it.
Signed-off-by: Ramkumar Ramachandra
---
sequencer.
On Fri, Sep 13, 2013 at 6:16 PM, Junio C Hamano wrote:
> Eric Sunshine writes:
>
>> Given the above. How should I proceed? Do you still feel that it is
>> advisable to keep an index_name_exists() around for compatibility
>> reasons in case any new callers are introduced? Regardless of that
>> ans
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
The third batch of topics are now in 'master'.
You can find the changes described here in the integration branches
of the repositories listed a
Eric Sunshine writes:
> Given the above. How should I proceed? Do you still feel that it is
> advisable to keep an index_name_exists() around for compatibility
> reasons in case any new callers are introduced? Regardless of that
> answer, do you want index_name_exists() renamed to
> index_file_ex
Sebastian Schuberth writes:
> On Fri, Sep 13, 2013 at 10:01 PM, Junio C Hamano wrote:
>
>>> I don't like the idea of introducing a compat/mingw/string.h because
>>> of two reasons: You would have to add a conditional to include that
>>> string.h instead of the system one anyway,
>>
>> With -Icom
On Fri, Sep 13, 2013 at 3:41 PM, Junio C Hamano wrote:
> On Fri, Sep 13, 2013 at 12:29 PM, Eric Sunshine
> wrote:
>> On Fri, Sep 13, 2013 at 2:40 PM, Junio C Hamano wrote:
>>> Eric Sunshine writes:
>>>
Since these two modes of operations are disjoint and have no code in
common (one s
This is an update to my patch series on 19 May documenting the
dot repository notation.
The earlier threads start at:
$gmane/224870/ [0/2] Extend dot repository documentation
$gmane/224868/ [1/2] config doc: add dot-repository note
$gmane/224869/ [2/2] doc: command line interface (cli) dot-reposit
The Git cli will accept dot '.' (period) as the relative path
to the current repository. Explain this action.
Signed-off-by: Philip Oakley
---
Documentation/gitcli.txt | 4
1 file changed, 4 insertions(+)
diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index 7d54b77..b065c
Signed-off-by: Philip Oakley
---
Documentation/urls.txt | 7 +++
1 file changed, 7 insertions(+)
diff --git a/Documentation/urls.txt b/Documentation/urls.txt
index 9ccb246..5350a63 100644
--- a/Documentation/urls.txt
+++ b/Documentation/urls.txt
@@ -55,6 +55,13 @@ These two syntaxes are most
branch..remote can be set to '.' (period) as the repository
path (URL) as part of the remote name dwimmery. Tell the reader.
Such relative paths are not 'special'. Correct the branch..merge
note.
Signed-off-by: Philip Oakley
---
Documentation/config.txt | 6 --
1 file changed, 4 insertions(
Junio C Hamano writes:
> Nguyễn Thái Ngọc Duy writes:
>
>> Current code makes pack-objects always do check_pack_crc() in
>> unpack_entry() even if right after that we find out there's a cached
>> version and pack access is not needed. Swap two code blocks, search
>> for cached version first, the
On Fri, Sep 13, 2013 at 10:01 PM, Junio C Hamano wrote:
>> I don't like the idea of introducing a compat/mingw/string.h because
>> of two reasons: You would have to add a conditional to include that
>> string.h instead of the system one anyway,
>
> With -Icompat/mingw passed to the compiler, whic
On Fri, Sep 13, 2013 at 9:56 PM, Linus Torvalds
wrote:
>> +#ifdef __MINGW32__
>> +#ifdef __NO_INLINE__
>
> Why do you want to push this insane workaround for a clear Mingw bug?
To be frank, because Git is picking up patches much quicker than MinGW
does, and I want a solution ASAP. Although I of
Sebastian Schuberth writes:
> I don't like the idea of introducing a compat/mingw/string.h because
> of two reasons: You would have to add a conditional to include that
> string.h instead of the system one anyway,
With -Icompat/mingw passed to the compiler, which is a bog-standard
technique we a
On Fri, Sep 13, 2013 at 12:53 PM, Sebastian Schuberth
wrote:
>
> +#ifdef __MINGW32__
> +#ifdef __NO_INLINE__
Why do you want to push this insane workaround for a clear Mingw bug?
Please have mingw just fix the nasty bug, and the git patch with the
trivial wrapper looks much simpler than just say
On Fri, Sep 13, 2013 at 4:37 PM, Junio C Hamano wrote:
> Which means people who do want to see that macro defined will be
> broken after that section of the header file which unconditionally
> undefs it, right?
Right, but luckily you've fixed that in our proposed patch :-)
> That is certainly b
Jiang Xin writes:
> In test cases for relative_path, path with one leading character
> (such as /a, /x) may be recogonized as "a:/" or "x:/" if there is
> such doc drive on MINGW platform. Use an umambigous leading path
> "/foo" instead.
"DOS drive", you mean?
Are they really spelled as /a or /
On Fri, Sep 13, 2013 at 4:26 PM, Junio C Hamano wrote:
>>> Perhaps the real issue is that the header file does not give an
>>> equivalent "those who want to take the address of strcasecmp will
>>> get the address of _stricmp instead" macro, e.g.
>>>
>>> #define strcasecmp _stricmp
>>>
>>>
On Fri, Sep 13, 2013 at 2:40 PM, Junio C Hamano wrote:
> Eric Sunshine writes:
>
>> Depending upon the absence or presence of a trailing '/' on the incoming
>> pathname, index_name_exists() checks either if a file is present in the
>> index or if a directory is represented within the index. Each
Eric Sunshine writes:
> Depending upon the absence or presence of a trailing '/' on the incoming
> pathname, index_name_exists() checks either if a file is present in the
> index or if a directory is represented within the index. Each caller
> explicitly chooses the mode of operation by adding o
Felipe Contreras writes:
> If the version is 'v1.8.4-rc1' that is the version, and there's no need
> to change it to anything else, like 'v1.8.4.rc1'.
>
> If RedHat, or somebody else, needs a specific version, they can use the
> 'version' file, like everybody else.
>
> Signed-off-by: Felipe Contr
Nguyễn Thái Ngọc Duy writes:
> Current code makes pack-objects always do check_pack_crc() in
> unpack_entry() even if right after that we find out there's a cached
> version and pack access is not needed. Swap two code blocks, search
> for cached version first, then check crc.
>
> Signed-off-by:
>
> For now I'm trying to do the following:
>
> access-hook.bash has:
>
> delayed-notify.bash $@ &
>
> delayed-notify.bash has:
>
> sleep 10
> ...
> curl ...
>
> I'm expecting access-hook to spawn new process and return without
> waiting for it to finish to let the service to do its job. But when i
On Fri, Sep 13, 2013 at 10:12 AM, Johan Herland wrote:
> On Fri, Sep 13, 2013 at 8:51 AM, Francis Moreau
> wrote:
>> Hello,
>>
>> I'd like to know if that's possible to parse all notes to detect a
>> special string and if it's the case, remove the note like "git-notes
>> remove" would do.
>
> Hi
Sebastian Schuberth writes:
> Well, if by "everywhere" in (1) you mean "on all platforms" then
> you're right. But my patch does not define __NO_INLINE__ globally, but
> only at the time string.h / strings.h is included. Afterwards
> __NO_INLINE__ is undefined. In that sense, __NO_INLINE__ is not
Sebastian Schuberth writes:
> On Thu, Sep 12, 2013 at 10:08 PM, Junio C Hamano wrote:
>
>>> I'm not too happy with the wording either. As I see it, even on MinGW
>>> runtime version 4.0 it's not true that "string.h has _only_ inline
>>> definition of strcasecmp"; there's also "#define strncasecm
On 13.09.13 06:55, Jiang Xin wrote:
> 2013/9/13 Junio C Hamano :
>> For systems that need POSIX escape hatch for Apollo Domain ;-), we
>> would need a bit more work. When both path1 and path2 begin with a
>> double-dash, we would need to check if they match up to the next
>> slash, so that
>>
>>
On Fri, Sep 13, 2013 at 8:27 PM, Nicolas Pitre wrote:
> On Thu, 12 Sep 2013, Nguyễn Thái Ngọc Duy wrote:
>
>> The intention is to store flat v4 trees in delta base cache to avoid
>> repeatedly expanding copy sequences in v4 trees. When the user needs
>> to unpack a v4 tree and the tree is found in
On Thu, 12 Sep 2013, Nguyễn Thái Ngọc Duy wrote:
> The intention is to store flat v4 trees in delta base cache to avoid
> repeatedly expanding copy sequences in v4 trees. When the user needs
> to unpack a v4 tree and the tree is found in the cache, the tree will
> be converted back to canonical fo
On Thu, Sep 12, 2013 at 10:29 PM, Junio C Hamano wrote:
> Jeff King writes:
>
>> I think there are basically three classes of solution:
>>
>> 1. Declare __NO_INLINE__ everywhere. I'd worry this might affect other
>> environments, who would then not inline and lose performance (but
>>
On Thu, Sep 12, 2013 at 10:08 PM, Junio C Hamano wrote:
>> I'm not too happy with the wording either. As I see it, even on MinGW
>> runtime version 4.0 it's not true that "string.h has _only_ inline
>> definition of strcasecmp"; there's also "#define strncasecmp
>> _strnicmp" which effectively pr
On Fri, Sep 13, 2013 at 3:06 AM, Pyeron, Jason J CTR (US)
wrote:
> But, again if the connection drops, we have already lost the delta advantage.
> I would think the scenario would go like this:
>
> git clone url://blah/blah
> [fail]
> cd blah
> git clone --resume #uses normal methods
> [fail]
On Fri, Sep 13, 2013 at 1:10 AM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> +describe () {
>> + VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) ||
>> return 1
>> case "$VN" in
>> + *$LF*)
>> + return 1
>> + ;;
>> v[0-9]*)
>>
> -Original Message-
> From: Josef Wolf
> Sent: Friday, September 13, 2013 6:23
>
> On Thu, Sep 12, 2013 at 08:06:35PM +, Pyeron, Jason J CTR
> (US) wrote:
>
> > Yes, but it is those awfully slow connections (slower that
> the looping
> > issue) which happen to always drop while clo
directory_exists_in_index_icase() dangerously assumed that it could
access one character beyond the end of its directory argument, and that
that character would unconditionally be '/'. 2eac2a4c (ls-files -k: a
directory only can be killed if the index has a non-directory,
2013-08-15) added a calle
Depending upon the absence or presence of a trailing '/' on the incoming
pathname, index_name_exists() checks either if a file is present in the
index or if a directory is represented within the index. Each caller
explicitly chooses the mode of operation by adding or removing a
trailing '/' before
When 5102c617 (Add case insensitivity support for directories when using
git status, 2010-10-03) added directories to the name-hash there was
only a single hash table in which both real cache entries and leading
directory prefixes were registered. To distinguish between the two types
of entries, di
This series alters name-hash so that it no longer stores the (redundant)
trailing slash with index_state.dir_hash entries. As an intentional
side-effect, the series fixes [1] in a cleaner way (suggested by Junio
[2]) than either [3] (680be044 in master) or [4].
As noted by Peff [5], this change is
Felipe Contreras writes:
> +describe () {
> + VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) ||
> return 1
> case "$VN" in
> + *$LF*)
> + return 1
> + ;;
> v[0-9]*)
> git update-index -q --refresh
> test -z
Current code makes pack-objects always do check_pack_crc() in
unpack_entry() even if right after that we find out there's a cached
version and pack access is not needed. Swap two code blocks, search
for cached version first, then check crc.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
sha1_file.c | 2
On Thu, Sep 12, 2013 at 08:06:35PM +, Pyeron, Jason J CTR (US) wrote:
> Yes, but it is those awfully slow connections (slower that the looping
> issue) which happen to always drop while cloning from our office. And the
> round trip should be mitigated by http-keep-alives.
[ ... ]
> But, again
On Thu, Sep 12, 2013 at 03:44:53PM -0400, Jeff King wrote:
> On Thu, Sep 12, 2013 at 12:35:32PM +0200, Josef Wolf wrote:
>
> > I'm not sure I understand correctly. I see that bitmaps can be used to
> > implement set operations. But how comes that walking the graph requires a
> > lot
> > of CPU? I
On Thu, Sep 12, 2013 at 7:47 PM, Felipe Contreras
wrote:
> Indeed, I remember writing my own simplified version of 'git
> filter-branch' that was much faster. If I recall correctly, the trick
> was avoiding 'git write-tree' which can be done if you are not using
> any tree filter, but 'git filter
Your registration code (E3O6M6Y)
This is to update you regarding your CARD ATM of US$1.8Million Contact the Atm
Director with your delivery address for more information via their details
below.
MD. Ms. Kieffer Robert
Email:(dhlcom_p...@yahoo.fr)
Tel:+229 98298252
Mr. Ahamad Yaki
--
To unsubscribe
On Fri, Sep 13, 2013 at 08:28:24AM +0700, Duy Nguyen wrote:
> On Fri, Sep 13, 2013 at 3:21 AM, John Keeping wrote:
> > On Thu, Sep 12, 2013 at 12:48:10PM -0700, Junio C Hamano wrote:
> >> John Keeping writes:
> >>
> >> > This allows us to replace the submodule path trailing slash removal in
> >>
On Fri, Sep 13, 2013 at 8:51 AM, Francis Moreau wrote:
> Hello,
>
> I'd like to know if that's possible to parse all notes to detect a
> special string and if it's the case, remove the note like "git-notes
> remove" would do.
Hi,
There's no built-in command/option to do this, but the following s
68 matches
Mail list logo
