On Fri, Jul 31, 2015 at 6:02 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
-module_list()
+module_list_shell()
{
eval set $(git rev-parse --sq --prefix $wt_prefix -- $@)
(
@@ -187,6 +187,29 @@ module_list()
'
}
+module_list()
On Mon, Aug 3, 2015 at 11:16 PM, Junio C Hamano gits...@pobox.com wrote:
I hope we can attract more contributors in the future, so the weight
of this doesn't lie too much on his shoulders. Perhaps we should send
out the draft earlier next time, and beckon for more contributions
from the list.
Doug Kelly dougk@gmail.com writes:
Here's a change to prune.c that at least addresses the issue by removing
.idx files without an associated pack, but it's by no means pretty. If anyone
has any feedback before I turn this into a formal patch, it's more than
welcome!
I'd hesitate to see
On Tue, Jul 21, 2015 at 4:37 PM, Doug Kelly dougk@gmail.com wrote:
On Tue, Jul 21, 2015 at 3:48 PM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
While I still think that it is more important to prevent such a
situation from occurring in the first place,
On Mon, Aug 3, 2015 at 8:16 PM, Ben Boeckel maths...@gmail.com wrote:
On Mon, Aug 03, 2015 at 19:38:15 -0400, Eric Sunshine wrote:
On Mon, Aug 3, 2015 at 5:00 PM, Ben Boeckel maths...@gmail.com wrote:
+ argc = parse_options(argc, argv, NULL, options,
builtin_remote_geturl_usage,
+
On Tue, Aug 4, 2015 at 2:12 AM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
Introduce a ref_formatting_state which will eventually hold the values
of modifier atoms. Implement this within ref-filter.
Mentored-by: Christian Couder
On Tue, Aug 4, 2015 at 3:38 AM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
On Tue, Aug 4, 2015 at 1:51 AM, Junio C Hamano gits...@pobox.com wrote:
...
It is very very dissapointing to allow the next atom only
implementation to squat on a good name
On Tue, Aug 4, 2015 at 2:49 AM, David Turner dtur...@twopensource.com wrote:
Simply treating refs/worktree as per-worktree, while the rest of refs/
is not, would be a few dozen lines of code. The full remapping approach
is likely to be a lot more. I've already got the lmdb backend working
On Tue, Aug 4, 2015 at 6:18 AM, Junio C Hamano gits...@pobox.com wrote:
- I think pt/am-builtin is more or less ready, but the fix to the
issue that options given to 'git am' when restarting were
rejected must be queued on that topic before we can start
thinking of merging it to
On Mon, Aug 03, 2015 at 19:38:15 -0400, Eric Sunshine wrote:
On Mon, Aug 3, 2015 at 5:00 PM, Ben Boeckel maths...@gmail.com wrote:
+ OPT_BOOL('\0', push, push_mode,
+N_(query push URLs)),
A bit more explanatory:
query push URLs rather than fetch
Most of the submodule operations work on a set of submodules.
Calculating and using this set is usually done via:
module_list $@ | {
while read mode sha1 stage sm_path
do
# the actual operation
done
}
Currently the function
On Mon, Aug 3, 2015 at 5:00 PM, Ben Boeckel maths...@gmail.com wrote:
Expanding `insteadOf` is a part of ls-remote --url and there is no way
to expand `pushInsteadOf` as well. Add a get-url subcommand to be able
to query both as well as a way to get all configured urls.
Signed-off-by: Ben
Karthik Nayak karthik@gmail.com writes:
On Tue, Aug 4, 2015 at 1:51 AM, Junio C Hamano gits...@pobox.com wrote:
...
It is very very dissapointing to allow the next atom only
implementation to squat on a good name align:type,width,
especially when I thought that the list agreed
On Mon, Aug 3, 2015 at 2:48 PM, David Turner dtur...@twopensource.com wrote:
Add a new function, find_shared_symref, which contains the heart of
die_if_checked_out, but works for any symref, not just HEAD. Refactor
die_if_checked_out to use the same infrastructure as
find_shared_symref.
On Mon, Aug 3, 2015 at 3:04 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
On Fri, Jul 31, 2015 at 6:01 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
+static const char * const git_submodule_helper_usage[] = {
+
Previously, some calls lookup_untracked would pass a full path. But
lookup_untracked assumes that the portion of the path up to and
including to the untracked_cache_dir has been removed. So
lookup_untracked would be looking in the untracked_cache for 'foo' for
'foo/bar' (instead of just looking
On Tue, 2015-08-04 at 06:09 +0700, Duy Nguyen wrote:
On Tue, Aug 4, 2015 at 2:49 AM, David Turner dtur...@twopensource.com wrote:
Simply treating refs/worktree as per-worktree, while the rest of refs/
is not, would be a few dozen lines of code. The full remapping approach
is likely to be a
A maintenance release Git v2.4.8 is now available at the usual
places. This contains remaining fixes that are in v2.5 but have
been lacking in 2.4.x maintenance track so far. It will hopefully
be the last 2.4.x update at least for now.
The tarballs are found at:
On Mon, Aug 3, 2015 at 6:18 PM, Junio C Hamano gits...@pobox.com wrote:
I've kicked a few topics out of 'next' back to 'pu' for now.
- I think es/worktree-add and es/worktree-add-cleanup are good
shape overall, but we probably would want to make them into a
single topic.
Is there
Eric Sunshine sunsh...@sunshineco.com writes:
On Mon, Aug 3, 2015 at 6:18 PM, Junio C Hamano gits...@pobox.com wrote:
I've kicked a few topics out of 'next' back to 'pu' for now.
- I think es/worktree-add and es/worktree-add-cleanup are good
shape overall, but we probably would want to
Stefan Beller sbel...@google.com writes:
On Fri, Jul 31, 2015 at 6:01 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
+static const char * const git_submodule_helper_usage[] = {
+ N_(git submodule--helper --module_list [path...]),
Yuck. Please do
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Accumulated fixes went to a new maintenance release 2.4.8. The
first batch of the post-2.5 development cycle has been merged to
'master', and
On Mon, Aug 03, 2015 at 01:33:56AM +0200, Michael Haggerty wrote:
Brian, what was your experience when writing these patches? Did they
tend to work as soon as they compiled without errors (i.e., not super
risky) or did you often have test suite failures that you had to go back
and fix (i.e.,
On Thu, 09 Jul 2015 at 20:24:08, Sebastian Schuberth wrote:
Signed-off-by: Sebastian Schuberth sschube...@gmail.com
---
builtin/clone.c | 17 +
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index 00535d0..ebcb849 100644
I am using Windows 7 64 bits.
1)
I have a filename called ze_xmlfun.prg
Last week gitgui shows 2 changed files: ZE_XML~1.PRG and ze_xmlfun.prg
At momment I can't update this file, because get a error.
Try delete file, update one name each time, but same error.
Seems that a unique file is
On Tue, Aug 4, 2015 at 2:06 AM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
Introduce a strbuf `output` which will act as a substitute rather than
printing directly to stdout. This will be used for formatting
eventually.
---
Missing sign-off; the
Max Kirillov m...@max630.net writes:
Here is a space to describe why this change is a good thing. Is
this a fix to change the behaviour, and if so how is the behaviour
different with and without the patch? Or is this just to drop the
block of code from here and replace it with a call to an
On Fri, Jul 31, 2015 at 6:01 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
+static const char * const git_submodule_helper_usage[] = {
+ N_(git submodule--helper --module_list [path...]),
Yuck. Please do not force --multi_word_opt upon us, which is
Stefan Beller sbel...@google.com writes:
$ git submodule--helper module_list
Why would you use an underscore in here as opposed to a dash?
Simply because the diff would be easier to read; the callers used to
call module_list shell function, now they call the subcommand with the
same name
On Sat, Aug 1, 2015 at 12:35 AM, David Turner dtur...@twopensource.com wrote:
Remove a check that would disable the untracked cache for sparse
checkouts. Add tests that ensure that the untracked cache works with
sparse checkouts -- specifically considering the case that a file
foo/bar is
On Thu, Jul 30, 2015 at 09:53:07AM -0700, Junio C Hamano wrote:
Junio C Hamano gits...@pobox.com writes:
Well, but there is the above or we may not ;-)
But actually you are right, currently I still have the old logic
in place that splits on colons in the path component.
Yes. The
On Thu, Jul 30, 2015 at 12:59 PM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Karthik Nayak karthik@gmail.com writes:
Solving this doesn't seem much harder than
diff --git a/ref-filter.c b/ref-filter.c
index 6c0189f..a4df287 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1117,7
On Sun, 02 Aug 2015 11:28:49 -0700
Junio C Hamano gits...@pobox.com wrote:
Jan Viktorin vikto...@rehivetech.com writes:
Authen::SASL gives:
No SASL mechanism found
at /usr/share/perl5/vendor_perl/Authen/SASL.pm line 77.
at /usr/share/perl5/core_perl/Net/SMTP.pm line 207.
The
On Sun, Aug 2, 2015 at 11:02 PM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Karthik Nayak karthik@gmail.com writes:
+test_expect_success 'no padding when `padright` length is smaller than atom
length' '
+cat expect -\EOF
+refs/heads/master|
+refs/heads/side|
+
This is part of my GSoC project to unify git tag -l, git branch -l,
git for-each-ref. This patch series is continued from: Git (next)
https://github.com/git/git/commit/bf5418f49ff0cebc6e5ce04ad1417e1a47c81b61
This series consists of porting tag.c over to using the ref-filter APIs
Version 7 can
Implement an `align` atom which will act as a modifier atom and align
succeeding atoms to the right, left or middle. It is followed by
`:type,paddinglength`, where the `type` is either left, right or
middle and `paddinglength` is the total length of the padding to be
performed. If the atom length
Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using
find_shared_symref and die if we find one. This prevents simultaneous
merges to the same notes branch from different worktrees.
Signed-off-by: David Turner dtur...@twopensource.com
---
builtin/notes.c | 6
Add a new function, find_shared_symref, which contains the heart of
die_if_checked_out, but works for any symref, not just HEAD. Refactor
die_if_checked_out to use the same infrastructure as
find_shared_symref.
Soon, we will use find_shared_symref to protect notes merges in
worktrees.
On Sat, 2015-08-01 at 15:51 +0200, Johan Herland wrote:
On Sat, Aug 1, 2015 at 12:11 AM, David Turner dtur...@twopensource.com
wrote:
Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using
find_shared_symref and die if we find one. This prevents simultaneous
merges to the same
On Mon, Aug 03, 2015 at 10:34:14AM +0200, Patrick Steinhardt wrote:
One more question for backwards compatibility remains then.
Currently when we clone something like 'http://example.com:/'
we'd create a git repository '' as we'd split on the first
occurrence of ':'. Should we remain
From: Karthik Nayak karthik@gmail.com
Add a functions called 'for_each_tag_ref_fullpath()' to refs.{c,h}
which iterates through each tag ref without trimming the path.
Add an option in 'filter_refs()' to use 'for_each_tag_ref_fullpath()'
and filter refs. This type checking is done by adding
Introduce a strbuf `output` which will act as a substitute rather than
printing directly to stdout. This will be used for formatting
eventually.
---
ref-filter.c | 36 ++--
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
From: Karthik Nayak karthik@gmail.com
Implement the '--format' option provided by 'ref-filter'.
This lets the user list tags as per desired format similar
to the implementation in 'git for-each-ref'.
Add tests and documentation for the same.
Mentored-by: Christian Couder
Introduce a ref_formatting_state which will eventually hold the values
of modifier atoms. Implement this within ref-filter.
Mentored-by: Christian Couder christian.cou...@gmail.com
Mentored-by: Matthieu Moy matthieu@grenoble-inp.fr
Signed-off-by: Karthik Nayak karthik@gmail.com
---
From: Karthik Nayak karthik@gmail.com
Make 'tag.c' use 'ref-filter' data structures and make changes to
support the new data structures. This is a part of the process
of porting 'tag.c' to use 'ref-filter' APIs.
This is a temporary step before porting 'tag.c' to use 'ref-filter'
completely.
From: Karthik Nayak karthik@gmail.com
Add support to sort by version using the v:refname and
version:refname option. This is achieved by using the 'versioncmp()'
function as the comparing function for qsort.
This option is included to support sorting by versions in `git tag -l`
which will
From: Karthik Nayak karthik@gmail.com
Make 'tag.c' use 'ref-filter' APIs for iterating through refs, sorting
and printing of refs. This removes most of the code used in 'tag.c'
replacing it with calls to the 'ref-filter' library.
Make 'tag.c' use the 'filter_refs()' function provided by
From: Karthik Nayak karthik@gmail.com
In 'tag.c' we can print N lines from the annotation of the tag using
the '-nnum' option. Copy code from 'tag.c' to 'ref-filter' and
modify 'ref-filter' to support printing of N lines from the annotation
of tags.
Mentored-by: Christian Couder
`get_pathspec` is deprecated and builtin/mv is its last caller, so getting
rid of `get_pathspec` is rather easy. By getting rid of `get_pathspec`,
the documentation such as 'technical/api-setup.txt' becomes easier to read
as the reader doesn't need to bear with the additional fact that
From: Karthik Nayak karthik@gmail.com
Using 'ref-filter' APIs implement the '--merged' and '--no-merged'
options into 'tag.c'. The '--merged' option lets the user to only
list tags merged into the named commit. The '--no-merged' option
lets the user to only list tags not merged into the named
On Sat, Aug 1, 2015 at 1:51 PM, Michael Haggerty mhag...@alum.mit.edu wrote:
For each worktree, we could then create a different view of the
references by splicing parts of the full reference namespace together.
This could even be based on config settings so that we don't have to
hardcode
On Sat, Aug 1, 2015 at 10:59 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
Either way, there's also the question of who should know how to find the
worktree-specific references--the program that wants to access them, or
should there be a secret invisible mapping that is done on lookup, and
Seems like a greylist problem ?
(I take the freedom to forward your mail to upstream git,
in the hope that somebody has has an idea)
On 03.08.15 13:13, Philip Oakley wrote:
I'm scratching my head as to why patches I try to send upstream
(git@vger.kernel.org) via my MSysGit install's
On Mon, Aug 3, 2015 at 8:02 PM, Duy Nguyen pclo...@gmail.com wrote:
On Sat, Aug 1, 2015 at 10:59 AM, Michael Haggerty mhag...@alum.mit.edu
wrote:
Either way, there's also the question of who should know how to find the
worktree-specific references--the program that wants to access them, or
On Wed, Jul 29, 2015 at 5:50 AM, Johan Herland jo...@herland.net wrote:
On Wed, Jul 29, 2015 at 12:12 AM, Junio C Hamano gits...@pobox.com wrote:
David Turner dtur...@twopensource.com writes:
Prevent merges to the same notes branch from different worktrees.
Before creating NOTES_MERGE_REF,
I have noticed that when cloning a repository, I get a
refs/remotes/origin/HEAD symbolic ref.
On the other hand, when fetching a new remote, the remote HEAD is not set by
git-fetch (but can be added later by `git remote set-head ...')
I was under the impression that clone is equivalent to (at
From: Jiang Xin worldhello@gmail.com
2015-08-02 21:42 GMT+08:00 Philip Oakley philipoak...@iee.org:
Separate out the three different contribution styles for existing,
new,
and wider mis-translation contributions, with suitable headings for
easy
reference.
In particular highlight the
Karthik Nayak karthik@gmail.com writes:
This is part of my GSoC project to unify git tag -l, git branch -l,
git for-each-ref. This patch series is continued from: Git (next)
https://github.com/git/git/commit/bf5418f49ff0cebc6e5ce04ad1417e1a47c81b61
This series consists of porting tag.c
On Mon, 2015-08-03 at 20:55 +0700, Duy Nguyen wrote:
On Fri, Jul 31, 2015 at 1:06 PM, David Turner dtur...@twopensource.com
wrote:
Add a function ref_type, which categorizes refs as per-worktree,
pseudoref, or normal ref.
For per-worktree refs, you probably should follow common_list[] in
On Mon, Aug 3, 2015 at 10:07 PM, Junio C Hamano gits...@pobox.com wrote:
Thanks; it seems that the review section is rather thin. No new and
interesting changes worth reviewing in the entire month of July?
Of course there are, but I can only put in a few hours, and that goes
into the
Implements a get-url subcommand to git-remote which allows for querying the
URLs for a remote while expanding insteadOf and pushInsteadOf.
--Ben
Ben Boeckel (1):
remote: add get-url subcommand
Documentation/git-remote.txt | 10
builtin/remote.c | 55
Expanding `insteadOf` is a part of ls-remote --url and there is no way
to expand `pushInsteadOf` as well. Add a get-url subcommand to be able
to query both as well as a way to get all configured urls.
Signed-off-by: Ben Boeckel maths...@gmail.com
---
Documentation/git-remote.txt | 10
Rebased to latest master, also merges cleanly to pu. Otherwise no changes.
Max Kirillov (2):
submodule refactor: use git_path_submodule() in add_submodule_odb()
path: implement common_dir handling in git_path_submodule()
cache.h | 1 +
path.c
Signed-off-by: Max Kirillov m...@max630.net
---
submodule.c | 28 ++--
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/submodule.c b/submodule.c
index 15e90d1..f6afe0a 100644
--- a/submodule.c
+++ b/submodule.c
@@ -122,43 +122,35 @@ void
This allows making submodules a linked workdirs.
Same as for .git, but ignores the GIT_COMMON_DIR environment variable,
because it would mean common directory for the parent repository and
does not make sense for submodule.
Also add test for functionality which uses this call.
Signed-off-by:
David Turner dtur...@twopensource.com writes:
I think making this configurable is (a) overkill and (b) dangerous.
It's dangerous because the semantics of which refs are per-worktree is
important to the correct operation of git, and allowing users to mess
with it seems like a big mistake.
Thomas Ferris Nicolaisen tfn...@gmail.com writes:
I hope we can attract more contributors in the future, so the weight
of this doesn't lie too much on his shoulders. Perhaps we should send
out the draft earlier next time, and beckon for more contributions
from the list.
Yeah, that is
Jeff King p...@peff.net writes:
On Mon, Aug 03, 2015 at 10:34:14AM +0200, Patrick Steinhardt wrote:
One more question for backwards compatibility remains then.
Currently when we clone something like 'http://example.com:/'
we'd create a git repository '' as we'd split on the first
On Sat, 2015-08-01 at 08:51 +0200, Michael Haggerty wrote:
On 08/01/2015 07:12 AM, Junio C Hamano wrote:
On Fri, Jul 31, 2015 at 8:59 PM, Michael Haggerty mhag...@alum.mit.edu
wrote:
It seems to me that adding a new top-level worktree-refs directory is
pretty traumatic. Lots of people
Stefan Beller sbel...@google.com writes:
On Fri, Jul 31, 2015 at 6:02 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
-module_list()
+module_list_shell()
{
eval set $(git rev-parse --sq --prefix $wt_prefix -- $@)
(
@@ -187,6 +187,29 @@
Thomas Ferris Nicolaisen tfn...@gmail.com writes:
A draft of Git Rev News edition 6 is available here:
https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-6.md
Everyone is welcome to contribute in any section, either by editing the
above page on GitHub and sending a
Karthik Nayak karthik@gmail.com writes:
Introduce a strbuf `output` which will act as a substitute rather than
printing directly to stdout. This will be used for formatting
eventually.
---
Missing sign-off; the patch looks like a good first step in a nice
direction.
ref-filter.c | 36
Karthik Nayak karthik@gmail.com writes:
Introduce a ref_formatting_state which will eventually hold the values
of modifier atoms. Implement this within ref-filter.
Mentored-by: Christian Couder christian.cou...@gmail.com
Mentored-by: Matthieu Moy matthieu@grenoble-inp.fr
73 matches
Mail list logo
