On Mon, Jul 27, 2015 at 4:08 PM, David Turner wrote:
> refs: Introduce pseudoref and per-worktree ref concepts
>
> Add glossary entries for both concepts.
Based upon the above, I thought this was going to be a
documentation-only patch and was mildly surprised to find that it also
changed code. Pe
[+cc:Paul Tan]
On Sun, Jul 26, 2015 at 9:41 PM, Michael Haggerty wrote:
> On 07/23/2015 09:00 PM, Eric Sunshine wrote:
>> In addition to approxidate-style values ("2.months.ago", "yesterday"),
>> consumers of 'gc.*expire*' configuration variables a
very bottom.
Signed-off-by: Eric Sunshine
---
Changes since v1: reword commit message slightly
Documentation/git-tools.txt | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt
index 78a0d95..129b8c0 100644
--- a
Cogito hasn't been maintained since late 2006, so drop the reference
to it. The warning that SCMS front-ends might override listed
environment variables, however, may still be valuable, so keep it but
generalize the wording.
Suggested-by: Junio C Hamano
Signed-off-by: Eric Sunshine
--
In addition to approxidate-style values ("2.months.ago", "yesterday"),
consumers of 'gc.*expire*' configuration variables also accept and
respect 'now' ("do it immediately") and 'never' ("suppress entirely").
Suggested-by:
Cogito -- unmaintained since late 2006[1]
pg -- URL dead; web searches reveal no information
quilt2git -- URL dead; web searches reveal no information
(h)gct -- URL dead; no repository activity since 2007[2]
[1]: http://git.or.cz/cogito/
[2]: http://repo.or.cz/w/hgct.git
Signed-off-by: Eric
git/274537
[2]: http://article.gmane.org/gmane.comp.version-control.git/274647
[3]: http://article.gmane.org/gmane.comp.version-control.git/274602
[4]: http://article.gmane.org/gmane.comp.version-control.git/274541
[5]: 5f5f553 (Documentation/git-worktree: fix broken 'linkgit' invocation,
-ends and tools on the Git wiki rates perhaps a distant
second to search engines, and may still have value, so retain a
reference to it.
Signed-off-by: Eric Sunshine
---
New in v2. This is plopped at the end of the series, rather than being
incorporated into it more fully, so that it can be
Descriptive text for each tool item is incorrectly formatted using a
fixed width font. Fix formatting to use a variable width font by
unindenting the item text.
Signed-off-by: Eric Sunshine
---
No changes since v1.
Documentation/git-tools.txt | 134
On Sun, Jul 26, 2015 at 9:41 PM, Michael Haggerty wrote:
> On 07/23/2015 09:00 PM, Eric Sunshine wrote:
>> In addition to approxidate-style values ("2.months.ago", "yesterday"),
>> consumers of 'gc.*expire*' configuration variables also accept and
>
On Mon, Jul 27, 2015 at 3:27 AM, Karthik Nayak wrote:
> Add a new atom "padright" and support %(padright:X) where X is a
> number. This will align the succeeding atom value to the left
> followed by spaces for a total length of X characters. If X is less
> than the item size, the entire atom valu
On Mon, Jul 27, 2015 at 3:27 AM, Karthik Nayak wrote:
> From: Karthik Nayak
>
> Since 'ref-filter' only has an option to match path names add an
> option for plain fnmatch pattern-matching.
>
> This is to support the pattern matching options which are used in `git
> tag -l` and `git branch -l` wh
On Tue, Jul 28, 2015 at 5:23 PM, David Turner wrote:
> Prevent merges to the same notes branch from different worktrees.
> Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using the same
> code we use to check that two HEADs in different worktrees don't point
> to the same branch. Modify th
On Tue, Jul 28, 2015 at 2:12 PM, David Turner wrote:
> Add a function ref_type, which categorizes refs as per-worktree,
> pseudoref, or normal ref.
>
> Later, we will use this in refs.c to treat pseudorefs specially.
> Alternate ref backends may use it to treat both pseudorefs and
> per-worktree r
On Tue, Jul 28, 2015 at 2:12 PM, David Turner wrote:
> Pseudorefs should not be updated through the ref transaction
> API, because alternate ref backends still need to store pseudorefs
> in GIT_DIR (instead of wherever they store refs). Instead,
> change update_ref and delete_ref to call pseudore
Aside from whether or not this change is desirable, see a few pointers
below to improve the patch...
On Monday, July 27, 2015, Sina Siadat wrote:
> Adds a new option 'o' to the 'add -p' command that lets you open and edit the
> current file.
Imperative mood: "Add a new option..."
> The existing
On Tuesday, July 28, 2015, Karthik Nayak wrote:
> Introduce 'ref_formatting' structure to hold values of pseudo atoms
> which help only in formatting. This will eventually be used by atoms
> like `color` and the `padright` atom which will be introduced in a
> later patch.
Isn't this commit messag
On Tuesday, July 28, 2015, Karthik Nayak wrote:
> Changes in v6:
> * Change the flow of commits, introduce rest_formatting_state.
> * Rename
> ref_formatting -> apply_formatting_state
> apply_pseudo_state -> store_formatting_state
> * Remove the patch for making color a pseudo atom, and rename
> p
On Tuesday, July 28, 2015, Karthik Nayak wrote:
> Add a new atom "padright" and support %(padright:X) where X is a
> number. This will align the succeeding atom value to the left
> followed by spaces for a total length of X characters. If X is less
> than the item size, the entire atom value is p
On Tuesday, July 28, 2015, Karthik Nayak 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 comparing function for qsort.
>
> This option is included to support sorting by versions in `git tag
On Tuesday, July 28, 2015, Karthik Nayak wrote:
> The 'colornext' atom allows us to color only the succeeding atom with
> a particular color. This resets any previous color preferences set. It
> is not compatible with `padright`. This is required for printing
> formats like `git branch -vv` where
On Wed, Jul 29, 2015 at 11:51 AM, Patrick Steinhardt wrote:
> parse_connect_url() checks if the path component of the URL is
> empty and if so causes the program to die. As the function is to
> be used at other call sites which do not require this check, move
> up the error checking to the existin
On Wed, Jul 29, 2015 at 7:03 PM, Johan Sageryd wrote:
> Signed-off-by: Johan Sageryd
> ---
> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
> index 3387e2f..d9d90b5 100644
> --- a/Documentation/git-worktree.txt
> +++ b/Documentation/git-worktree.txt
> @@ -39,7 +39,7
On Thu, Jul 30, 2015 at 11:48 AM, Karthik Nayak wrote:
> Add a new atom "padright" and support %(padright:X) where X is a
> number. This will align the succeeding atom or string to the left
> followed by spaces for a total length of X characters. If X is less
> than the atom or string length then
On Wed, Jul 29, 2015 at 11:51 AM, Patrick Steinhardt wrote:
> Test behavior of `git clone` when working with an empty path
> component. This may be the case when cloning a file system's root
> directory or from a remote server's root.
>
> Signed-off-by: Patrick Steinhardt
> ---
> diff --git a/t/t
On Tue, Jul 28, 2015 at 3:59 PM, Jeff King wrote:
> If you hide a hierarchy of refs using the transfer.hideRefs
> config, there is no way to later override that config to
> "unhide" it. This patch implements a "negative" hide which
> causes matches to immediately be marked as unhidden, even if
> a
On Fri, Jul 31, 2015 at 3:01 PM, David Turner wrote:
> Add a new function, die_if_shared_symref, which works like
> die_if_checked_out, but for all references. Refactor
> die_if_checked_out to work in terms of die_if_shared_symref.
>
> Soon, we will use die_if_shared_symref to protect notes merge
On Fri, Jul 31, 2015 at 3:21 PM, Jacob Keller wrote:
> Teach git-notes about a new configuration option "notes.merge" for
> selecting the default notes merge strategy. Document the option in
> config.txt and git-notes.txt
>
> Add tests for the configuration option. Ensure that command line
> --str
On Fri, Jul 31, 2015 at 5:15 PM, David Turner wrote:
> On Fri, 2015-07-31 at 15:35 -0400, Eric Sunshine wrote:
>> On Fri, Jul 31, 2015 at 3:01 PM, David Turner
>> wrote:
>> > Add a new function, die_if_shared_symref, which works like
>> > die_if_checked_out,
On Fri, Jul 31, 2015 at 6:11 PM, David Turner wrote:
> Add a new function, find_shared_symref, which contains the heart of
> die_if_checked_out, but works for all symrefs. Refactor
Slightly more explanatory:
..., but works for any symref, not just HEAD. Refactor
More below.
> die_if_check
On Sat, Aug 1, 2015 at 2:48 AM, Karthik Nayak wrote:
> On Thu, Jul 30, 2015 at 2:57 AM, Matthieu Moy
> wrote:
> Good point! I just was wondering if we need another atom just to print a star.
> But your points certainly are valid. I'll implement this. Thanks :)
>
>>> This would remove the need of
On Fri, Jul 31, 2015 at 7:33 PM, Jan Viktorin wrote:
> When sending an e-mail, the client and server must
> agree on an authentication mechanism. Some servers
> (due to misconfiguration or a bug) denies valid
s/denies/deny/
> credentials for certain mechanisms. In this patch,
> a new option --sm
Ensure that command line
> --strategy option overrides the configured value. Ensure that -s can't
> be passed with --commit or --abort. Ensure that --abort and --commit
> can't be used together.
>
> Signed-off-by: Jacob Keller
> Cc: Johan Herland
> Cc: Michael Haggerty
On Sun, Aug 02, 2015 at 12:41:08AM -0700, Jacob Keller wrote:
> On Sat, Aug 1, 2015 at 7:46 PM, Eric Sunshine wrote:
> >> If conflicts arise and a strategy for automatically resolving
> >> -conflicting notes (see the -s/--strategy option) is not given,
> >> -the &
On Sat, Aug 1, 2015 at 2:19 PM, Jan Viktorin wrote:
> On Sat, 1 Aug 2015 05:33:28 -0400 Eric Sunshine
> wrote:
>> On Fri, Jul 31, 2015 at 7:33 PM, Jan Viktorin
>> wrote:
>> At the very least, you will also want to update the documentation
>> (Documentation/git-se
On Sun, Aug 2, 2015 at 12:42 PM, Jan Viktorin wrote:
> When sending an e-mail, the client and server must
> agree on an authentication mechanism. Some servers
> (due to misconfiguration or a bug) deny valid
> credentials for certain mechanisms. In this patch,
> a new option --smtp-auth and configu
On Mon, Aug 3, 2015 at 6:18 PM, Junio C Hamano 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 anything I need to
On Mon, Aug 3, 2015 at 1:53 PM, Stefan Beller wrote:
> `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 d
On Mon, Aug 3, 2015 at 2:48 PM, David Turner 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.
>
> Soon, we will use find
On Mon, Aug 3, 2015 at 5:00 PM, Ben Boeckel 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 Boeckel
> ---
>
On Mon, Aug 3, 2015 at 8:16 PM, Ben Boeckel 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 wrote:
>> > + argc = parse_options(argc, argv, NULL, options,
>> >
On Tue, Aug 4, 2015 at 8:27 AM, Patrick Steinhardt wrote:
> The documentation of git-worktree refers to the 'locked' file as
> 'lock'. Fix this to say 'locked' instead.
Thanks for the patch. This is already fixed in 'next' by 2e73ab6
(Documentation/git-worktree: fix incorrect reference to file "l
such as [2,3,4,5]), but
forgot about it. For what it's worth (though certainly not necessary
for such an obviously correct path):
Acked-by: Eric Sunshine
[1]: 93a3649 (Documentation: move linked worktree description from
checkout to worktree, 2015-07-06)
[2]: 6d3824c (Documentation/gi
On Tue, Aug 4, 2015 at 7:29 AM, Patrick Steinhardt wrote:
> Test behavior of `git clone` when working with an empty path
> component. This may be the case when cloning a file system's root
> directory or from a remote server's root.
A few minor, mostly style-related, comments below...
> Signed-o
On Tue, Aug 4, 2015 at 8:04 PM, Stefan Beller wrote:
> The goal of this series being rewriting `git submodule update`,
> we don't want to call out to the shell script for config lookups.
>
> So reimplement the lookup of the submodule name in C.
>
> Signed-off-by: Stefan Beller
> ---
> diff --git
On Wed, Aug 5, 2015 at 1:32 PM, Gaurav Chhabra wrote:
> I had written the following code to check whether a push is for branch
> deletion:
>
> #!/bin/bash
>
> NULL=""
> if [[ "$new_sha" -eq "$NULL" ]]; then # Line 17
> remote: Stdin: [
On Thu, Jul 23, 2015 at 4:49 PM, Eric Sunshine wrote:
> Complete subcommands 'add' and 'prune', as well as their respective
> options --force, --detach, --dry-run, --verbose, and --expire. Also
> complete 'refname' in "git worktree add [-b ]
&
On Thu, Aug 6, 2015 at 1:35 PM, Stefan Beller wrote:
> The copied argv array shall be an identical deep copy except for
> the internal allocation value.
>
> Signed-off-by: Stefan Beller
> ---
> diff --git a/argv-array.c b/argv-array.c
> index 256741d..6d9c1dd 100644
> --- a/argv-array.c
> +++ b/a
On Thu, Aug 6, 2015 at 2:27 PM, Stefan Beller wrote:
> builtin/mv: remove get_pathspec()
Misleading. Perhaps rephrase as:
mv: drop dependency upon deprecated get_pathspec
> `get_pathspec` is deprecated and builtin/mv.c is its last caller, so
> reimplement `get_pathspec` literally in builti
On Thu, Aug 6, 2015 at 2:58 PM, Stefan Beller wrote:
> On Thu, Aug 6, 2015 at 11:46 AM, Eric Sunshine
> wrote:
>> On Thu, Aug 6, 2015 at 2:27 PM, Stefan Beller wrote:
>>> `get_pathspec` is deprecated and builtin/mv.c is its last caller, so
>>> reimplement `get_
On Tue, Aug 4, 2015 at 10:08 AM, Paul Tan wrote:
> When resuming, git-am detects if we are trying to feed it patches or not
> by checking if stdin is a TTY.
>
> However, the test library redirects stdin to /dev/null. This makes it
> difficult, for instance, to test the behavior of "git am -3" when
On Tue, Aug 4, 2015 at 8:42 AM, Karthik Nayak wrote:
> Introduce a strbuf `output` which will act as a substitute rather than
> printing directly to stdout. This will be used for formatting
> eventually.
>
> Signed-off-by: Karthik Nayak
> ---
> diff --git a/ref-filter.c b/ref-filter.c
> index 469
On Sun, Aug 2, 2015 at 6:10 AM, Jacob Keller wrote:
> Teach git-notes about a new configuration option "notes.merge" for
> selecting the default notes merge strategy. Document the option in
> config.txt and git-notes.txt
>
> Add tests for use of the configuration option. Include a test to ensure
>
On Tue, Aug 4, 2015 at 8:42 AM, Karthik Nayak wrote:
> Introduce a ref_formatting_state which will eventually hold the values
> of modifier atoms. Implement this within ref-filter.
>
> Signed-off-by: Karthik Nayak
> ---
> +static void apply_formatting_state(struct ref_formatting_state *state,
>
On Wed, Aug 5, 2015 at 2:54 PM, Karthik Nayak wrote:
> Implement an `align` atom which will act as a modifier atom and align
> any string with or without an %(atom) appearing before a %(end) atom
> to the right, left or middle.
For someone not familiar with the evolution of this patch series,
"al
On Tue, Aug 4, 2015 at 8:42 AM, Karthik Nayak wrote:
> Introduce a ref_formatting_state which will eventually hold the values
> of modifier atoms. Implement this within ref-filter.
>
> Signed-off-by: Karthik Nayak
> ---
> diff --git a/ref-filter.c b/ref-filter.c
> index 91482c9..2c074a1 100644
>
On Wed, Aug 5, 2015 at 2:54 PM, Karthik Nayak wrote:
> Implement an `align` atom which will act as a modifier atom and align
> any string with or without an %(atom) appearing before a %(end) atom
> to the right, left or middle.
>
> It is followed by `:,`, where the `` is
> either left, right or mi
On Thu, Aug 6, 2015 at 11:53 PM, Karthik Nayak wrote:
> On Fri, Aug 7, 2015 at 5:49 AM, Eric Sunshine wrote:
>> On Tue, Aug 4, 2015 at 8:42 AM, Karthik Nayak wrote:
>>> +static void apply_formatting_state(struct ref_formatting_state *state,
>>> struct strbuf *final)
On Fri, Aug 7, 2015 at 7:37 AM, Karthik Nayak wrote:
> On Fri, Aug 7, 2015 at 10:13 AM, Eric Sunshine
> wrote:
>> On Thu, Aug 6, 2015 at 11:53 PM, Karthik Nayak wrote:
>>> On Fri, Aug 7, 2015 at 5:49 AM, Eric Sunshine
>>> wrote:
>>>> It feels stran
On Mon, Aug 3, 2015 at 7:06 PM, Eric Sunshine wrote:
> On Mon, Aug 3, 2015 at 2:48 PM, David Turner 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_checke
On Sat, Aug 8, 2015 at 2:35 AM, Karthik Nayak wrote:
> On Fri, Aug 7, 2015 at 8:57 AM, Eric Sunshine wrote:
>> On Wed, Aug 5, 2015 at 2:54 PM, Karthik Nayak wrote:
>>> of the padding to be performed. If the atom length is more than the
>>> padding length then no pa
Thanks for the patch. Comments below...
On Sat, Aug 8, 2015 at 8:19 PM, Michael Rappazzo wrote:
> worktree: list operation
Imperative mood:
worktree: add 'list' command
> 'git worktree list' will list the main worktree followed by any linked
> worktrees which were created using 'git worktr
On Sun, Aug 9, 2015 at 2:55 AM, Karthik Nayak wrote:
> On Sun, Aug 9, 2015 at 9:12 AM, Eric Sunshine wrote:
>> On Sat, Aug 8, 2015 at 2:35 AM, Karthik Nayak wrote:
>>> On Fri, Aug 7, 2015 at 8:57 AM, Eric Sunshine
>>> wrote:
>>>> On Wed, Aug 5, 2015
On Sun, Aug 9, 2015 at 4:09 AM, Karthik Nayak wrote:
> On Sun, Aug 9, 2015 at 1:34 PM, Eric Sunshine wrote:
>> On Sun, Aug 9, 2015 at 2:55 AM, Karthik Nayak wrote:
>>> On Sun, Aug 9, 2015 at 9:12 AM, Eric Sunshine
>>> wrote:
>>>> That r
On Sun, Aug 2, 2015 at 2:57 PM, Eric Sunshine wrote:
> On Sun, Aug 2, 2015 at 12:42 PM, Jan Viktorin wrote:
>> @@ -1136,6 +1141,10 @@ sub smtp_auth_maybe {
>> Authen::SASL->import(qw(Perl));
>> };
>>
>> + if($
On Sun, Aug 9, 2015 at 1:19 PM, Eric Sunshine wrote:
> On Sun, Aug 2, 2015 at 2:57 PM, Eric Sunshine wrote:
>> On Sun, Aug 2, 2015 at 12:42 PM, Jan Viktorin
>> wrote:
>>> @@ -1136,6 +1141,10 @@ sub smtp_auth_maybe {
>>>
On Wed, Aug 5, 2015 at 3:17 AM, Jan Viktorin wrote:
> Do I understand well that you are complaining about too
> narrow commmit message?
Yes, I'm a complainer. ;-) It's minor, though, not a big deal, and
certainly not worth a re-roll if that was the only issue. In fact,
other than the undesirable
On Mon, Aug 10, 2015 at 1:52 PM, David Turner wrote:
> worktrees: add find_shared_symref
s/worktrees/branch/ perhaps?
> 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 sam
On Mon, Aug 10, 2015 at 6:29 PM, Jacob Keller wrote:
> On Mon, Aug 10, 2015 at 2:54 AM, Gaurav Chhabra
> wrote:
>> Apologies for the delay in reply! I tried your suggestion and it
>> works. Thanks! :)
>>
>> I'm curious why integer comparison is throwing error. Shouldn't i be
>> comparing numbers
On Mon, Aug 10, 2015 at 6:42 PM, David Turner wrote:
> On Mon, 2015-08-10 at 18:30 -0400, Eric Sunshine wrote:
>> On Mon, Aug 10, 2015 at 1:52 PM, David Turner
>> wrote:
>> > worktrees: add find_shared_symref
>>
>> s/worktrees/branch/ perhaps?
>
> Do y
On Mon, Aug 10, 2015 at 6:06 AM, Jan Viktorin wrote:
> On Sun, 9 Aug 2015 14:13:33 -0400
> Eric Sunshine wrote:
>> One possibility which comes to mind is to create a fake
>> Authen::SASL::Perl which merely dumps its input mechanisms to a file,
>> and arrange for the Perl
On Tue, Aug 4, 2015 at 9:01 AM, Karthik Nayak wrote:
> Remove unnecessary variables from ref_list and ref_item which were
> used for width computation. This is to make ref_item similar to
> ref-filter's ref_array_item. This will ensure a smooth port of
> branch.c to use ref-filter APIs in further
On Tue, Aug 4, 2015 at 9:01 AM, Karthik Nayak wrote:
> This is a preperatory patch for 'roll show_detached HEAD into regular
> ref_list'. This patch moves get_head_descrition() to the top so that
s/descrition/description/
> it can be used in print_ref_item().
>
> Signed-off-by: Karthik Nayak
--
On Tue, Aug 4, 2015 at 9:01 AM, Karthik Nayak wrote:
> Remove show_detached() and make detached HEAD to be rolled into
> regular ref_list by adding REF_DETACHED_HEAD as a kind of branch and
> supporting the same in append_ref(). This eliminates the need for an
> extra function and helps in easier
On Tue, Aug 11, 2015 at 4:51 PM, Johannes Sixt wrote:
> Invoking plink requires special treatment, and we have support and even
> test cases for the commands 'plink' and 'tortoiseplink'. We also support
> .exe variants for these two and there is a test for 'plink.exe'.
>
> On Windows, however, whe
On Tue, Aug 11, 2015 at 6:56 PM, Junio C Hamano wrote:
> Eric Sunshine writes:
>
>> On Tue, Aug 11, 2015 at 4:51 PM, Johannes Sixt wrote:
>>> Invoking plink requires special treatment, and we have support and even
>>> test cases for the commands 'plink&#x
On Wed, Aug 12, 2015 at 01:39:44AM +0200, Jan Viktorin wrote:
> When sending an e-mail, the client and server must agree on an
> authentication mechanism. Some servers (due to misconfiguration
> or a bug) deny valid credentials for certain mechanisms. In this
> patch, a new option --smtp-auth and c
On Tue, Aug 11, 2015 at 4:57 PM, Jacob Keller wrote:
> Add new option "notes..merge" 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
On Wed, Aug 12, 2015 at 04:24:51PM +0200, Elia Pinto wrote:
> Teach git about a new option, "http.sslVersion", which permits one to
> specify the SSL version to use when negotiating SSL connections. The
> setting can be overridden by the GIT_SSL_VERSION environment
> variable.
>
> Signed-off-by:
On Wed, Aug 12, 2015 at 3:13 PM, Stefan Beller wrote:
> In the first hunk, `submodule` is NULL all the time, so we can make it clearer
> by directly returning NULL.
>
> In the second hunk, we can directly return the lookup values as it also makes
> the coder clearer.
>
> Signed-off-by: Stefan Bell
On Wed, Aug 12, 2015 at 5:34 PM, Stefan Beller wrote:
> On Wed, Aug 12, 2015 at 2:13 PM, Eric Sunshine
> wrote:
>> On Wed, Aug 12, 2015 at 3:13 PM, Stefan Beller wrote:
>>> if (!gitmodule_sha1_from_commit(commit_sha1, sha1))
>>> -
On Thu, Aug 13, 2015 at 11:28 AM, Elia Pinto wrote:
> Teach git about a new option, "http.sslVersion", which permits one to
> specify the SSL version to use when negotiating SSL connections. The
> setting can be overridden by the GIT_SSL_VERSION environment
> variable.
>
> Signed-off-by: Elia Pi
On Thu, Aug 13, 2015 at 11:58 AM, Elia Pinto wrote:
> 2015-08-13 17:47 GMT+02:00 Eric Sunshine :
>> On Thu, Aug 13, 2015 at 11:28 AM, Elia Pinto wrote:
>>> Teach git about a new option, "http.sslVersion", which permits one to
>>> specify the SSL version to
On Thu, Aug 13, 2015 at 12:15 PM, Elia Pinto wrote:
> 2015-08-13 18:11 GMT+02:00 Eric Sunshine :
>> On Thu, Aug 13, 2015 at 11:58 AM, Elia Pinto wrote:
>>> 2015-08-13 17:47 GMT+02:00 Eric Sunshine :
>>>>> + if (ssl_version != NULL && *s
On Thu, Aug 13, 2015 at 12:37 PM, Eric Sunshine wrote:
> So, your loop can either look like this, if you use the NULL sentinel:
>
> struct ssl_map *p = sslversions;
> while (p->name) {
> if (!strcmp(ssl_version, p->name))
> ...
> }
T
On Wed, Aug 12, 2015 at 5:57 PM, David Turner wrote:
> diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
> index 93605f4..28e6dff 100755
> --- a/t/t0060-path-utils.sh
> +++ b/t/t0060-path-utils.sh
> +test_expect_success 'handle per-worktree refs in refs/worktree' '
> + git commit --
On Sun, Aug 9, 2015 at 10:11 AM, Karthik Nayak wrote:
> Implement an `align` atom which left-, middle-, or right-aligns the
> content between %(align:..) and %(end).
>
> Signed-off-by: Karthik Nayak
> ---
> diff --git a/Documentation/git-for-each-ref.txt
> b/Documentation/git-for-each-ref.txt
>
On Thu, Aug 13, 2015 at 2:02 PM, Doug Kelly wrote:
> From: Junio C Hamano
>
> The hook to report "garbage" files in $GIT_OBJECT_DIRECTORY/pack/
> could be generic but is too specific to count-object's needs.
>
> Move the part to produce human-readable messages to count-objects,
> and refine the i
On Sun, Aug 9, 2015 at 10:11 AM, Karthik Nayak 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
> string length then no alignment is performed.
In addition to Junio's valuable comments...
> Signed
On Fri, Aug 14, 2015 at 12:35 PM, Elia Pinto wrote:
> Teach git about a new option, "http.sslVersion", which permits one to
> specify the SSL version to use when negotiating SSL connections. The
> setting can be overridden by the GIT_SSL_VERSION environment
> variable.
>
> Signed-off-by: Elia Pi
On Fri, Aug 14, 2015 at 1:50 PM, Jacob Keller wrote:
> 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-
On Fri, Aug 14, 2015 at 3:18 PM, Sven Strickroth wrote:
> Without this patch there might be open handle leaks.
Thanks for the patch. A question below...
> Signed-off-by: Sup Yut Sum
> Signed-off-by: Sven Strickroth
> ---
> diff --git a/config.c b/config.c
> index 9fd275f..89b49e3 100644
> ---
On Fri, Aug 14, 2015 at 3:44 PM, Sven Strickroth wrote:
> Without this patch there might be open file handle leaks.
Thanks, this looks better. One comment below...
> Signed-off-by: Sven Strickroth
> Signed-off-by: Sup Yut Sum
> ---
> diff --git a/config.c b/config.c
> index 9fd275f..c06dc2f 10
On Fri, Aug 14, 2015 at 3:37 PM, Elia Pinto wrote:
> Teach git about a new option, "http.sslVersion", which permits one to
> specify the SSL version to use when negotiating SSL connections. The
> setting can be overridden by the GIT_SSL_VERSION environment
> variable.
>
> Signed-off-by: Elia Pin
On Fri, Aug 14, 2015 at 4:03 PM, Sven Strickroth wrote:
> Without this patch there might be open file handle leaks.
>
> Signed-off-by: Sven Strickroth
> Signed-off-by: Sup Yut Sum
> ---
> diff --git a/config.c b/config.c
> index 9fd275f..8138d5d 100644
> --- a/config.c
> +++ b/config.c
> @@ -206
On Fri, Aug 14, 2015 at 4:21 PM, Sven Strickroth wrote:
> Without this patch there might be open file handle leaks.
>
> Signed-off-by: Sven Strickroth
> Signed-off-by: Sup Yut Sum
Better. Thanks.
Reviewed-by: Eric Sunshine
> ---
> diff --git a/config.c b/config.c
> i
On Fri, Aug 14, 2015 at 3:59 PM, Junio C Hamano wrote:
> Renato Botelho writes:
>> I also found that some commands require perl when NO_PERL is set:
>
> NO_PERL merely means "I want to build a subset of Git that is meant
> to be usable on a system without a working Perl installed". These
> scrip
On Fri, Aug 14, 2015 at 4:48 PM, Jacob Keller wrote:
> From: Jacob Keller
>
> 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
On Fri, Aug 14, 2015 at 5:02 PM, Junio C Hamano wrote:
> Eric Sunshine writes:
>> Nevertheless, there's still the problem, due to 527ec39
>> (generate-cmdlist: parse common group commands, 2015-05-21), that git
>> doesn't build at all anymore when Perl is unavaila
On Fri, Aug 14, 2015 at 6:01 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>> diff --git a/builtin/notes.c b/builtin/notes.c
>> index 12a42b583f98..bdfd9c7d29b4 100644
>> --- a/builtin/notes.c
>> +++ b/builtin/notes.c
>> + strbuf_addf(&merge_key, "notes.%s.mergestrategy", short_ref
1 - 100 of 3976 matches
Mail list logo
