On Tue, 27 Oct 2015 at 19:18:26, Junio C Hamano wrote:
> [...]
> When I asked 'Is transfer.hiderefs insufficient?', I wasn't
> expecting it to be usable out of box. It was a suggestion to build
> on top of it, instead of adding a parallel support for something
> specific to namespaces.
>
Agreed,
On Tue, Oct 27, 2015 at 12:56 AM, Jens Lehmann wrote:
> Which seems a bit error prone as you could forget to update the submodules
> and build incorrect rpms from them, or am I missing something?
For my case I'm not building the rpms directly after merging in the fixes
done in the octopus branch,
CURLAUTH_ANY does not work with proxies which answer unauthenticated requests
with a 307 redirect to an error page instead of a 407 listing supported
authentication methods. Therefore, allow the authentication method to be set
using the environment variable GIT_HTTP_PROXY_AUTHMETHOD or configuratio
Currently, the only way to pass proxy credentials to curl is by including them
in the proxy URL. Usually, this means they will end up on disk unencrypted, one
way or another (by inclusion in ~/.gitconfig, shell profile or history). Since
proxy authentication often uses a domain user, credentials ca
Fixes in the second iteration:
* rename http.proxy-authmethod to http.proxyAuthmethod for consistency with
other core git variables
* issue warning() instead of error() for unsupported authentication method, for
consistency with http.sslVersion
* fix some code formatting / style issues
Hello dear git devs,
I just stumbled upon a segfault when doing just "git diff" in my repo.
I managed to create a minimal repo setup where the bug is reproducable.
The problem seems to be a mix of having an untracked submodule and
having set an alternates file for one submodule.
Attached you
On 10/28/2015 02:58 PM, Mathias L. Baumann wrote:
Hello dear git devs,
I just stumbled upon a segfault when doing just "git diff" in my repo.
I managed to create a minimal repo setup where the bug is reproducable.
The problem seems to be a mix of having an untracked submodule and
having set
Clean the workspace if p4_write_pipe raised SystemExit,
so that the user don't have to do it themselves.
Signed-off-by: GIRARD Etienne
---
git-p4.py | 71 +--
1 file changed, 37 insertions(+), 34 deletions(-)
The p4 submit command may
I was using the latest git version 2.6.2 already.
I suspect it is due to a .gitconfig. This is what is probably required:
➜ ~ cat .gitconfig
[diff]
submodule = log
On 28/10/15 13:24, Victor Leschuk wrote:
On 10/28/2015 02:58 PM, Mathias L. Baumann wrote:
Hello dear git devs,
I just s
On Wed, Oct 28, 2015 at 08:00:45AM +0100, Lukas Fleischer wrote:
> My original question remains: Do we want to continue supporting things
> like transfer.hideRefs=.have (which currently magically hides all refs
> outside the current namespace)? For 100% backwards compatibility, we
> would have to.
On Wed, Oct 28, 2015 at 02:35:23PM +0100, Mathias L. Baumann wrote:
> I was using the latest git version 2.6.2 already.
> I suspect it is due to a .gitconfig. This is what is probably required:
>
> ➜ ~ cat .gitconfig
> [diff]
> submodule = log
Yeah, I can reproduce it easily with that. Tha
On 10/28/2015 04:35 PM, Mathias L. Baumann wrote:
I was using the latest git version 2.6.2 already.
I suspect it is due to a .gitconfig. This is what is probably required:
➜ ~ cat .gitconfig
[diff]
submodule = log
Yep, that did the trick.
The segfault is from
sha1_file.c:
/* add the
Chad Boles reported that `git rebase -i` recently started producing
errors when the editor saves files with DOS line endings. The symptom
is:
Warning: the command isn't recognized in the following line:
-
You can fix this with 'git rebase --edit-todo'.
Or you can
From: Junio C Hamano
Editors on Windows can and do save text files with CRLF line
endings, which is the convention on the platform. We are seeing
reports that the "read" command in a port of bash to the environment
however does not strip the CRLF at the end, not adjusting for the
same convention
Hi Junio,
On Tue, 27 Oct 2015, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > My apologies: I forgot to spell out explicitly that this passes in Git
> > for Windows 2.x' SDK: It does.
>
> Can you add that to the log message? Your cover letter may also want to
> be updated for those
Based on a bug report by Chad Boles.
Signed-off-by: Johannes Schindelin
---
t/t3404-rebase-interactive.sh | 12
1 file changed, 12 insertions(+)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 3de0b1d..5dfa16a 100755
--- a/t/t3404-rebase-interactive
Jeff King writes:
> Yeah, I can reproduce it easily with that. Thanks for providing the
> repository. It takes a rather convoluted set of conditions to trigger
> the bug. :)
>
> Here's the fix:
>
> -- >8 --
> Subject: add_submodule_odb: initialize alt_odb list earlier
>
> The add_submodule_odb fu
Right now, refs with a path outside the current namespace are replaced
by ".have" before passing them to show_ref() which in turn checks
whether the ref matches the hideRefs pattern. Move the check before the
path substitution in show_ref_cb() such that the hideRefs feature can be
used to hide spec
Lukas Fleischer writes:
> Another patch I have in my patch queue adds support for a whitelist mode
> to hideRefs. There are several ways to implement that:
>
> 1. Make transfer.hideRefs='' hide all refs (it currently does not). The
Hmph, that even sounds like a bug. parse_hide_refs_config() doe
Lukas Fleischer writes:
> Right now, refs with a path outside the current namespace are replaced
> by ".have" before passing them to show_ref() which in turn checks
> whether the ref matches the hideRefs pattern. Move the check before the
> path substitution in show_ref_cb() such that the hideRef
Mike Rappazzo writes:
> On Tue, Oct 27, 2015 at 6:54 PM, Junio C Hamano wrote:
>> Kyle Meyer writes:
>>
>>> When a ".git" file points to another repo, a ".git/gitdir" file is
>>> created in that repo.
>>>
>>> For example, running
>>>
>>> $ mkdir repo-a repo-b
>>> $ cd repo-a
>>> $ g
Knut Franke writes:
> CURLAUTH_ANY does not work with proxies which answer unauthenticated requests
> with a 307 redirect to an error page instead of a 407 listing supported
> authentication methods. Therefore, allow the authentication method to be set
> using the environment variable GIT_HTTP_PR
Junio C Hamano writes:
>> +static void copy_from_env(const char **var, const char *envname)
>> +{
>> +const char *val = getenv(envname);
>> +if (val)
>> +*var = xstrdup(val);
>> +}
>> +
>> +static void init_curl_proxy_auth(CURL *result)
>> +{
>> +copy_from_env(&http_proxy_
Johannes Schindelin writes:
> Turns out that we now check whether a single Carriage Return is a valid
> command. This new check was introduced recently (1db168ee9, ironically
> named "rebase-i: loosen over-eager check_bad_cmd check").
Will queue.
The root cause is not really "a new check added
On Wed, Oct 28, 2015 at 08:24:17AM -0700, Junio C Hamano wrote:
> > Note that we can remove the prepare_alt_odb call from the
> > end. It is guaranteed to be a noop, since we will have
> > called it earlier.
>
> Thanks for a quick and detailed diagnosis and a fix.
>
> The removal is correct, but
Luke Diamand writes:
> On 9 September 2015 at 22:52, Junio C Hamano wrote:
>> Luke Diamand writes:
>> ...
>> def currentGitBranch():
>> return read_pipe("git name-rev HEAD").split(" ")[1].strip()
>>
>> Yuck. I know it is not entirely the fault of this patch, but
>> shouldn't it be
Do not assume that the first option after "git" is a subcommand. This
fixes completion such as:
# do not detect "push" as remote name
git --git-dir=git/.git push origin
# do not overwrite "--git-dir=..." with the alias expansion
git --git-dir=git/.git gerrit-diff
Signed-off-by:
Avoid the "fatal: bad config file line 5 in config" message and properly
complete git commands having the "-C" option.
Besides the trivial command parsing, __gitdir is rewritten to apply any
directory changes requested via `git -C otherdir ...`.
Signed-off-by: Peter Wu
---
contrib/completion/gi
The --git-dir option influences more commands, but was not applied
during completions. For example:
# previously empty because --git-dir was not passed to ls-remote
git --git-dir=git/.git config merge.o
Add --git-dir to more git commands (but not for repo-independent
commands such as git
Hi,
These patches improve bash-completion when global git options are present.
Consider this problem:
bash-4.3$ git -C ../linux staerror: invalid key: alias.../linux
This happens because the current script is unaware of the -C option. In general,
global options are not handled well (patch 00
Junio C Hamano writes:
> Eric Sunshine 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
Will Palmer writes:
> In summary: it looks like I'll be sending another one.
Has anything happened to this topic since then? I am asking
primarily because I want to decide if I should discard
wp/sha1-name-negative-match topic from my tree [*1*].
I think what it attempts to do is a worthy thing
Junio C Hamano writes:
> Looks like there were mostly editorial niggles and no fundamental
> flaws in the design of the patch; it is somewhat a shame to make all
> the efforts go to waste. Will we be seeing an update soon?
Second ping as I am going through the what's cooking reports and
trying
My Name is Mrs Jessica Peterside from United Kingdom who is suffering from
cancer of the lungs I wish to use my fund to serve the poor in your country
contact me via email ( mrsjessicapeters...@gmail.com )
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message
In addition to Junio's review comments...
On Wednesday, October 28, 2015, Knut Franke
wrote:
> CURLAUTH_ANY does not work with proxies which answer unauthenticated requests
> with a 307 redirect to an error page instead of a 407 listing supported
> authentication methods. Therefore, allow the aut
On Wed, Oct 28, 2015 at 1:20 AM, Junio C Hamano wrote:
>> Hence, fallback to alphabetical comparison based on the refname
>> whenever the other criterion is equal. Fix the test in t3203 in this
>> regard.
>
> It is unclear what "in this regard" is. Do you mean this (I am not
> suggesting you to s
On Wednesday, October 28, 2015, Knut Franke
wrote:
> Currently, the only way to pass proxy credentials to curl is by including them
> in the proxy URL. Usually, this means they will end up on disk unencrypted,
> one
> way or another (by inclusion in ~/.gitconfig, shell profile or history). Since
On 28/10/15 17:44, Junio C Hamano wrote:
Luke Diamand writes:
On 9 September 2015 at 22:52, Junio C Hamano wrote:
Luke Diamand writes:
...
def currentGitBranch():
return read_pipe("git name-rev HEAD").split(" ")[1].strip()
Yuck. I know it is not entirely the fault of this pa
When a file with '@' in the name is renamed - for example moved -
dcommit fails with:
Assertion failed: (svn_uri_is_canonical(child_uri, NULL)), function
uri_skip_ancestor, file subversion/libsvn_subr/dirent_uri.c, line 1520.
error: git-svn died of signal 6
I have sent a fix a
On Tue, Oct 27, 2015 at 1:57 PM, Junio C Hamano wrote:
>> + The number of submodules fetched at the same time.
>
> Do we want to say "Defaults to submodule.jobs" somewhere?
Yes. :)
> I am tempted to suggest that you should not pay attention to
> "submodule.jobs" in this command at all and ju
On 23.10.2015 20:44, Stefan Beller wrote:
[...] which may pick reasonable
defaults if you don't specify an explicit number.
IMO the above should also be mentioned ini the docs:
+-j::
+--jobs::
+ The number of submodules fetched at the same time.
Otherwise, from reading the docs, my i
On Tue, Oct 27, 2015 at 07:29:39PM -0400, Sean Krauth wrote:
> This seemed like about as good of an excuse as any to update Git. I
> was running v. 2.5.1-32-bit and so I downloaded v. 2.6.2-32-bit,
> installed it. And it ran, kinda. I no longer seem to have access to
> any of my old commits and wh
On Tue, Oct 27, 2015 at 1:59 PM, Junio C Hamano wrote:
> And when 0 starts to meaning something special, we would need to
> describe that here (and/or submodule.jobs entry in config.txt).
> As I already said, I do not think "0 means num_cpus" is a useful
> default, and I would prefer if we reserve
Karthik Nayak writes:
> On Wed, Oct 28, 2015 at 1:20 AM, Junio C Hamano wrote:
>>> Hence, fallback to alphabetical comparison based on the refname
>>> whenever the other criterion is equal. Fix the test in t3203 in this
>>> regard.
>>
>> It is unclear what "in this regard" is. Do you mean this
Stefan Beller writes:
> On Tue, Oct 27, 2015 at 1:59 PM, Junio C Hamano wrote:
>> And when 0 starts to meaning something special, we would need to
>> describe that here (and/or submodule.jobs entry in config.txt).
>> As I already said, I do not think "0 means num_cpus" is a useful
>> default, an
It is possible to prepare a text file with a DOS editor and feed it
as a batch command stream to the command.
Signed-off-by: Junio C Hamano
---
builtin/cat-file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index c0fd8db..e79097d 10
Signed-off-by: Junio C Hamano
---
builtin/update-index.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 7431938..dfc65a8 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -473,7 +473,9 @@ static void r
$GIT_OBJECT_DIRECTORY/info/alternates is a text file that can be
edited with a DOS editor. We do not want to use the real path with
CR appeneded at the end.
Signed-off-by: Junio C Hamano
---
builtin/clone.c | 2 +-
sha1_file.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -
Reading with getwholeline() and manually stripping the terminating
'\n' would leave CR at the end of the line if the input comes from
a DOS editor.
Constrasting this with the previous few changes, one may realize
that the way "log" family of commands read the paths with --stdin
looks inconsistent
Just in case /etc/mailname file was edited with a DOS editor,
read it with strbuf_gets() so that a stray CR is not included
as the last character of the mail hostname.
We _might_ want to more aggressively discard whitespace characters
around the line with strbuf_trim(), but that is a bit outside t
List of patterns file could come from a DOS editor.
This is iffy; you may actually be trying to find a line with ^M in
it on a system whose line ending is LF. You can of course work it
around by having a line that has "^M^M^J", let the strbuf_gets() eat
the last "^M^J", leaving just the single "^
We have too many topics titled "War on something"; let's try to make
peace for a change.
This is a continuation to $gmane/275735, which is filed in the
archive under another mailing list:
http://thread.gmane.org/gmane.comp.version-control.msysgit/21773
We read "text" files from filesystem (or
Often we read "text" files that are supplied by the end user
(e.g. commit log message that was edited with $GIT_EDITOR upon 'git
commit -e'), and in some environments lines in a text file are
terminated with CRLF. Existing strbuf_getline() knows to read a
single line and then strip the terminating
The list of paths could have been written with a DOS editor.
Signed-off-by: Junio C Hamano
---
builtin/hash-object.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 43b098b..46d55e5 100644
--- a/builtin/hash-object.c
+++ b/b
Signed-off-by: Junio C Hamano
---
builtin/update-index.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index dfc65a8..004871b 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -1075,7 +1075,10 @@ int cmd_u
Signed-off-by: Junio C Hamano
---
builtin/send-pack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index f6e5d64..ba318c9 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -212,7 +212,7 @@ int cmd_send_pack(int argc, con
"rev-parse --parseopt" specification is clearly text and we
should anticipate that we may be fed CRLF lines.
Signed-off-by: Junio C Hamano
---
builtin/rev-parse.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 02d747d..5317
These files can be edited with a DOS editor, leaving CR at the end
of the line if read with strbuf_getline().
Signed-off-by: Junio C Hamano
---
remote.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/remote.c b/remote.c
index 1101f82..90eef22 100644
--- a/remote.c
+++ b/remo
Our implementation of helpers never use CRLF line endings, and they
do not depend on the ability to place a CR as payload at the end of
the line, so this is essentially a no-op for in-tree users. However,
this allows third-party implementation of helpers to give us their
line with CRLF line ending
The input to this command comes from a pipeline in t0064, whose
upstream has bunch of "echo"s. It is not unreasonable to expect
that it may be fed CRLF lines on DOSsy systems.
Signed-off-by: Junio C Hamano
---
test-sha1-array.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a
These commands read list of paths from their standard input under
the --stdin option (in order to avoid busting limit on the length of
the command line).
When they are using text input mode (i.e. line_termination is set to
'\n'), we should try to be more friendly to our DOSsy friends and
accept li
The input can come from a DOS editor.
Signed-off-by: Junio C Hamano
---
builtin/mktree.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/mktree.c b/builtin/mktree.c
index a964d6b..a55f067 100644
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -157,7 +157,9 @@ int
Multiple lines read here are concatenated on a single line to form a
multi-column output line. We do not want to have a CR at the end,
even if the input file consists of CRLF terminated lines.
Signed-off-by: Junio C Hamano
---
builtin/column.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(
On 26 Oct 2015, at 21:40, Luke Diamand wrote:
> On 24/10/15 19:08, Lars Schneider wrote:
>>
>> On 21 Oct 2015, at 08:32, Luke Diamand wrote:
>>
>>> On 19/10/15 19:43, larsxschnei...@gmail.com wrote:
From: Lars Schneider
-- snip --
>>
>>> Also, could you use python3 style print st
On Wed, Oct 28, 2015 at 12:48 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Eric Sunshine 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,
Git-merge-file is documented to return one of three exit
codes:
- zero means the merge was successful
- a negative number means an error occurred
- a positive number indicates the number of conflicts
Unfortunately, this all gets stuffed into an 8-bit return
code. Which means that if you h
I first noticed this with "2.4.9 (Apple Git-60)", but it reproduces
with git built from 37023ba381b6d251d7140a997b39b566dbc63c42.
Create two files with just 0s:
-rw-r--r-- 1 espindola staff 4294967296 28 Oct 11:09 exactly-4gib
-rw-r--r-- 1 espindola staff 4294967295 28 Oct 11:09 one-less-th
This commit serves 2 purposes. First this may help the user who
tries to diagnose intermixed process calls. Second this may be used
in a later patch for testing. As the output of a command should not
change visibly except for going faster, grepping for the trace output
seems like a viable testing s
This allows to configure fetching and updating in parallel
without having the command line option.
This moved the responsibility to determine how many parallel processes
to start from builtin/fetch to submodule.c as we need a way to communicate
"The user did not specify the number of parallel proc
This replaces origin/sb/submodule-parallel-update
(anchoring at 74367d8938, Merge branch 'sb/submodule-parallel-fetch'
into sb/submodule-parallel-update)
What does it do?
---
This series should finish the on going efforts of parallelizing
submodule network traffic. The patches contain tests for cl
By inlining `name_and_item_from_var` it is easy to add later options
which are not required to have a submodule name.
Signed-off-by: Stefan Beller
---
submodule-config.c | 46 +-
1 file changed, 17 insertions(+), 29 deletions(-)
diff --git a/submodule
Expose possible parallelism either via the "--jobs" CLI parameter or
the "submodule.jobs" setting.
By having the variable initialized to -1, we make sure 0 can be passed
into the parallel processing machine, which will then pick as many parallel
workers as there are CPUs.
Signed-off-by: Stefan Be
This introduces a new helper function in git submodule--helper
which takes care of cloning all submodules, which we want to
parallelize eventually.
Some tests (such as empty URL, update_mode=none) are required in the
helper to make the decision for cloning. These checks have been
moved into the C
Just pass it along to "git submodule update", which may pick reasonable
defaults if you don't specify an explicit number.
Signed-off-by: Stefan Beller
---
Documentation/git-clone.txt | 6 +-
builtin/clone.c | 23 +--
t/t7406-submodule-update.sh | 15 +
We need the submodule update strategies in a later patch.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
submodule-config.c | 11 +++
submodule-config.h | 1 +
2 files changed, 12 insertions(+)
diff --git a/submodule-config.c b/submodule-config.c
index afe0ea8..8b8c7d1
This rewrites parse_config to distinguish between configs specific to
one submodule and configs which apply generically to all submodules.
We do not have generic submodule configs yet, but the next patch will
introduce "submodule.jobs".
Signed-off-by: Stefan Beller
# Conflicts:
# submodule
On a remote, I have two Git commit objects which point to the same tree
object (created with git commit-tree). If I fetch one of the commits, the
commit object (including the tree object) is fetched. If I then fetch the
other commit, the tree object (and its dependencies) is fetched *again* (I
thin
On Tue, Oct 27, 2015 at 03:24:49PM -0700, Junio C Hamano wrote:
> David Aguilar writes:
>
> > difftool's dir-diff should never reuse a symlink, regardless of
> > what it points to. Tighten use_wt_file() so that it rejects all
> > symlinks.
> >
> > Helped-by: Junio C Hamano
> > Signed-off-by: Da
+if test -n "$TEST_GDB_GIT"
+then
+ exec gdb -args "${GIT_EXEC_PATH}/@@PROG@@" "$@"
Maybe we could make $TEST_GDB_GIT not just a boolean flag? It would be
useful to contain "gdb" executable name. It would allow to set path to
GDB when it is not in $PATH, set different debuggers (for e
Доброго дня,
будь ласка, просимо переглянути наш сайт,
якщо це не важко для вас,
http://schoolsite.pp.ua/ - будь ласка, відкрийте його для перегляду однієї-двох
сторінок,
і на будь-якій сторінці один раз натисніть на рекламний банер, який вам
найбільш цікавий,
це Ваша допомога, щоб ми могли запл
I did some debugging, and it seems CC_SHA1_Update (used by
write_sha1_file_prepare if APPLE_COMMON_CRYPTO is defined in the
Makefile) takes a uint32_t as a "length" parameter, which explains why
it stops working at 4GiB (UINT_MAX+1).
In the OS X 10.11 SDK header CommonCrypto/CommonDigest.h, we hav
81 matches
Mail list logo
