--
This is the second time i am sending you this mail.I, Friedrich Mayrhofer
Donate $ 1,000,000.00 to You, Email Me personally for more details.
Regards.
Friedrich Mayrhofer
Hi. I have merge conflict and this output:
--- a/crypto/lib/Crypto/Routes.pm
+++ b/crypto/lib/Crypto/Routes.pm
@@@ -98,17 -94,16 +98,36 @@@ sub register
,payment_cancel_landing => '/payment-cancel'
}});
# Route configuration is moved from plugin:
++<<< ours
+$rn->
Hi,
I stumbled across the following today:
(1) git -c foo.bar="foobar" clone
--> uses the config temporarily
(2) git clone -c foo.bar="foobar"
--> uses the config and writes it to .git/config
This was introduced in 84054f7 ("clone: accept config options on the
command line") and it makes
Hello,
My name is Nikita and I'm from Devart https://www.devart.com/.
I would like to contact someone from executive staff of Git. I would be very
thankful for some information how to do this or if someone contacts me.
Thanks for attention and sorry if I disturbed someone.
Best regards
Nikit
On Tue, 21 Feb 2017 13:21:38 +0200
"Nikita Malikov" wrote:
> My name is Nikita and I'm from Devart https://www.devart.com/.
> I would like to contact someone from executive staff of Git. I would
> be very thankful for some information how to do this or if someone
> contacts me.
Git is a free sof
Thanks for going into the issue. As far as I understand 2.12 won't change the
discussed behavior of --procelain. We will switch to --line-procelain. After
the current discussion it seems to be less error prone, more future-proof and
our current parser can handle it without any changes.
Regards
On Mon, Feb 20, 2017 at 7:11 PM, Michael Haggerty wrote:
> On 02/18/2017 02:33 PM, Nguyễn Thái Ngọc Duy wrote:
>> Since submodule or not is irrelevant to files-backend after the last
>> patch, remove the parameter from files_downcast() and kill
>> files_assert_main_repository().
>>
>> PS. This imp
Konstantin,
My goal is to establish partnership relations with Git because some of
Devart's products support Git version control system (for example dbForge
Studio for SQL Server https://www.devart.com/dbforge/sql/studio/).
My team and I would be glad to come up with cross-marketing activities
Nikita,
As git is free software, you are free to use it in any way you see fit, as
long as you adhere to its licensing terms, and to the copyright
restrictions on using the term "git". Thus there is no need to ask
permission and there does not on the git side exist any entity interested
in "cross
On Wed, Feb 1, 2017 at 6:26 PM, Jeff King wrote:
> As many of you already know, the Git project (as a member of Software
> Freedom Conservancy) holds a trademark on "Git". This email will try to
> lay out a bit of the history and procedure around the enforcement of
> that trademark, along with so
Junio C Hamano writes:
> These looked reasonable. I had to resolve conflicts with another
> topic in flight that removed set_worktree_head_symref() function
> while queuing, and I think I resolved it correctly, but please
> double check what is pushed out on 'pu'.
The merge looks right to me, t
Thomas Gummerer writes:
> - git reset --hard ${GIT_QUIET:+-q}
This hunk is probably the most important one to review in the whole
series, in the sense that these are entirely new code that didn't
exist in the original.
> + if test $# != 0
> + then
> +
Jeff King writes:
>> +. ./test-lib.sh
>
> There are a bunch of other "git -c" tests inside t1300. I don't know if
> it would be better to put them all together.
I considered it, but it is already very long and I suspect it would
be better in the longer term to split the command-line one out into
The "git -c = cmd" mechanism is to pretend that a
configuration variable is set to while the cmd is
running. The code to do so however downcased in its entirety,
which is wrong for a three-level ...
The part needs to stay as-is.
Reported-by: Lars Schneider
Diagnosed-by: Jonathan Tan
Helped
On Tue, Feb 21, 2017 at 12:36:25PM +0100, Lars Schneider wrote:
> I stumbled across the following today:
>
> (1) git -c foo.bar="foobar" clone
>
> --> uses the config temporarily
>
>
> (2) git clone -c foo.bar="foobar"
>
> --> uses the config and writes it to .git/config
>
> This was intro
On Tue, Feb 21, 2017 at 12:25:37PM +, Sokolov, Konstantin wrote:
> Thanks for going into the issue. As far as I understand 2.12 won't
> change the discussed behavior of --procelain. We will switch to
> --line-procelain. After the current discussion it seems to be less
> error prone, more futur
On Tue, Feb 21, 2017 at 09:17:07AM -0800, Junio C Hamano wrote:
> * Changes from v1:
>
>- update the comment before the second loop to find the last
> dot.
>
>- move two new tests into existing t1300 (at least for now).
>
>- make it clear that the second of the new tests check
On Tue, Feb 21, 2017 at 9:50 AM, Jeff King wrote:
> On Tue, Feb 21, 2017 at 09:17:07AM -0800, Junio C Hamano wrote:
>
>> * Changes from v1:
>>
>>- update the comment before the second loop to find the last
>> dot.
>>
>>- move two new tests into existing t1300 (at least for now).
>>
>
On Mon, Feb 20, 2017 at 11:06 PM, Jeff King wrote:
>
> We'll see if the submodule folks have any ideas on how to implement
> that.
>
So from reading your discussion, the user expectation is to have
`git submodule {init, update --init, sync}`
to pay attention to url..insteadOf when setting up the
The parsing of one-shot assignments of configuration variables that
come from the command line historically was quite loose and allowed
anything to pass.
The configuration variable names that come from files are validated
in git_config_parse_source(), which uses get_base_var() that grabs
the (and
Dov Grobgeld writes:
> As git is free software, you are free to use it in any way you see fit, as
> long as you adhere to its licensing terms, and to the copyright
> restrictions on using the term "git". Thus there is no need to ask
> permission and there does not on the git side exist any entity
On Tue, Feb 21, 2017 at 10:53 AM, Junio C Hamano wrote:
> The parsing of one-shot assignments of configuration variables that
> come from the command line historically was quite loose and allowed
> anything to pass.
>
> The configuration variable names that come from files are validated
> in git_c
Ross Lagerwall writes:
> If a branch is configured with a default remote but no
> branch..merge and then the remote is removed, git fails to remove
> the remote with:
> "fatal: could not unset 'branch..merge'"
>
> Instead, ignore this since it is not an error and shouldn't prevent the
> remote fr
> isn't that spelt `--ancestry-path` ?
> (--ancestry-path has it's own issues such as needing an --first-parent-show
> option, but that's possibly a by the by)
Indeed it is spelled `--ancestry-path`. And interestingly enough you
may use it multiple times with the wanted effect in our case (e.g whe
On Fri, Feb 17, 2017 at 10:24 AM, Jacob Keller wrote:
>
> Ok so this function here reads a recurse submodules parameter which is
> a boolean or it can be set to the word "checkout"? Why does checkout
> need its own value separate from true? Just so that we have a synonym?
> or so that we can expan
Hallo Freund
Ich beabsichtige, Ihnen einen Teil meines Reichtums als freiwillige finanzielle
Spende an Sie zu geben, Reagieren Sie, um teilzunehmen.
Wang Jianlin
Wanda Gruppe
Linus Torvalds writes:
> That source showing should never have been in "show_decorations()" in
> the first place. It just happened to be a convenient place for it.
>
> So this attached patch is just my original patch updated to split up
> "show_source()" from "show_decorations()", and show it whe
Stefan Beller writes:
> Combining this thought with another email[1] that flew by,
> do we also need to have this treatment for "git clone -c"
You tell me ;-)
Do we share the same parser? If not, should we make them share the
same code?
>> +for VAR in a .a a. a.0b a."b c". a."b c".0d
>> +do
On Tue, Feb 21, 2017 at 11:32:54AM -0800, Junio C Hamano wrote:
> Ross Lagerwall writes:
>
> > If a branch is configured with a default remote but no
> > branch..merge and then the remote is removed, git fails to remove
> > the remote with:
> > "fatal: could not unset 'branch..merge'"
> >
> > Ins
On Tue, Feb 21, 2017 at 12:11 PM, Junio C Hamano wrote:
>
> The updated organization smells a lot better to me ;-)
So I have been using the original patch for a bit over a week now, and
I have to say that I'm not sure it's the right thing to do after all.
Most of the time I much prefer the "deco
Andreas Heiduk writes:
> Add a hint for script writers where additional quoting can be configured.
>
> Signed-off-by: Andreas Heiduk
> ---
> Documentation/git-ls-files.txt | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/git-ls-files.txt b/Documentation/g
On Tue, Feb 21, 2017 at 11:42 AM, Stefan Beller wrote:
> On Fri, Feb 17, 2017 at 10:24 AM, Jacob Keller wrote:
>>
>> Ok so this function here reads a recurse submodules parameter which is
>> a boolean or it can be set to the word "checkout"? Why does checkout
>> need its own value separate from t
On Fri, Feb 17, 2017 at 10:36 AM, Jacob Keller wrote:
> On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller wrote:
>> In later patches we introduce the --recurse-submodule flag for commands
>> that modify the working directory, e.g. git-checkout.
>>
>> It is potentially expensive to check if a submodu
On Tue, Feb 21, 2017 at 12:40:11PM -0800, Linus Torvalds wrote:
> In fact, I played around with some formats, and the one I lines the
> most was actually one that split the line for decorations, but that
> one was admittedly pretty funky. It gives output like
>
> b9df16a4c (HEAD -> master)
>
The parsing of one-shot assignments of configuration variables that
come from the command line historically was quite loose and allowed
anything to pass.
The configuration variable names that come from files are validated
in git_config_parse_source(), which uses get_base_var() that grabs
the (and
Jeff King writes:
> The for-each-ref formatting code has %(if), but it's not unified with
> the commit-format ones.
>
> So the best I could come up with is:
>
> git config pretty.twoline '%C(auto)%h %s%C(auto)%+d'
> git log --format=twoline
>
> which looks like:
>
> 80ba04ed9 Merge branch '
Ross Lagerwall writes:
> On Tue, Feb 21, 2017 at 11:32:54AM -0800, Junio C Hamano wrote:
>
>> I was waiting for others to comment on this patch but nobody seems
>> to be interested. Which is a bit sad, because except for minor
>> nits, this patch is very well done.
>>
>> The explanation of the
On Fri, Feb 17, 2017 at 10:42 AM, Jacob Keller wrote:
> On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller wrote:
>> + if (is_active_submodule_with_strategy(ce, SM_UPDATE_UNSPECIFIED))
>
> Here, and in other cases where we use
> is_active_submodule_with_strategy(), why do we only ever check
> S
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 ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The tip of the 'master' is still a
On Tue, Feb 21, 2017 at 01:47:37PM -0800, Junio C Hamano wrote:
> > So the best I could come up with is:
> >
> > git config pretty.twoline '%C(auto)%h %s%C(auto)%+d'
> > git log --format=twoline
> > [...]
>
> Yeah, I had a similar thought to use something around "%n%-d", but
>
> $ git log --
On Tue, Feb 21, 2017 at 07:55:15AM -0800, G. Sylvie Davies wrote:
> Is "Gitter" allowed? (https://gitter.im/).
>
> More info here:
>
> https://en.wikipedia.org/wiki/Gitter
>
> Also, their twitter handle is @gitchat.
>
> Not sure I'd even classify "gitter" as a portmanteau.
I don't think the
From: "Alex Hoffman"
isn't that spelt `--ancestry-path` ?
(--ancestry-path has it's own issues such as needing
an --first-parent-show
option, but that's possibly a by the by)
Indeed it is spelled `--ancestry-path`. And interestingly enough you
may use it multiple times with the wanted effect
On Tue, Feb 21, 2017 at 10:19:38AM -0800, Stefan Beller wrote:
> On Mon, Feb 20, 2017 at 11:06 PM, Jeff King wrote:
> >
> > We'll see if the submodule folks have any ideas on how to implement
> > that.
> >
>
> So from reading your discussion, the user expectation is to have
> `git submodule {ini
On Tue, Feb 21, 2017 at 3:00 PM, Jeff King wrote:
> On Tue, Feb 21, 2017 at 10:19:38AM -0800, Stefan Beller wrote:
>
>> On Mon, Feb 20, 2017 at 11:06 PM, Jeff King wrote:
>> >
>> > We'll see if the submodule folks have any ideas on how to implement
>> > that.
>> >
>>
>> So from reading your discu
When a submodule is initialized, the config variable 'submodule..url'
is set depending on the value of the same variable in the .gitmodules
file. When the URL indicates to be relative, then the url is computed
relative to its default remote. The default remote cannot be determined
accurately in all
On Tue, Feb 21, 2017 at 2:16 PM, Stefan Beller wrote:
> On Fri, Feb 17, 2017 at 10:42 AM, Jacob Keller wrote:
>> On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller wrote:
>>> + if (is_active_submodule_with_strategy(ce, SM_UPDATE_UNSPECIFIED))
>>
>> Here, and in other cases where we use
>> is_a
Stefan Beller writes:
> On Tue, Feb 21, 2017 at 3:00 PM, Jeff King wrote:
> ...
>> I guess one answer is that this is the wrong approach entirely, and the
>> right one is something like: submodules should understand that they are
>> part of a superproject, and respect some whitelisted set of con
On Tue, Feb 21, 2017 at 03:16:27PM -0800, Stefan Beller wrote:
> > I guess one answer is that this is the wrong approach entirely, and the
> > right one is something like: submodules should understand that they are
> > part of a superproject, and respect some whitelisted set of config from
> > the
On Tue, Feb 21, 2017 at 3:35 PM, Jacob Keller wrote:
> On Tue, Feb 21, 2017 at 2:16 PM, Stefan Beller wrote:
>> On Fri, Feb 17, 2017 at 10:42 AM, Jacob Keller
>> wrote:
>>> On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller wrote:
+ if (is_active_submodule_with_strategy(ce, SM_UPDATE_UN
Introduce a function, parse_oid_hex, which parses a hexadecimal object
ID and if successful, sets a pointer to just beyond the last character.
This allows for simpler, more robust parsing without needing to
hard-code integer values throughout the codebase.
Signed-off-by: brian m. carlson
---
cac
Convert most leaf functions to use struct object_id.
Signed-off-by: brian m. carlson
---
builtin/commit.c | 46 +++---
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 2de5f6cc64..4e288bc513 100644
-
Convert several functions to use struct object_id, and rename them so
that they no longer refer to SHA-1.
Signed-off-by: brian m. carlson
---
builtin/grep.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index 2c727e
This is another series in the continuing conversion to struct object_id.
This series converts more of the builtin directory and some of the refs
code to use struct object_id. Additionally, it implements an
nth_packed_object_oid function which provides a struct object_id version
of the nth_packed_
Convert the remaining uses of unsigned char [20] to struct object_id.
Signed-off-by: brian m. carlson
---
builtin/merge-base.c | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index db95bc29cf..cfe2a796
Signed-off-by: brian m. carlson
---
builtin/clone.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index 3f63edbbf9..b4c929bb8a 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -681,7 +681,7 @@ static void update_head(const st
Convert most leaf functions to struct object_id. Change several
hardcoded numbers to uses of parse_oid_hex. In doing so, verify that we
when we want two trees, we have exactly two trees.
Finally, in stdin_diff_commit, avoid accessing the byte after the NUL.
This will be a NUL as well, since the
Convert most of the code to use struct object_id, including struct
origin_data and struct merge_parents. Convert several instances of
hardcoded numbers into references to GIT_SHA1_HEXSZ.
Signed-off-by: brian m. carlson
---
builtin/fmt-merge-msg.c | 70 ---
Convert the functions in this file and struct commit_name to struct
object_id.
Signed-off-by: brian m. carlson
---
builtin/describe.c | 50 +-
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/builtin/describe.c b/builtin/describe.c
Convert the remaining uses of unsigned char [20] to struct object_id.
Signed-off-by: brian m. carlson
---
wt-status.c | 44 ++--
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index 5fac8437b0..a8d1faf80d 100644
-
There are a few leaf functions in various files that call
resolve_refdup. Convert these functions to use struct object_id
internally to prepare for transitioning resolve_refdup itself.
Signed-off-by: brian m. carlson
---
builtin/notes.c| 18 +-
builtin/receive-pack.c |
Additionally convert several uses of the constant 40 into
GIT_SHA1_HEXSZ.
Signed-off-by: brian m. carlson
---
builtin/merge.c | 134
1 file changed, 66 insertions(+), 68 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index a9
Make each_reflog_ent_fn take two struct object_id pointers instead of
two pointers to unsigned char. Convert the various callbacks to use
struct object_id as well. Also, rename fsck_handle_reflog_sha1 to
fsck_handle_reflog_oid.
Signed-off-by: brian m. carlson
---
builtin/fsck.c | 16
The current code for reflog entries uses a lot of hard-coded constants,
making it hard to read and modify. Use parse_oid_hex and two temporary
variables to simplify the code and reduce the use of magic constants.
Signed-off-by: brian m. carlson
---
refs/files-backend.c | 11 ++-
1 file
Convert struct reflog_info to use struct object_id by changing the
structure definition and applying the following semantic patch:
@@
struct reflog_info E1;
@@
- E1.osha1
+ E1.ooid.hash
@@
struct reflog_info *E1;
@@
- E1->osha1
+ E1->ooid.hash
@@
struct reflog_info E1;
@@
- E1.nsha1
+ E1.noid.ha
Convert each_loose_object_fn and each_packed_object_fn to take a pointer
to struct object_id. Update the various callbacks. Convert several
40-based constants to use GIT_SHA1_HEXSZ.
Signed-off-by: brian m. carlson
---
builtin/cat-file.c | 8
builtin/count-objects.c | 4 ++--
bu
Convert various uses of unsigned char [20] to struct object_id. Rename
replace_object_sha1 to replace_object_oid. Finally, specify a constant
in terms of GIT_SHA1_HEXSZ.
Signed-off-by: brian m. carlson
---
builtin/replace.c | 112 +++---
1 file c
Signed-off-by: brian m. carlson
---
builtin/branch.c | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 9d30f55b0b..faf472ff8f 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -32,7 +32,7 @@ static cons
There are places in the code where we would like to provide a struct
object_id *, yet read the hash directly from the pack. Provide an
nth_packed_object_oid function that is similar to the
nth_packed_object_sha1 function.
In order to avoid a potentially invalid cast, nth_packed_object_oid
provide
In addition to converting to struct object_id, write some hardcoded
buffer sizes in terms of GIT_SHA1_RAWSZ.
Signed-off-by: brian m. carlson
---
builtin/fast-export.c | 58 +--
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/builtin
Junio C Hamano writes:
> So I would think it is entirely reasonable if "git submodule init
> sub" that is run in the superproject to initialize "sub" writes
> something in "sub/.git" to tell that "sub" is used in the context of
> that particular toplevel superproject and customize its behavour
>
On Tue, Feb 21, 2017 at 3:37 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> On Tue, Feb 21, 2017 at 3:00 PM, Jeff King wrote:
>> ...
>>> I guess one answer is that this is the wrong approach entirely, and the
>>> right one is something like: submodules should understand that they are
>>>
On Tue, Feb 21, 2017 at 3:40 PM, Jeff King wrote:
>> > One other caveat: I'm not sure if we do insteadOf recursively, but it
>> > may be surprising to the child "git clone" that we've already applied
>> > the insteadOf rewriting (especially if the rules are coming from
>> > ~/.gitconfig and may b
On Tue, Feb 21, 2017 at 3:44 PM, Stefan Beller wrote:
> On Tue, Feb 21, 2017 at 3:35 PM, Jacob Keller wrote:
>> On Tue, Feb 21, 2017 at 2:16 PM, Stefan Beller wrote:
>>> On Fri, Feb 17, 2017 at 10:42 AM, Jacob Keller
>>> wrote:
On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller wrote:
>
Hi there,
The git worktree man page mentions the `--detached` flag in the
section on `add`, but the flag is actually called `--detach`.
Best,
Casey
On Tue, Feb 21, 2017 at 7:55 AM, G. Sylvie Davies
wrote:
> On Wed, Feb 1, 2017 at 6:26 PM, Jeff King wrote:
>> As many of you already know, the Git project (as a member of Software
>> Freedom Conservancy) holds a trademark on "Git". This email will try to
>> lay out a bit of the history and proc
Junio C Hamano writes:
> /* find the last dot (we start from the first dot we just found) */
> - for (last_dot = cp; *cp; cp++)
> + for (; *cp; cp++)
> if (*cp == '.')
> last_dot = cp;
This line probably needs this fix-up on top.
-- >8 --
Subjec
Am 21.02.2017 um 21:48 schrieb Junio C Hamano:
>
> I was waiting for others to comment on this patch but nobody seems
> to be interested. Which is a bit sad, as this may not be a bad
> idea.
>
> If we refer to core.quotePath, the mention of control characters
> being quoted can also be omitted,
[PATCH] Documentation: Clarify core.quotePath, remove cruft in
git-ls-files.
Signed-off-by: Andreas Heiduk
---
I have merged the best parts about quoting into the core.quotePath
description and cleaned up the text in git-ls-files.txt regarding the
control characters.
Documentation/config.txt
I have the following authentication failure while svn rebase and
svn dcommit works fine without authentication failures.
$ git svn branch v7_3
Copying https://xxx at r27519
to https:///v7_3...
Can't create session: Unable to c
Stefan Beller writes:
>> This is true even without any submodules. The Git project itself
>> does not even care you are Stefan, but you still can and do add
>> [user] name = "Stefan Beller" to .git/config of your clone of the
>> Git project. A clone of the project may want to know more than the
On 21 February 2017 at 02:00, Junio C Hamano wrote:
> Siddharth Kannan writes:
> > So, is it okay to stop with just supporting "-" and not support things
> > like "-@{yesterday}"?
>
> If the approach to turn "-" into "@{-1}" at that spot you did will
> cause "-@{yesterday}" to barf, then I'd say
82 matches
Mail list logo
