On Mon, Aug 17, 2015 at 12:14 PM, Karthik Nayak karthik@gmail.com wrote:
On Tue, Aug 18, 2015 at 12:34 AM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
From: Karthik Nayak karthik@gmail.com
Implement the '--format' option provided by
You may want to see this recent thread about a similar feature:
http://thread.gmane.org/gmane.comp.version-control.git/275607
--
Ed Avis e...@waniasset.com
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info
Hi Paul,
On 2015-08-17 11:48, Paul Tan wrote:
It's true that we need to merge the ORIG_HEAD tree into the index
instead of overwriting it. Patch below.
Thanks for your impressive, very responsive work!
Dscho
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a
On Mon, Aug 17, 2015 at 10:01:29AM +0200, Johannes Schindelin wrote:
Hi Linus,
On 2015-08-17 01:33, Linus Torvalds wrote:
On Sun, Aug 16, 2015 at 12:46 PM, Linus Torvalds
torva...@linux-foundation.org wrote:
Maybe it has always done this, and I just haven't noticed (I usually
_just_
On Mon, Aug 17, 2015 at 3:38 PM, Junio C Hamano gits...@pobox.com wrote:
Jacob Keller jacob.e.kel...@intel.com writes:
From: Jacob Keller jacob.kel...@gmail.com
Combining rewrite and notes-merge functionality has been left as an
exercise for a future contributor.
This comment is probably
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 have graduated to 'master'.
You can find the changes described here in the integration branches
of the repositories
A last minute change in the last patch broke t7400-submodule-basic.sh, test 82
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Jacob Keller jacob.e.kel...@intel.com writes:
From: Jacob Keller jacob.kel...@gmail.com
Combining rewrite and notes-merge functionality has been left as an
exercise for a future contributor.
This comment is probably unnecessary; we haven't even established if
such a combination is desirable
On Mon, Aug 17, 2015 at 5:22 PM, Stefan Beller sbel...@google.com wrote:
`module_clone` is part of the update command, which I want to convert
to C next.
Signed-off-by: Stefan Beller sbel...@google.com
---
builtin/submodule--helper.c | 161
+++-
Stefan Beller sbel...@google.com writes:
* sb/remove-get-pathspec (2015-08-03) 1 commit
- builtin/mv: remove get_pathspec()
Expecting a reroll.
($gmane/275224)
IIRC the discussion turned out to expect a
full conversion of internal_copy_pathspec in builtin/mv
and not just moving all
I just said v8 needs reroll in the latest What's cooking; after a
quick read, this round looks very reasonable, as you said in your
cover letter. Will replace what has been queued.
Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
On Mon, Aug 17, 2015 at 3:34 PM, Junio C Hamano gits...@pobox.com wrote:
* hv/submodule-config (2015-06-15) 4 commits
- do not die on error of parsing fetchrecursesubmodules option
- use new config API for worktree configurations of submodules
- extract functions for submodule config set
On Tue, Aug 4, 2015 at 3:05 PM, Max Kirillov m...@max630.net wrote:
Functions which directly operate submodule's object database do not handle the
case when the submodule is linked worktree (which are introduced in
c7b3a3d2fe). Instead of fixing the path calculation use already existing
On Tue, Aug 4, 2015 at 3:05 PM, Max Kirillov m...@max630.net wrote:
When submodule is a linked worktree, git diff --submodule and other
calls which directly access the submodule's object database do not correctly
calculate its path. Fix it by changing the git_path_submodule() behavior,
to use
This series is a reroll consisting of hv/submodule-config and
sb/submodule-helper and it applies on top of origin/jk/git-path.
Our long term goal is to make submodule handling more scalable
by parallelizing the submodule code. To write good parallelizable
code I'd first want to port it to C, as
From: Heiko Voigt hvo...@hvoigt.net
We remove the extracted functions and directly parse into and read out
of the cache. This allows us to have one unified way of accessing
submodule configuration values specific to single submodules. Regardless
whether we need to access a configuration from
From: Heiko Voigt hvo...@hvoigt.net
This is one step towards using the new configuration API. We just
extract these functions to make replacing the actual code easier.
Signed-off-by: Heiko Voigt hvo...@hvoigt.net
Signed-off-by: Stefan Beller sbel...@google.com
---
submodule.c | 142
From: Heiko Voigt hvo...@hvoigt.net
In a superproject some commands need to interact with submodules. They
need to query values from the .gitmodules file either from the worktree
of from certain revisions. At the moment this is quite hard since a
caller would need to read the .gitmodules file
`module_clone` is part of the update command, which I want to convert
to C next.
Signed-off-by: Stefan Beller sbel...@google.com
---
builtin/submodule--helper.c | 161 +++-
git-submodule.sh| 78 +
2 files changed, 162
From: Heiko Voigt hvo...@hvoigt.net
We should not die when reading the submodule config cache since the user
might not be able to get out of that situation when the configuration is
part of the history.
We should handle this condition later when the value is about to be
used.
Signed-off-by:
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
This implements the helper `module_name` in C instead of shell,
yielding a nice performance boost.
Before this patch, I measured a time (best out of three):
$ time ./t7400-submodule-basic.sh /dev/null
real0m11.066s
user0m3.348s
sys 0m8.534s
With this patch applied
On Mon, Aug 17, 2015 at 7:37 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak karthik@gmail.com wrote:
Implement an `align` atom which left-, middle-, or right-aligns the
content between %(align:..) and %(end).
It is followed by
On Mon, Aug 17, 2015 at 5:18 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak karthik@gmail.com wrote:
Add strbuf_utf8_align() which will align a given string into a strbuf
as per given align_type and width. If the width is greater than the
On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller jacob.e.kel...@intel.com wrote:
From: Jacob Keller jacob.kel...@gmail.com
notes-merge.c already re-uses the same functions for the automatic merge
strategies used by the rewrite functionality. Teach the -s/--strategy
option how to interpret the
Allow me to suggest a different wording, somewhat inspired by the
branch.name.* documentation...
On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller jacob.e.kel...@intel.com wrote:
From: Jacob Keller jacob.kel...@gmail.com
Add new option notes.ref.mergeStrategy option which specifies the merge
On Mon, Aug 17, 2015 at 10:12 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak karthik@gmail.com wrote:
Add a function called 'for_each_reftype_fullpath()' to refs.{c,h}
which iterates through each ref for the given path without trimming
the
On Mon, Aug 17, 2015 at 5:01 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak karthik@gmail.com wrote:
Introduce ref_formatting_state which will hold the formatted
output strbuf and is used for nesting of modifier atoms.
Signed-off-by:
Michael Haggerty mhag...@alum.mit.edu writes:
If I understand correctly, you consider the decision of where a
particular reference should be stored to be a kind of business logic
decision that should live outside of the refs module. I don't think it
is so important whether this knowledge is
Dave Borowitz dborow...@google.com writes:
Ok, so let us bikeshed a bit further.
Bikeshed 1.
Option A: --signed/--no-signed--signed-if-possible
Option B: --signed=true|false|if-possible, --signed alone implies =true.
Bikeshed 2.
Option A: if-possible
The possibly confusing thing is one
On Fri, Aug 14, 2015 at 7:10 PM, Junio C Hamano gits...@pobox.com wrote:
Dave Borowitz dborow...@google.com writes:
Like --atomic, --signed will fail if the server does not advertise the
necessary capability. In addition, it requires gpg on the client side.
Signed-off-by: Dave Borowitz
Eric Sunshine sunsh...@sunshineco.com writes:
-static void real_report_garbage(const char *desc, const char *path)
+const char *bits_to_msg(unsigned seen_bits)
If you don't expect other callers outside this file, then this should
be declared 'static'. If you do expect future external
Dave Borowitz dborow...@google.com writes:
---
Does the lack of sign-off indicate something (like this is just a
'what do people think?' weatherbaloon not yet a serious submission)?
+push.gpgSign::
+ May be set to a boolean value, or the string 'if-possible'. A
+ true value causes
Jacob Keller jacob.kel...@gmail.com writes:
Sorry, but I lost track.
Do I understand correctly the consensus on the previous discussion?
My understanding is:
(1) We do not currently refuse to merge notes into anywhere outside
of refs/notes/;
We do. I mis understood the original
Jacob Keller jacob.kel...@gmail.com writes:
How do you feel about having the duplicate check for the short_ref? We
*already* check this inside init_notes_check() which is called right
after this.
I thought you were trying to enforce a new rule (i.e. must be under
refs/notes/) with this, but
Duy Nguyen pclo...@gmail.com writes:
On Wed, Aug 5, 2015 at 7:47 PM, Ivan Chernyavsky campo...@yandex.ru wrote:
Dear community,
For some time I'm wondering why there's no --grep option to the
git branch command, which would request to print only branches
having specified string/regexp in
On Mon, Aug 17, 2015 at 10:23 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak karthik@gmail.com wrote:
Add support to sort by version using the v:refname and
version:refname option. This is achieved by using the 'versioncmp()'
function as the
On Mon, Aug 17, 2015 at 2:48 AM, Paul Tan pyoka...@gmail.com wrote:
It's true that we need to merge the ORIG_HEAD tree into the index
instead of overwriting it. Patch below.
Seems to work for me. Thanks,
Linus
--
To unsubscribe from this list: send the line unsubscribe
Doug Kelly dougk@gmail.com writes:
Add a custom report_garbage handler to collect and remove garbage
.idx files from the pack directory.
You need to explain why here. Why do we want to remove them? And
the definition of what is garbage depends on that exact reason why
we want to remove
Hi,
On Mon, Aug 17, 2015 at 5:54 AM, Johan Herland jo...@herland.net wrote:
On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller jacob.e.kel...@intel.com
wrote:
From: Jacob Keller jacob.kel...@gmail.com
notes-merge.c already re-uses the same functions for the automatic merge
strategies used by
Dave Borowitz dborow...@google.com writes:
On Mon, Aug 17, 2015 at 1:21 PM, Junio C Hamano gits...@pobox.com wrote:
My preference on Bikeshed 1. would probably be to add
--sign=yes/no/if-asked
and to keep --[no-]signed for no and yes for existing users.
Incidentally, I just looked up
Karthik Nayak karthik@gmail.com writes:
We improve the sorting option provided by 'tag.c' by using the sorting
options provided by 'ref-filter'. This causes the test 'invalid sort
parameter on command line' in t7004 to fail, as 'ref-filter' throws an
error for all sorting fields which are
On Mon, Aug 17, 2015 at 1:13 PM, Junio C Hamano gits...@pobox.com wrote:
Dave Borowitz dborow...@google.com writes:
---
Does the lack of sign-off indicate something (like this is just a
'what do people think?' weatherbaloon not yet a serious submission)?
+push.gpgSign::
+ May be set
Hi,
On Mon, Aug 17, 2015 at 6:21 AM, Johan Herland jo...@herland.net wrote:
Allow me to suggest a different wording, somewhat inspired by the
branch.name.* documentation...
On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller jacob.e.kel...@intel.com
wrote:
From: Jacob Keller
On Mon, Aug 17, 2015 at 1:21 PM, Junio C Hamano gits...@pobox.com wrote:
Dave Borowitz dborow...@google.com writes:
Ok, so let us bikeshed a bit further.
Bikeshed 1.
Option A: --signed/--no-signed--signed-if-possible
Option B: --signed=true|false|if-possible, --signed alone implies =true.
On Mon, Aug 17, 2015 at 2:47 PM, Junio C Hamano gits...@pobox.com wrote:
Dave Borowitz dborow...@google.com writes:
On Mon, Aug 17, 2015 at 1:21 PM, Junio C Hamano gits...@pobox.com wrote:
My preference on Bikeshed 1. would probably be to add
--sign=yes/no/if-asked
and to keep
Karthik Nayak karthik@gmail.com writes:
On Mon, Aug 17, 2015 at 7:37 AM, Eric Sunshine sunsh...@sunshineco.com
wrote:
...
Second, I realize that Junio suggested the 'return_to' idea, but it
seems like it could become overly painful since each handler of this
sort is going to have to
Karthik Nayak karthik@gmail.com writes:
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.
On Fri, Aug 14, 2015 at 03:35:58PM -0700, Junio C Hamano wrote:
Max Kirillov m...@max630.net writes:
* do not limit number of warnings - does not worth complicating the code
Unless the warning leads to a quick die(), wouldn't this make Git
unusable by spewing a falling back to verbatim
On Mon, Aug 17, 2015 at 11:52 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Mon, Aug 17, 2015 at 10:28 AM, Karthik Nayak karthik@gmail.com wrote:
On Mon, Aug 17, 2015 at 7:37 AM, Eric Sunshine sunsh...@sunshineco.com
wrote:
On Sat, Aug 15, 2015 at 2:00 PM, Karthik Nayak
Hi Linus,
On 2015-08-17 01:33, Linus Torvalds wrote:
On Sun, Aug 16, 2015 at 12:46 PM, Linus Torvalds
torva...@linux-foundation.org wrote:
Maybe it has always done this, and I just haven't noticed (I usually
_just_ do the git reset --hard thing, don't ask me why I wanted to
be doubly sure
Paul Tan pyoka...@gmail.com writes:
The codepath in the original looks like this:
head_tree=$(git rev-parse --verify -q HEAD || echo $empty_tree)
== git read-tree --reset -u $head_tree $head_tree
index_tree=$(git write-tree)
orig_head=$(git rev-parse --verify -q
Johan Herland jo...@herland.net writes:
On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller jacob.e.kel...@intel.com
wrote:
From: Jacob Keller jacob.kel...@gmail.com
notes-merge.c already re-uses the same functions for the automatic merge
strategies used by the rewrite functionality. Teach the
Dave Borowitz dborow...@google.com writes:
Is there a common utility function that does what we want? Basically
git_config_maybe_bool but not specifically about configs.
Interesting. git_config_maybe_bool() and its friends take the usual
(name, value) and pretend to be part of the config
Dave Borowitz dborow...@google.com writes:
The issue is that if both _ALWAYS and _IF_POSSIBLE are set,
git_transport_push interprets it as _ALWAYS. But, we are also supposed
to prefer explicit command-line options to config values.
Suppose we parsed config first, then options. If the user
Junio C Hamano gits...@pobox.com writes:
Dave Borowitz dborow...@google.com writes:
The issue is that if both _ALWAYS and _IF_POSSIBLE are set,
git_transport_push interprets it as _ALWAYS. But, we are also supposed
to prefer explicit command-line options to config values.
Suppose we parsed
On Mon, Aug 17, 2015 at 3:54 PM, Junio C Hamano gits...@pobox.com wrote:
In the shorter term, at least we should be able to introduce
git_parse_maybe_bool() that does not take name, use that as a
helper to implement git_config_maybe_bool(), so that the existing
callers of
On Tue, Aug 18, 2015 at 12:30 AM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
We improve the sorting option provided by 'tag.c' by using the sorting
options provided by 'ref-filter'. This causes the test 'invalid sort
parameter on command line' in t7004
On Tue, Aug 18, 2015 at 12:34 AM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
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
Jeff King p...@peff.net writes:
On Fri, Aug 14, 2015 at 03:35:58PM -0700, Junio C Hamano wrote:
Max Kirillov m...@max630.net writes:
* do not limit number of warnings - does not worth complicating the code
Unless the warning leads to a quick die(), wouldn't this make Git
unusable by
On Mon, Aug 17, 2015 at 3:42 PM, Junio C Hamano gits...@pobox.com wrote:
Dave Borowitz dborow...@google.com writes:
The issue is that if both _ALWAYS and _IF_POSSIBLE are set,
git_transport_push interprets it as _ALWAYS. But, we are also supposed
to prefer explicit command-line options to
From: Jacob Keller jacob.kel...@gmail.com
Teach documentation about the cat_sort_uniq rewriteMode that got added
at the same time as the equivalent merge strategy.
Signed-off-by: Jacob Keller jacob.kel...@gmail.com
---
Documentation/config.txt| 4 ++--
Documentation/git-notes.txt | 5 +++--
From: Jacob Keller jacob.kel...@gmail.com
This series implements mergeStrategy configuration options which take
the same value as --strategy. This series does not change the allowed
refs to merge from or to. There is a known limitation that you cannot
merge from refs outside of refs/notes
From: Jacob Keller jacob.kel...@gmail.com
Teach git-notes about notes.mergeStrategy to select a general strategy
for all notes merges. This enables a user to always get expected merge
strategy such as cat_sort_uniq without having to pass the -s option
manually.
Signed-off-by: Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com
Teach notes about a new notes.name.mergeStrategy option for
configuring the notes merge strategy when merging into
refs/notes/name. This option allows for the selection of merge
strategy for particular notes refs, rather than all notes ref merges, as
user
From: Jacob Keller jacob.kel...@gmail.com
Combining rewrite and notes-merge functionality has been left as an
exercise for a future contributor.
Signed-off-by: Jacob Keller jacob.kel...@gmail.com
---
builtin/notes.c | 12 +---
notes-utils.c | 18 ++
notes-utils.h |
From: Jacob Keller jacob.kel...@gmail.com
A future patch will extract parsing of the --strategy string into a
helper function in notes.c and will require the enumeration definition.
Signed-off-by: Jacob Keller jacob.kel...@gmail.com
---
notes-merge.h | 10 +++---
notes-utils.h | 8
From: Jacob Keller jacob.kel...@gmail.com
Add new tests to ensure that --commit, --abort, and --strategy are
mutually exclusive.
Signed-off-by: Jacob Keller jacob.kel...@gmail.com
---
t/t3310-notes-merge-manual-resolve.sh | 12
1 file changed, 12 insertions(+)
diff --git
15.08.2015, 12:19, Duy Nguyen pclo...@gmail.com:
Probably because nobody is interested and steps up to do it. The lack
of response to you mail is a sign. Maybe you can try make a patch? I
imagine it would not be so different from current --contains code, but
this time we need to look into
http://git-scm.com/docs/git-clone speaks only about working tree, the
usage of working directory for working tree is confusing. Working tree
describes the current directory.
Signed-off-by: Lars Vogel lars.vo...@vogella.com
---
Documentation/git-read-tree.txt | 8
1 file changed, 4
Dave Borowitz dborow...@google.com writes:
Slight digression for a question that came up during reworking the
series: would it be reasonable to rewrite option parsing in
builtin/send-pack.c to use the options API?
Surely. The part of the system whose option parsing predates
parse-options may
http://git-scm.com/docs/git-clone speaks only about working tree, the
usage of working directory for working tree is confusing. Working
directory describes the current directory while working tree describes
all files and sub directories.
Signed-off-by: Lars Vogel lars.vo...@vogella.com
---
Doug Kelly dougk@gmail.com writes:
+static struct string_list pack_garbage = STRING_LIST_INIT_DUP;
+
static char *pidfile;
+static void clean_pack_garbage(void)
+{
+ int i;
+ for (i = 0; i pack_garbage.nr; i++)
+ unlink_or_warn(pack_garbage.items[i].string);
From: Jacob Keller jacob.kel...@gmail.com
A future patch will extract parsing of the --strategy string into a
helper function in notes.c and will require the enumeration definition.
Signed-off-by: Jacob Keller jacob.kel...@gmail.com
---
notes-merge.h | 10 +++---
notes-utils.h | 8
From: Jacob Keller jacob.kel...@gmail.com
notes-merge.c already re-uses the same functions for the automatic merge
strategies used by the rewrite functionality. Teach the -s/--strategy
option how to interpret the equivalent rewrite terminology for
consistency.
Add tests for the new synonyms.
From: Jacob Keller jacob.kel...@gmail.com
Teach git-notes about notes.mergeStrategy to select a general strategy
for all notes merges. This enables a user to always get expected merge
strategy such as cat_sort_uniq without having to pass the -s option
manually.
Signed-off-by: Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com
Add new option notes.ref.mergeStrategy option which specifies the merge
strategy for merging into a given notes ref. This option enables
selection of merge strategy for particular notes refs, rather than all
notes ref merges, as user may not want
From: Jacob Keller jacob.kel...@gmail.com
Add new tests to ensure that --commit, --abort, and --strategy are
mutually exclusive.
Signed-off-by: Jacob Keller jacob.kel...@gmail.com
---
t/t3310-notes-merge-manual-resolve.sh | 12
1 file changed, 12 insertions(+)
diff --git
From: Jacob Keller jacob.kel...@gmail.com
Allow future code to re-use the parsing functionality.
Signed-off-by: Jacob Keller jacob.kel...@gmail.com
---
builtin/notes.c | 12 +---
notes-utils.c | 18 ++
notes-utils.h | 1 +
3 files changed, 20 insertions(+), 11
From: Jacob Keller jacob.kel...@gmail.com
- Changes since v7 -
* add patches to make rewrite and merge take same options
* camel case mergeStrategy
* move init_notes_check above reading git-config in merge()
This is necessary as it ensures refs are inside refs/notes/*
It should be noted that
From: Jacob Keller jacob.kel...@gmail.com
Teach the rewrite combine notes to use the same names as git-notes
merge. This will support all current names plus a few new synonyms.
Update documentation to point to NOTES MERGE STRATEGIES to explain the
various rewrite options available.
Implementing
From: Jacob Keller jacob.kel...@gmail.com
Teach documentation about the cat_sort_uniq rewriteMode that got added
at the same time as the equivalent merge strategy.
Signed-off-by: Jacob Keller jacob.kel...@gmail.com
---
Documentation/config.txt| 4 ++--
Documentation/git-notes.txt | 5 +++--
82 matches
Mail list logo
