add_worktree() will eventually need to deal with some options itself, so
introduce a structure into which options can be conveniently bundled,
and pass it along to add_worktree().
Signed-off-by: Eric Sunshine
---
builtin/worktree.c | 45 +++--
1 file chang
On Fri, Jul 10, 2015 at 11:31 PM, norricorp wrote:
>
> This is the output I got from using V=1 with make
> gcc -g -O2 -I. -D_LARGE_FILES -DNO_D_TYPE_IN_DIRENT -DNO_NSEC -DOLD_ICONV
> -pthread -DHAVE_PATHS_H -DHAVE_
> LIBCHARSET_H -DHAVE_STRINGS_H -DSHA1_HEADER=''
> -DFREAD_READS_DIRECTORIES -DNO_
Make 'new_branch' be the name of the new branch for both forced and
non-forced cases; and add boolean 'force_new_branch' to indicate forced
branch creation. This will simplify logic later on when git-worktree
handles branch creation locally rather than delegating it to
git-checkout as part of the w
The eventual goal is for git-worktree to populate the new worktree via
"git reset --hard" rather than "git checkout". As a consequence,
git-worktree will no longer be able to delegate to git-branch the
setting of the new worktree's HEAD to the desired branch (or commit, if
detached). Therefore, mak
How does "You did not provide a valid range of commits.
At least one tip in your range must be a ref." sound?
--
Chris
http://christopherjones.us/
On Sun, Jul 5, 2015, at 10:41 AM, Johannes Schindelin wrote:
> Hi,
>
> On 2015-07-05 15:07, Jeff King wrote:
> > On Sat, Jul 04, 2015 at 07:39:04P
This is the output I got from using V=1 with make
gcc -g -O2 -I. -D_LARGE_FILES -DNO_D_TYPE_IN_DIRENT -DNO_NSEC -DOLD_ICONV
-pthread -DHAVE_PATHS_H -DHAVE_
LIBCHARSET_H -DHAVE_STRINGS_H -DSHA1_HEADER=''
-DFREAD_READS_DIRECTORIES -DNO_STRCASESTR -
DNO_STRLCPY -Icompat/fnmatch -DNO_FNMATCH_CASEFO
On Fri, Jul 10, 2015 at 10:13 PM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> Since 'ref-filter' only has an option to match path names
>> add an option for regular pattern matching.
>
> There is nothing "regular" about the pattern matching you are
> adding.
>
> Everywhere else we use patt
Am 10.07.2015 um 22:07 schrieb Junio C Hamano:
"Simon A. Eugster" writes:
From: "Simon A. Eugster"
Signed-off-by: Simon A. Eugster
---
For those who are looking from the sideline, this is a reroll from a
month-old thread $gmane/271680.
Documentation/git-checkout.txt | 16 +
On Fri, Jul 10, 2015 at 5:48 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> On Fri, Jul 10, 2015 at 4:22 PM, Karthik Nayak wrote:
>>> On Thu, Jul 9, 2015 at 6:59 PM, Matthieu Moy
>>> wrote:
Karthik Nayak writes:
> Add support to sort by version using the "v:refname" and
>>>
As we known, HTTP/2.0 has been released. All Git-Smart-HTTP are currently
implemented using HTTP/1.1.
Frequently used Git developers often feel Git HTTP protocol is not
satisfactory, slow and unstable.This is because the HTTP protocol itself
decides
When HTTP/2.0 is published. We might be able to
On Thu, Jul 9, 2015 at 6:28 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> Add support for %(refname:shortalign=X) where X is a number.
>> This will print a shortened refname aligned to the left
>> followed by spaces for a total length of X characters.
>> If X is less than the shortened ref
On Fri, Jul 10, 2015 at 6:45 PM, Junio C Hamano wrote:
> * es/worktree-add (2015-07-07) 23 commits
> (merged to 'next' on 2015-07-10 at 304e329)
> + checkout: retire --ignore-other-worktrees in favor of --force
> + worktree: add: auto-vivify new branch when is omitted
> + worktree: add: make
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
For updated schedule for 2.5 final please see tinyurl.com/gitCal
Also note that when I say "Will merge to 'master'", I am not saying
if that hap
Jeff King writes:
> On Fri, Jul 10, 2015 at 01:23:07PM -0700, Junio C Hamano wrote:
>
>> > - if (!strcmp(var, "include.path"))
>> > - ret = handle_path_include(value, inc);
>> > + if (!parse_config_key(var, "include", &cond, &cond_len, &key) &&
>> > + include_condition_is_true(con
David Turner writes:
> On Thu, 2015-07-09 at 10:58 -0700, Junio C Hamano wrote:
>> David Turner writes:
>>
>> > On Thu, 2015-07-09 at 10:23 -0700, Junio C Hamano wrote:
>> >
>> >> If I were David and sending this v4 patch, it would have looked like
>> >> this.
>> >>
>> >> -- >8 --
>> >>
>> >>
On Fri, Jul 10, 2015 at 01:23:07PM -0700, Junio C Hamano wrote:
> > - if (!strcmp(var, "include.path"))
> > - ret = handle_path_include(value, inc);
> > + if (!parse_config_key(var, "include", &cond, &cond_len, &key) &&
> > + include_condition_is_true(cond, cond_len)) {
>
> I
On Fri, Jul 10, 2015 at 10:40:57PM +0200, René Scharfe wrote:
> diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh
> index f8ed857..de2a224 100755
> --- a/t/perf/p5310-pack-bitmaps.sh
> +++ b/t/perf/p5310-pack-bitmaps.sh
> @@ -39,14 +39,14 @@ test_expect_success 'create parti
Signed-off-by: Rene Scharfe
---
GIT_TEST_CHAIN_LINT complains about the missing &&s and is enabled
by default now.
t/perf/p5310-pack-bitmaps.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh
index f8ed857..de2
Jeff King writes:
> Here's a sketch if anybody is inclined to pick it up and run with it.
> Note that I did not think too hard about little things like the
> de-anchoring.
> ...
> int git_config_include(const char *var, const char *value, void *data)
> {
> struct config_include_data *inc
"Simon A. Eugster" writes:
> From: "Simon A. Eugster"
>
> Signed-off-by: Simon A. Eugster
> ---
For those who are looking from the sideline, this is a reroll from a
month-old thread $gmane/271680.
> Documentation/git-checkout.txt | 16 +++-
> 1 file changed, 15 insertions(+), 1 d
On Fri, 2015-07-10 at 06:30 +0200, Michael Haggerty wrote:
> On 07/10/2015 12:06 AM, Junio C Hamano wrote:
> > David Turner writes:
> >
> >> OK, here's my current best idea:
> >>
> >> 1. A "pseudoref" is an all-caps file in $GIT_DIR/ that always contains
> >> at least a SHA1. CHERRY_PICK_HEAD an
On Thu, 2015-07-09 at 10:58 -0700, Junio C Hamano wrote:
> David Turner writes:
>
> > On Thu, 2015-07-09 at 10:23 -0700, Junio C Hamano wrote:
> >
> >> If I were David and sending this v4 patch, it would have looked like
> >> this.
> >>
> >> -- >8 --
> >>
> >> From: David Turner
> >> Date: Tue
On Fri, 2015-07-10 at 15:34 +0100, Philip Oakley wrote:
> From: "David Turner"
> > The current state of the discussion on alternate ref backends is that
> > we're going to continue to store pseudorefs (e.g. CHERRY_PICK_HEAD) as
>
> Assuming this is accepted, should the definition of pseudorefs be
Janusz Białobrzewski writes:
> Is it a bug or is it done by design?
I suspect the answer is "no and not really". The truth would be
closer to: we didn't bother to write code in the command line parser
to check and flag it as an error when "--cc" and "--name-only" is
given together.
Unlike "-c
From: "David Turner"
The current state of the discussion on alternate ref backends is that
we're going to continue to store pseudorefs (e.g. CHERRY_PICK_HEAD) as
Assuming this is accepted, should the definition of pseudorefs be
included in the gitglossary?
Once ref backends become common, t
On Fri, Jul 10, 2015 at 11:43:08AM -0400, Jeff King wrote:
> But something like:
>
> [include "gitdir:bar"]
> path = foo
>
> could do so only when the "gitdir:bar" conditional is satisfied (where
> that is just a syntax I made up to mean fnmatch("bar", $GIT_DIR)). So
> like user..*, we still
Christian Couder writes:
> On Thu, Jul 9, 2015 at 12:27 PM, Karthik Nayak wrote:
>> Mentored-by: Christian Couder
>> Mentored-by: Matthieu Moy
>> Signed-off-by: Karthik Nayak
>> ---
>> Documentation/git-tag.txt | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/Documentation/git-tag.
Karthik Nayak writes:
> Since 'ref-filter' only has an option to match path names
> add an option for regular pattern matching.
There is nothing "regular" about the pattern matching you are
adding.
Everywhere else we use patterns on refs we call wildmatch(), which
is an enhanced implementation
Karthik Nayak writes:
> Add support for %(refname:shortalign=X) where X is a number.
> This will print a shortened refname aligned to the left
> followed by spaces for a total length of X characters.
> If X is less than the shortened refname size, the entire
> shortened refname is printed.
>
> Me
On Fri, Jul 10, 2015 at 08:10:54AM -0700, Junio C Hamano wrote:
> I do agree it is a good feature to have to allow you to keep a
> centralized registry of possible configuration in a single place,
> e.g. $HOME/.gitconfig, and selectively apply pieces for multiple
> places.
>
> Having said that, a
Hi,
On 07/10/2015 03:13 PM, Junio C Hamano wrote:
> Markos Chandras writes:
>
>> $ cat .git/MERGE_RR
>> 5563edc0fb427275a0ca5677c93c40def8b53258
>> arch/mips/include/asm/cpu-type.hf175ff6228f624296b661664bce4ab4e84d712cc
>>
>> arch/mips/include/asm/cpu.h5563edc0fb427275a0ca5677c93c40def8b53258
>
Sebastian Schuberth writes:
> Support per-path identities by configuring Git like
>
> $ git config user..email
>
> e.g.
>
> $ git config user.github.email sschuberth+git...@gmail.com
>
> In this example, the middle "github" pattern is searched for
> case-insensitively in the absolute pat
Markos Chandras writes:
> $ cat .git/MERGE_RR
> 5563edc0fb427275a0ca5677c93c40def8b53258
> arch/mips/include/asm/cpu-type.hf175ff6228f624296b661664bce4ab4e84d712cc
>
> arch/mips/include/asm/cpu.h5563edc0fb427275a0ca5677c93c40def8b53258
>arch/mips/kernel/idle.c5563edc0fb427275a0ca5677c93c40def
Karthik Nayak writes:
> On Fri, Jul 10, 2015 at 4:22 PM, Karthik Nayak wrote:
>> On Thu, Jul 9, 2015 at 6:59 PM, Matthieu Moy
>> wrote:
>>> Karthik Nayak writes:
>>>
Add support to sort by version using the "v:refname" and
"version:refname" option. This is achieved by using the
On Thu, Jul 9, 2015 at 7:02 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> Since 'ref-filter' only has an option to match path names
>> add an option for regular pattern matching.
>
> Here also, a hint on why this is needed would be welcome.
>
Will add.
>> --- a/ref-filter.c
>> +++ b/ref-
On Fri, Jul 10, 2015 at 4:22 PM, Karthik Nayak wrote:
> On Thu, Jul 9, 2015 at 6:59 PM, Matthieu Moy
> wrote:
>> Karthik Nayak writes:
>>
>>> Add support to sort by version using the "v:refname" and
>>> "version:refname" option. This is achieved by using the
>>> 'version_cmp()' function as the c
On Thu, Jul 9, 2015 at 6:59 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> Add support to sort by version using the "v:refname" and
>> "version:refname" option. This is achieved by using the
>> 'version_cmp()' function as the comparing function for qsort.
>
> You should elaborate on why you
Hello,
When I run:
git diff-tree --cc 511f273b99af4529f6eb30069bb9070dc73fbbb4
As expected, I get the diff for the files that are changed in both parents.
When I run:
git diff-tree --cc --name-only 511f273b99af4529f6eb30069bb9070dc73fbbb4
I get all the files listed including ones that are ch
On Thu, Jul 9, 2015 at 6:37 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> In 'tag.c' we can print N lines from the annotation of the tag
>> using the '-n' option.
>
> Not only annotation of the tag, but also from the commit message for
> lightweight tags.
will do.
>
>> --- a/builtin/tag.
Support per-path identities by configuring Git like
$ git config user..email
e.g.
$ git config user.github.email sschuberth+git...@gmail.com
In this example, the middle "github" pattern is searched for
case-insensitively in the absolute path name to the current git work tree.
If there
On Thu, Jul 9, 2015 at 7:13 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> If anyone can help, this is what it's saying.
>> "[Net::SMTP::SSL] Connection closed at
>
> Perhaps your SMTP server thought you were sending too many emails to too
> many people and closed the connection thinking yo
init_notes() is the main point of entry to the notes API. It is an arbitrary
restriction that all it allows as input is a strict ref name, when callers
may want to give an arbitrary treeish.
However, some operations that require updating the notes tree require a
strict ref name, because they would
From: "Simon A. Eugster"
Signed-off-by: Simon A. Eugster
---
Documentation/git-checkout.txt | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index d263a56..d69306f 100644
--- a/Documentation/git-
Hi,
(Please keep me on CC as I am not subscribed to the list)
I am having a weird problem when merging a branch which causes some
conflicts
This is the initial status for the rerere cache
$ tree .git/rr-cache
.git/rr-cache [error opening dir]
0 directories, 0 files
I then go ahead and merge
On do, 2015-07-09 at 10:56 -0700, Junio C Hamano wrote:
> Dennis Kaarsemaker writes:
>
> > I'm seeing some behaviour with git reset that I find odd. Basically if I
> > do
> >
> > git fetch && \
> > git reset --hard simple-tag-that-points-to-the-current-commit
> >
> > sometimes the reset will upda
On Fri, Jul 10, 2015 at 09:16:16AM +0200, Johan Herland wrote:
> On Fri, Jul 10, 2015 at 3:28 AM, Mike Hommey wrote:
> > init_notes() is the main point of entry to the notes API. It is an arbitrary
> > restriction that all it allows as input is a strict ref name, when callers
> > may want to give
On Fri, Jul 10, 2015 at 3:28 AM, Mike Hommey wrote:
> init_notes() is the main point of entry to the notes API. It is an arbitrary
> restriction that all it allows as input is a strict ref name, when callers
> may want to give an arbitrary treeish.
>
> However, some operations that require updatin
47 matches
Mail list logo
