Jeff King writes:
> On Sun, Mar 10, 2013 at 09:31:24PM -0400, Jeff King wrote:
>
>> I noticed that "git archive" will barf when the root tree is empty.
>> [...]
>> I didn't bother even looking at empty subtrees. AFAIK, git should never
>> produce them (it omits the tree entirely if there is no co
On Sun, Mar 10, 2013 at 12:45:43PM +0100, Bernhard Posselt wrote:
> > valgrind -q --trace-children=yes --log-file=/tmp/valgrind.out \
> > git pull --rebase https://github.com/Raydiation/core
>
> The log file was empty and it seemed to apply everything nice when
> running valgrind. When i tr
Paul Campbell writes:
> From: bibendi
>
> For each subtree listed in .gittrees perform a push or a pull.
>
> Signed-off-by: Paul Campbell
>
> Conflicts:
> contrib/subtree/git-subtree.sh
The "Conflicts:" part is totally irrelevant. Please remove.
> ---
> contrib/subtree/git-subtree.sh
On Sun, Mar 10, 2013 at 09:31:24PM -0400, Jeff King wrote:
> I noticed that "git archive" will barf when the root tree is empty.
> [...]
> I didn't bother even looking at empty subtrees. AFAIK, git should never
> produce them (it omits the tree entirely if there is no content in it).
> You would h
> From: bibendi
>
> Look in the config file .gittrees for a default repository and
> refspec or commit when they are not provided on the command line.
>
> Uses the .gittrees config file in a similar way to how git-submodule
> uses the .gitmodules file.
What the patch does can be read from the cod
Paul Campbell writes:
> From: Matt Hoffman
>
> The repository and branch of a subtree added with the add command is
> stored in the .gittrees file.
>
> Signed-off-by: Paul Campbell
> ---
> contrib/subtree/git-subtree.sh | 8
> 1 file changed, 8 insertions(+)
>
> diff --git a/contrib/s
Paul Campbell writes:
> @@ -721,4 +722,31 @@ cmd_push()
> fi
> }
>
> +cmd_from-submodule()
> +{
I know contrib/subtree does not work with anything other than bash,
and bash may accept this as a valid function name, but if you can
avoid it easily I would prefer not to see a non-POSIX con
Kevin Bracey writes:
> Previously, the command "help" and the option "-h" behaved differently
> depending on whether a command was specified or not. Old user interface:
>
> Commands with no defaults show usage: "git" "git CMD"
> To specifically request usage:"git help" "git
git-archive relies on get_pathspec to convert its argv into
a list of pathspecs. When get_pathspec is given an empty
argv list, it returns a single pathspec, the empty string,
to indicate that everything matches. When we feed this to
our path_exists function, we typically see that the pathspec
turn
We set up the $GIT_UNZIP variable and lazy prereq in
multiple places (and the next patch is about to add another
one). Let's factor it out to avoid repeating ourselves.
Signed-off-by: Jeff King
---
t/t0024-crlf-archive.sh | 6 --
t/t5003-archive-zip.sh | 6 --
t/test-lib.sh |
I noticed that "git archive" will barf when the root tree is empty.
Instead, it should probably return an empty archive. I doubt many people
really care about this corner case in practice, but it seems like we
should handle it more gracefully (and it's an easy fix).
It came to my attention because
On 10/03/13 17:48, Kevin Bracey wrote:
Previously, the command "help" and the option "-h" behaved differently
depending on whether a command was specified or not. Old user interface:
Commands with no defaults show usage: "git" "git CMD"
To specifically request usage:"git help"
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index aaee6ae..fb6f044 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subt
From: Herman van Rink
Signed-off-by: Paul Campbell
Conflicts:
contrib/subtree/.gitignore
contrib/subtree/git-subtree.sh
contrib/subtree/test.sh
---
It's a nasty formatting only patch and I won't be surprised or too
dissappiointed
if this doesn't make it. Or are the rul
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 263ea9f..aaee6ae 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subt
From: Herman van Rink
Signed-off-by: Paul Campbell
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 1 +
contrib/subtree/git-subtree.txt | 4
2 files changed, 5 insertions(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 84c90c7
From: James Roper
Signed-off-by: Paul Campbell
Conflicts:
contrib/subtree/git-subtree.sh
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 9 -
contrib/subtree/git-subtree.txt | 5 +
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/contrib/s
From: Herman van Rink
Add pull-all, push-all, from-submodule, prune and diff commands
to SYNOPSIS.
Add alternate parameter option for add command.
Use long-form option for specifying prefix.
Signed-off-by: Paul Campbell
Conflicts:
contrib/subtree/git-subtree.txt
---
contrib/subtree/
From: Herman van Rink
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.txt | 10 ++
1 file changed, 10 insertions(+)
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index c8fc103..48ba158 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/cont
From: Herman van Rink
Signed-off-by: Paul Campbell
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 5 +
1 file changed, 5 insertions(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index ae7d1fe..84c90c7 100755
--- a/contrib/subtree/g
From: Herman van Rink
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.txt | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index e0957ee..c8fc103 100644
--- a/contrib/subtree/git-subtree.txt
From: Herman van Rink
Conflicts:
git-subtree.sh
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index d67fe5a..ae7d1fe 100755
--- a/contrib/subtree/git
From: Nate Jones
Removes entries in .gittrees where the subtree files are
no longer present on disk.
Signed-off-by: Paul Campbell
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/contrib/s
From: Herman van Rink
Signed-off-by: Paul Campbell
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 0c41383..d67fe5a 100755
--- a/contrib/subtree/git-su
From: Matt Hoffman
Lists subtrees from the .gittrees file.
Signed-off-by: Paul Campbell
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtre
From: Matt Hoffman
Fetches the remote repo as a temporary git-remote then uses
git-diff-tree to do comparison before removing the temporary
git-remote.
Signed-off-by: Paul Campbell
Conflicts:
git-subtree.sh
---
contrib/subtree/git-subtree.sh | 34 +-
1
From: Matt Hoffman
The ctrl-M (^M) character used for the carriage return (CR) is not visible
in all (most) text editors and is often silently converted to a new
line (NL) or CR/NL combo.
'say' is a wrapper for echo with accepts the option -e to interperet
escaped characters. \r becomes a CR, ye
From: Michael Hart
Added a check to ensure that split succeeds before trying to push.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index
From: Matt Hoffman
Changing underscores to dashes (push_all -> push-all)
Signed-off-by: Paul Campbell
Conflicts:
.gitignore
contrib/subtree/git-subtree.sh
---
contrib/subtree/git-subtree.sh | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/c
From: Matt Hoffman
Only when a repository and/or branch are not supplied on the command
line will push and pull look for them in the .gittrees file.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 32
1 file changed, 24 insertions(+), 8 deleti
From: bibendi
For each subtree listed in .gittrees perform a push or a pull.
Signed-off-by: Paul Campbell
Conflicts:
contrib/subtree/git-subtree.sh
---
contrib/subtree/git-subtree.sh | 25 ++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/contrib
From: bibendi
Look in the config file .gittrees for a default repository and
refspec or commit when they are not provided on the command line.
Uses the .gittrees config file in a similar way to how git-submodule
uses the .gitmodules file.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-s
From: Matt Hoffman
The repository and branch of a subtree added with the add command is
stored in the .gittrees file.
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 8
1 file changed, 8 insertions(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git
From: Peter Jaros
Converts a git-submodule into a git-subtree.
Signed-off-by: Paul Campbell
Conflicts:
.gitignore
contrib/subtree/git-subtree.sh
test.sh
---
contrib/subtree/git-subtree.sh | 30 +-
1 file changed, 29 insertions(+), 1 deletion
From: Paul Cartwright
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 7ba853e..e0957ee 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/
A selection of updates to git-subtree were offered to the list in May of
last year ($gmane/196667) by Herman van Rink.
At the time the commits were available as either a single commit or a
large collection of commits and merges to the git-subtree prior to it's
inclusion in contrib/subtree.
The
Previously, the command "help" and the option "-h" behaved differently
depending on whether a command was specified or not. Old user interface:
Commands with no defaults show usage: "git" "git CMD"
To specifically request usage:"git help" "git CMD -h"
To get a manual page:
Antoine Pelisse writes:
> Currently the documentation of GIT_PERF_REPEAT_COUNT says the default is
> five while "perf-lib.sh" uses a value of three as a default.
>
> Update the documentation so that it is consistent with the code.
>
> Signed-off-by: Antoine Pelisse
Acked-by: Thomas Rast
--
T
git operations are slow on repositories with lots of files, and lots
of tiny filesystem calls like lstat(), getdents(), open() are
reposible for this. On the linux-2.6 repository, for instance, the
numbers for "git status" look like this:
top syscalls sorted top syscalls sorted
by acc. ti
On Sat, Mar 09, 2013 at 06:45:56PM +0100, Jens Lehmann wrote:
> Am 07.03.2013 19:59, schrieb Heiko Voigt:
> > On Thu, Mar 07, 2013 at 10:49:09AM +0100, Daniel Bratell wrote:
> >> Den 2013-03-06 19:12:05 skrev Heiko Voigt :
> >>> So to summarize what you are requesting: You want a submodule merge be
This can be used to read configuration values directly from gits
database.
Signed-off-by: Heiko Voigt
---
.gitignore | 1 +
Makefile | 1 +
cache.h| 2 ++
config.c | 48
t/t1300-repo-confi
To simplify adding other sources we extract all functions needed for
parsing into a list of callbacks. We implement those callbacks for the
current file parsing. A new source can implement its own set of callbacks.
Instead of storing the concrete FILE pointer for parsing we store a void
pointer. A
The only location where cf is set in this file is in do_config_from().
This function has only one callsite which is config_from_file(). In
config_from_file() its ensured that the f member is set to non-zero.
Signed-off-by: Heiko Voigt
---
config.c | 4 ++--
1 file changed, 2 insertions(+), 2 del
Because a config callback may start parsing a new file, the
global context regarding the current config file is stored
as a stack. Currently we only need to manage that stack from
git_config_from_file. Let's factor it out to allow new
sources of config data.
Signed-off-by: Heiko Voigt
---
config
The following issues still exist:
* Error handling: If this should be useful to interrogate configs from
the database during git operations we need a way to recover from
parsing errors instead of dying.
* More tests ?
This is an update with the comments of the first iteration[1]
incorpor
Hi,
On Thu, Mar 07, 2013 at 06:42:43PM +, Ramsay Jones wrote:
> Heiko Voigt wrote:
> > +int git_config_from_strbuf(config_fn_t fn, struct strbuf *strbuf, void
> > *data)
> > +{
> > + struct config top;
> > + struct config_strbuf str;
> > +
> > + str.strbuf = strbuf;
> > + str.pos = 0;
Junio C Hamano writes:
> As promised in 0fa2eb530fb7 (add: warn when -u or -A is used without
> pathspec, 2013-01-28), "git add -u/-A" that is run without pathspec
> in a subdirectory will stop working sometime before Git 2.0, to wean
> users off of the old default, in preparation for adopting th
"git help" translated the "See 'git help ' for more
information..." message, but "git" didn't.
Signed-off-by: Kevin Bracey
---
git.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git.c b/git.c
index d33f9b3..e484644 100644
--- a/git.c
+++ b/git.c
@@ -536,7 +536,7 @@ int mai
Sorry for taking so long to reply... :-/
On 09.03.2013, at 19:32, Andrew Wong wrote:
> On 03/09/13 06:26, Max Horn wrote:
>> It tends to fail in separate places, but eventually "stabilizes". E.g. I
>> just did a couple test rebases, and it failed twice in commit 14, then the
>> third time in co
On Sun, Mar 10, 2013 at 7:11 PM, Antoine Pelisse wrote:
>>> By the way, if we know the length of the string, we could use memcmp.
>>> This one is allowed to compare 4-bytes at a time (he doesn't care
>>> about end of string). This is true because the value of the length
>>> parameter is no longer
>> By the way, if we know the length of the string, we could use memcmp.
>> This one is allowed to compare 4-bytes at a time (he doesn't care
>> about end of string). This is true because the value of the length
>> parameter is no longer "at most".
>
> We still need to worry about access violation
On Sun, Mar 10, 2013 at 6:54 PM, Antoine Pelisse wrote:
> On Sun, Mar 10, 2013 at 12:43 PM, Antoine Pelisse wrote:
>> On Sun, Mar 10, 2013 at 11:38 AM, Duy Nguyen wrote:
>>> glibc's C strncmp version does 4-byte comparison at a time when n >=4,
>>> then fall back to 1-byte for the rest.
>>
>> Lo
On Sun, Mar 10, 2013 at 12:43 PM, Antoine Pelisse wrote:
> On Sun, Mar 10, 2013 at 11:38 AM, Duy Nguyen wrote:
>> glibc's C strncmp version does 4-byte comparison at a time when n >=4,
>> then fall back to 1-byte for the rest.
>
> Looking at this
> (http://fossies.org/dox/glibc-2.17/strncmp_8c_so
On 03/10/2013 08:05 AM, Jeff King wrote:
On Sat, Mar 09, 2013 at 11:54:36AM +0100, Bernhard Posselt wrote:
Also, I can almost reproduce here, as PatrickHeller/core.git is public.
However, I suspect the problem is particular to your work built on top,
which looks like it is at commit 0525bbd73c9
On Sun, Mar 10, 2013 at 11:38 AM, Duy Nguyen wrote:
> glibc's C strncmp version does 4-byte comparison at a time when n >=4,
> then fall back to 1-byte for the rest.
Looking at this
(http://fossies.org/dox/glibc-2.17/strncmp_8c_source.html), it's not
exactly true.
It would rather be while (n >=
On Sun, Mar 10, 2013 at 5:58 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Nguyễn Thái Ngọc Duy writes:
>>
>>> A non-basename pattern that does not contain /**/ can't match anything
>>> outside the attached directory. Record its directory level and avoid
>>> matching unless the pathna
On 03/10/2013 08:05 AM, Jeff King wrote:
On Sat, Mar 09, 2013 at 11:54:36AM +0100, Bernhard Posselt wrote:
Also, I can almost reproduce here, as PatrickHeller/core.git is public.
However, I suspect the problem is particular to your work built on top,
which looks like it is at commit 0525bbd73c9
Junio C Hamano writes:
> Nguyễn Thái Ngọc Duy writes:
>
>> A non-basename pattern that does not contain /**/ can't match anything
>> outside the attached directory. Record its directory level and avoid
>> matching unless the pathname is also at the same directory level.
>
> Without defining wha
Jonathan Nieder wrote:
> * If the file ~/git-shell-commands/no-interactive-login exists,
>run no-interactive-login to let the server say what it likes,
>then hang up.
>
> * Otherwise, if ~/git-shell-commands/ is present, start an
>interactive read-eval-print loop.
>
> * Otherwise, pr
On Sun, Mar 10, 2013 at 2:34 PM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> strncmp is provided length information which could be taken advantage
>> by the underlying implementation.
>
> I may be missing something fundamental, but I somehow find the above
> does not make any sense
On Sun, Mar 10, 2013 at 3:20 PM, Junio C Hamano wrote:
>> + else if (*p == '/')
>> + dirs--;
>
> I presume this is to compensate for a pattern like "/pat" whose
> leading slash is only to anchor the pattern at the level. Correct?
Yes.
Also for the record, we could cut down the n
Hi Harring,
I'm glad to see that there will be another locale for Git.
I reviewed three commit from you. There are some problems:
Because git has a strict and high standard for commit log, so
1. your commit log must have "Signed-off-by: " line(s).
Commit using "commit -s", or using alias suc
Hi,
Here is the patch.
Regards,
ch3cooli
0001-mailmap-add-grave-accents-around-mailmap.file-and-ma.patch
Description: Binary data
Duy Nguyen wrote:
> On Fri, Mar 8, 2013 at 3:15 PM, Junio C Hamano wrote:
>>> The possible options are:
>>> +
>>> - - 'no' - Show no untracked files
>>> + - 'no' - Show no untracked files (this is fastest)
>>
>> There is a trade-off around the use of -uno between safety and
>
Nguyễn Thái Ngọc Duy writes:
> A non-basename pattern that does not contain /**/ can't match anything
> outside the attached directory. Record its directory level and avoid
> matching unless the pathname is also at the same directory level.
Without defining what a "directory level" is, the abov
65 matches
Mail list logo
