On Wed, Aug 26, 2015 at 9:18 PM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
Matthieu Moy matthieu@grenoble-inp.fr writes:
For the current code %(if:empty)%(align)%(end)%(then)Empty%(else)Not
This reroll includes changes suggested by Duy Nguyen:
A. Path normalization (partial).
B. Rearrangement of common_list struct to make formatting prettier.
It also includes a test style fix suggested by Eric Sunshine and
others: a bogus test_must_fail on a non-git command has been replaced
by a
larsxschnei...@gmail.com writes:
From: Lars Schneider larsxschnei...@gmail.com
We run P4 servers on Linux and P4 clients on Windows. For an unknown
reason the file path for a number of files in P4 does not match the
directory path with respect to case sensitivity.
Thanks, but is this still
Jeff S acornb...@gmail.com writes:
Brian thanks for responding! I'm finally able to build git completely.
Would it be possible to add the OS X dependency to the git/INSTALL
file?
OSX Yosemite 10.10.5
Xcode 6.4 (6E35b)
…
$ brew install autoconf
$ brew install asciidoc
$ brew install
On Wed, Aug 26, 2015 at 8:07 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
On Wed, Aug 26, 2015 at 12:46 AM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
I didn't check how wide the original is supposed to be,
On 2015-08-26 19.42, Junio C Hamano wrote:
Jeff S acornb...@gmail.com writes:
Brian thanks for responding! I'm finally able to build git completely.
Would it be possible to add the OS X dependency to the git/INSTALL
file?
OSX Yosemite 10.10.5
Xcode 6.4 (6E35b)
…
$ brew install autoconf
Karthik Nayak karthik@gmail.com writes:
On Wed, Aug 26, 2015 at 8:07 PM, Junio C Hamano gits...@pobox.com wrote:
... You can give a new format_ref_array_item()
that does not print but fills a strbuf to this caller, make
show_ref_array_item() a thin wrapper that calls it and prints it
On Wed, Aug 26, 2015 at 10:56 AM, Junio C Hamano gits...@pobox.com wrote:
But notice that I said if you really want to. I personally think
it is a road to madness.
Agreed. I don't believe in command line API here. I think we'd need a
better solution.
My gut says: Live with the warts on old
Instead of common_list having formatting like ! and /, use a struct to
hold common_list data in a structured form.
We don't use 'exclude' yet; instead, we keep the old codepath that
handles info/sparse-checkout and logs/HEAD. Later, we will use exclude.
Signed-off-by: David Turner
Instead of a linear search over common_list to check whether
a path is common, use a trie. The trie search operates on
path prefixes, and handles excludes.
Signed-off-by: David Turner dtur...@twopensource.com
---
path.c| 226 ++
We need a place to stick refs for bisects in progress that is not
shared between worktrees. So we use the refs/worktree/ hierarchy.
The is_per_worktree_ref function and associated docs learn that
refs/worktree/ is per-worktree, as does the git_path code in path.c
The ref-packing functions learn
Using the new refs/worktree/ refs, make bisection per-worktree.
Signed-off-by: David Turner dtur...@twopensource.com
---
Documentation/git-bisect.txt | 4 ++--
Documentation/rev-list-options.txt | 14 +++---
bisect.c | 2 +-
builtin/rev-parse.c
Christian Couder christian.cou...@gmail.com writes:
We currently ignore the first line passed to `git interpret-trailers`,
when looking for the beginning of the trailers.
Unfortunately this does not work well when a commit is created with a
line break in the title, using for example the
Christian Couder christian.cou...@gmail.com writes:
Unfortunately this does not work well when a commit is created with a
line break in the title, using for example the following command:
git commit -m 'place of
code: change we made'
I confirm that this patch fixes the behavior for me.
On Tue, Aug 25, 2015 at 11:28 PM, Andreas Schwab sch...@linux-m68k.org wrote:
Jacob Keller jacob.kel...@gmail.com writes:
if you really mean to create a tag named create, use
git tag -- create master
In all other uses of -- refs must be put on the *left* side.
Andreas.
Oops that
On Tue, Aug 25, 2015 at 11:26 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
I like the idea of using atomv-handler() a lot, mostly cause this
would eventually
help us clean up populate_atom() which currently seems like a huge dump of
code.
I think
Jacob Keller jacob.kel...@gmail.com writes:
if you really mean to create a tag named create, use
git tag -- create master
In all other uses of -- refs must be put on the *left* side.
Andreas.
--
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5
On Tue, Aug 25, 2015 at 11:07 PM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Christian Couder christian.cou...@gmail.com writes:
Unfortunately this does not work well when a commit is created with a
line break in the title, using for example the following command:
git commit -m 'place
On Wed, Aug 26, 2015 at 12:20 AM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
I'm working on porting over the printing options of ref-filter to `git
branch -l`.
This is a follow up to
http://article.gmane.org/gmane.comp.version-control.git/276377
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
Matthieu Moy matthieu@grenoble-inp.fr writes:
For the current code %(if:empty)%(align)%(end)%(then)Empty%(else)Not
Empty%(end)
would print non-empty, I guess the documentation holds in that case.
Not
From: Lars Schneider larsxschnei...@gmail.com
We run P4 servers on Linux and P4 clients on Windows. For an unknown
reason the file path for a number of files in P4 does not match the
directory path with respect to case sensitivity.
E.g. p4 files might return
//depot/path/to/file1
On Wed, Aug 26, 2015 at 10:06 AM, Jeff King p...@peff.net wrote:
On Tue, Aug 25, 2015 at 10:28:24AM -0700, Stefan Beller wrote:
+int module_foreach_parallel(int argc, const char **argv, const char *prefix)
+{
[...]
+ for (i = 0; i ce_used; i++) {
+ const struct submodule
Christian Couder christian.cou...@gmail.com writes:
There is already code to detect a patch in interpret-trailers, but it
relies on the patch starting with a line with only three dashes.
Hmm, then it can be taught to notice everything below... as
another marker, right?
Maybe. I don't know if
Junio C Hamano gits...@pobox.com writes:
While the reordering would certainly stop showing the comments and
patch, I am not sure if that is a move in the right direction. It
will rob from the hooks information that they have traditionally
been given---
The information given in the comments
Comments inline.
On 08/22/2015 05:39 AM, Karthik Nayak wrote:
From: Karthik Nayak karthik@gmail.com
Add a function called 'for_each_reftype_fullpath()' to refs.{c,h}
which iterates through each ref for the given path without trimming
the path and also accounting for broken refs, if
Hilco Wijbenga hilco.wijbe...@gmail.com writes:
On 25 August 2015 at 16:43, Junio C Hamano gits...@pobox.com wrote:
I do not see a good way to do such a safe transition with command
words approach, *unless* we are going to introduce new commands,
i.e. git list-tag, git create-tag, etc.
Junio C Hamano gits...@pobox.com writes:
Matthieu Moy matthieu@grenoble-inp.fr writes:
For the current code %(if:empty)%(align)%(end)%(then)Empty%(else)Not
Empty%(end)
would print non-empty, I guess the documentation holds in that case.
Not sure if we require it to print non-empty.
Matthieu Moy matthieu@grenoble-inp.fr writes:
For the current code %(if:empty)%(align)%(end)%(then)Empty%(else)Not
Empty%(end)
would print non-empty, I guess the documentation holds in that case.
Not sure if we require it to print non-empty.
You don't want the %(if) condition to depend
Signed-off-by: Jiang Xin worldhello@gmail.com
---
builtin/am.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/am.c b/builtin/am.c
index b9c62e3..699a924 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -2168,7 +2168,7 @@ int cmd_am(int argc, const char **argv,
On Tue, Aug 25, 2015 at 10:28:24AM -0700, Stefan Beller wrote:
+int module_foreach_parallel(int argc, const char **argv, const char *prefix)
+{
[...]
+ for (i = 0; i ce_used; i++) {
+ const struct submodule *sub;
+ const struct cache_entry *ce = ce_entries[i];
Jacob Keller jacob.kel...@gmail.com writes:
On Tue, Aug 25, 2015 at 4:28 PM, Junio C Hamano gits...@pobox.com wrote:
* jk/notes-merge-config (2015-08-17) 6 commits
- notes: teach git-notes about notes.name.mergeStrategy option
- notes: add notes.mergeStrategy option to select default
On 26 Aug 2015, at 22:05, Junio C Hamano gits...@pobox.com wrote:
larsxschnei...@gmail.com writes:
From: Lars Schneider larsxschnei...@gmail.com
We run P4 servers on Linux and P4 clients on Windows. For an unknown
reason the file path for a number of files in P4 does not match the
Lars Schneider larsxschnei...@gmail.com writes:
On 26 Aug 2015, at 22:05, Junio C Hamano gits...@pobox.com wrote:
larsxschnei...@gmail.com writes:
From: Lars Schneider larsxschnei...@gmail.com
We run P4 servers on Linux and P4 clients on Windows. For an unknown
reason the file path for
From: Jacob Keller jacob.kel...@gmail.com
git tag -n will always fail if tag.sort is set to a sort other than the
default refname setting. Teach git tag to have -n override the
configuration setting when -n is used, instead of failing with
fatal: --sort and -n incompatible
since the user
David Turner dtur...@twopensource.com writes:
Instead of a linear search over common_list to check whether
a path is common, use a trie. The trie search operates on
path prefixes, and handles excludes.
Signed-off-by: David Turner dtur...@twopensource.com
---
path.c| 226
On Wed, Aug 26, 2015 at 3:52 PM, Philip Oakley philipoak...@iee.org wrote:
From: Jacob Keller jacob.kel...@gmail.com
On Wed, Aug 26, 2015 at 10:56 AM, Junio C Hamano gits...@pobox.com
wrote:
But notice that I said if you really want to. I personally think
it is a road to madness.
Hi,
i am observing some weired git svn clone behavior during my try to migrate
the Scaffold Hunter [1] SVN repository [2] to Git:
if i just use the command
$ git svn clone svn://svn.code.sf.net/p/scaffoldhunter/code --no-metadata -s
code
everything went smoothly. Now i wanted to replace the
On Wed, 2015-08-26 at 18:10 -0400, David Turner wrote:
On Wed, 2015-08-26 at 14:15 -0700, Junio C Hamano wrote:
+ * For example, consider the following set of strings:
+ * abc
+ * def
+ * definite
+ * definition
+ *
+ * The trie would look look like:
+ * root: len = 0,
From: Jacob Keller jacob.kel...@gmail.com
On Wed, Aug 26, 2015 at 10:56 AM, Junio C Hamano gits...@pobox.com
wrote:
But notice that I said if you really want to. I personally think
it is a road to madness.
Agreed. I don't believe in command line API here. I think we'd need a
better solution.
David Turner dtur...@twopensource.com writes:
On Wed, 2015-08-26 at 14:15 -0700, Junio C Hamano wrote:
Thanks for a pleasant read.
Thank you! I'll re-roll with those last two fixes (re value=NULL)
tomorrow-ish.
If these two value = NULL are the only things, I can locally fix
them up. No
On Wed, 2015-08-26 at 14:15 -0700, Junio C Hamano wrote:
+ * For example, consider the following set of strings:
+ * abc
+ * def
+ * definite
+ * definition
+ *
+ * The trie would look look like:
+ * root: len = 0, value = (something), children a and d non-NULL.
value = NULL, as
Additional From added to message body if git-send-email run
with --from parameters
Signed-off-by: Brilliantov Kirill Vladimirovich brillian...@inbox.ru
---
git-send-email.perl | 25 +++--
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/git-send-email.perl
Karthik Nayak karthik@gmail.com writes:
It's more than just colors. The whole format changes.
$ git branch -a
For local:
%(if)%(HEAD)%(then)%(HEAD) %(color:green)%(refname:short)%(else)
%(refname:short)%(end)
For remote:
On Tue, Aug 25, 2015 at 4:05 AM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
Karthik Nayak karthik@gmail.com writes:
On Mon, Aug 24, 2015 at 10:57 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
...
+
On 25 August 2015 at 19:24, Luke Diamand l...@diamand.org wrote:
On 25/08/15 14:14, Lars Schneider wrote:
So the choices are:
1. A new command-line option which would silently set core.ignorecase
2. Users just have to know to set core.ignorecase manually before
using git-p4 (i.e. Lars'
Karthik Nayak karthik@gmail.com writes:
On Tue, Aug 25, 2015 at 4:05 AM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
Karthik Nayak karthik@gmail.com writes:
On Mon, Aug 24, 2015 at 10:57 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak
Karthik Nayak karthik@gmail.com writes:
On Wed, Aug 26, 2015 at 12:46 AM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
I didn't check how wide the original is supposed to be, but perhaps
changing builtin/tag.c this way
if
Sorry I sent the part below privately by mistake:
On Tue, Aug 25, 2015 at 11:07 PM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Now, I found another issue: I still have this interpret-trailers in my
hooks/commit-msg, and it behaves badly when I use git commit -v. With
-v, I get a diff in
Jacob Keller jacob.kel...@gmail.com writes:
On Wed, Aug 26, 2015 at 10:56 AM, Junio C Hamano gits...@pobox.com wrote:
But notice that I said if you really want to. I personally think
it is a road to madness.
Agreed. I don't believe in command line API here. I think we'd need a
better
This series applies on top of 10d0bef9981c8045b8c9aac1ca7b8761896bed0c in
the branch origin/sb/submodule-helper
The first patch is a resend of module_clone, which now contains all
memory leak fixes.
The second patch adding the new task queue is rewritten to not
use semaphores any more, but only
`module_clone` is part of the update command, which I want to convert
to C next.
Signed-off-by: Stefan Beller sbel...@google.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
builtin/submodule--helper.c | 160 +++-
git-submodule.sh| 80
Before we had n threads doing the delta finding work, and the main thread
was load balancing the threads, i.e. moving work from a thread with a large
amount left to an idle thread whenever such a situation arose.
This moves the load balancing to the threads themselves. As soon as one
thread is
This adds functionality to do work in a parallel threaded
fashion while the boiler plate code for setting up threads
and tearing them down as well as queuing up tasks is hidden
behind the new API.
Signed-off-by: Stefan Beller sbel...@google.com
---
run-command.c | 29 +---
thread-utils.c |
Similar to `git submodule foreach` the new command
`git submodule foreach_parallel` will run a command
on each submodule.
The commands are run in parallel up to the number of
cores by default, or you can specify '-j 4' tun just
run with 4 threads for example.
One major difference to `git
This demonstrates how the new threading API may be used.
There is no change in the workflow, just using the new
threading API instead of keeping track of the pthreads
ourselves.
Signed-off-by: Stefan Beller sbel...@google.com
---
builtin/index-pack.c | 23 ---
1 file changed,
On Wed, Aug 26, 2015 at 4:02 PM, Jacob Keller jacob.kel...@gmail.com wrote:
On Wed, Aug 26, 2015 at 3:52 PM, Philip Oakley philipoak...@iee.org wrote:
From: Jacob Keller jacob.kel...@gmail.com
On Wed, Aug 26, 2015 at 10:56 AM, Junio C Hamano gits...@pobox.com
wrote:
But notice that I said
brillian...@inbox.ru writes:
Additional From added to message body if git-send-email run
with --from parameters
Signed-off-by: Brilliantov Kirill Vladimirovich brillian...@inbox.ru
---
git-send-email.perl | 25 +++--
1 file changed, 11 insertions(+), 14 deletions(-)
Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
builtin/show-ref.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index dfbc314..d9c1633 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -8,7 +8,7 @@
static const char
Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
git-submodule.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 36797c3..25b1ddf 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -904,7 +904,7 @@ Maybe you want to use
Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
builtin/pack-objects.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 62cc16d..1c63f8f 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -25,8
The error message can be seen by running
`git config gc.reflogexpire foo` and then `git reflog expire`.
Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
builtin/reflog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index
61 matches
Mail list logo
