On Sat, Oct 3, 2015 at 6:11 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> - if (upstream_is_gone) {
>> - if (show_upstream_ref)
>> - strbuf_addf(stat, _("[%s: gone]"), fancy.buf);
>
> The old string
When running git rev-list --all --reflog in the main worktree it doesn't
include commits only referenced by the worktrees, neither HEAD nor its
reflog.
$ git init test
$ cd test
# add some commits
$ touch 1; git add 1; git commit -m 1
$ touch 2; git add 2; git commit -m 2
# add new worktree
$ git
Mike Botazzo writes:
> I was reading the git introduction in the git-scm website and the link inside
> the section 'Git Generally Only Adds Data' (Undoing Things) was broken.
> Webpage: https://git-scm.com/book/en/v2/Getting-Started-Git-Basics
> Broken link:
Karthik Nayak writes:
> On Sat, Oct 3, 2015 at 6:11 PM, Matthieu Moy
> wrote:
>> Actually, this is not a performance-cricical piece of code at all, so I
>> think it's even better to build an strbuf little by little using
>> repeated
There are situations, ie during cross compilation, where curl-config program
is not present in the PATH.
Make the makefile use a configurable curl-config program passed through
CURL_CONFIG variable which can be set through config.mak.
Also make this variable tunable through use of
Hi Max,
On 2015-10-01 06:39, Max Kirillov wrote:
> On Wed, Sep 30, 2015 at 10:28:14PM +0300, Max Kirillov wrote:
>> On Mon, Sep 28, 2015 at 09:44:57PM +0200, Johannes Schindelin wrote:
>>> - if (option_dissociate)
>>> + if (option_dissociate) {
>>> + struct packed_git *p;
>>> +
>>>
The gitk included in git 2.6.0 crashes if run from a Catalan locale.
I'm hoping that a translation update will fix this.
Signed-off-by: Alex Henrie
---
po/ca.po | 53 +
1 file changed, 25 insertions(+), 28 deletions(-)
Torsten Bögershausen writes:
> On 06.10.15 00:59, Junio C Hamano wrote:
>> * gr/rebase-i-drop-warn (2015-10-02) 2 commits
>> - rebase-i: loosen over-eager check_bad_cmd check
>> - rebase-i: explicitly accept tab as separator in commands
>>
>> "git rebase -i" had a minor
On 06.10.15 00:59, Junio C Hamano wrote:
> * gr/rebase-i-drop-warn (2015-10-02) 2 commits
> - rebase-i: loosen over-eager check_bad_cmd check
> - rebase-i: explicitly accept tab as separator in commands
>
> "git rebase -i" had a minor regression recently, which stopped
> considering a line
On Mon, Oct 5, 2015 at 4:03 PM, Junio C Hamano wrote:
> Platform, editor, terminal emulator, specifics?
>
I run ssh to a tmux terminal emulator and run vim, I normally see this
when my local client is a windows machine running putty. After I close
the editor it just hangs. and
Alex Henrie writes:
> The gitk included in git 2.6.0 crashes if run from a Catalan locale.
> I'm hoping that a translation update will fix this.
I seriously hope that l10n files would not "crash" applications.
I wonder if you are hitting $gmane/278863 perhaps?
>
>
Torsten Bögershausen writes:
> Minor comment from my compiler:
>
> worktree.c:181: warning: assuming signed overflow does not occur when assuming
> that (X + c) > X is always true
Thanks; I think the allocation in that function (the use it uses
ALLOC_GROW()) is somewhat bogus.
Remi Pommarel wrote:
> For static linking especially library order while linking is important. For
Please be more explicit for the uninitiated: during static linking, the
library that needs symbols comes before the library providing those symbols.
> example, libcurl wants symbols for libssl
I need to merge a branch, +100k changes. The vast majority of changes
are insignificant, because they only represent a screen position in
the editor, so these changes should never have been in git - but but
MadCap Flare already put them there.
The files in question are xml, and the difference can
On Mon, 2015-10-05 at 06:29 +0200, Michael Haggerty wrote:
> + * skip must be sorted.
> > + */
>
> This comment is approximately a copy of the comment for
> verify_refname_available_dir(). It seems unnecessary to keep both of
> them (and is also a small maintenance burden). I suggest you shorten
When `git clone` is asked to dissociate the repository from the
reference repository whose objects were used, it is quite possible that
the pack files need to be repacked. In that case, the pack files need to
be deleted that were originally hard-links to the reference repository's
pack files.
On
On Windows, files that are in use cannot be removed or renamed. That
means that we have to release pack files when we are about to, say,
repack them. Let's introduce a convenient function to close them
pack files.
While at it, we consolidate the close windows/close fd/close index
stanza in
Hey guys,
I recently found that specifying absolute paths for credential helper
on windows does not work correctly if the path has spaces or non
alphanumeric characters like parentheses. From what I gather it seems
to do with how args are passed to subprocesses.
example:
git config
For static linking especially library order while linking is important. For
example, libcurl wants symbols for libssl when building http-push, http-fetch
and remote-curl. So for these programs libcurl has to be linked before libssl.
Signed-off-by: Remi Pommarel
---
Makefile |
Sent from my IPhone
--
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
This is version 2, split into multiple commits for easier digestion.
Max, I hope that this helps also your use case!
Johannes Schindelin (4):
Demonstrate a Windows file locking issue with `git clone --dissociate`
Consolidate code to close a pack's file descriptor
Add a function to release
Junio C Hamano writes:
> David Turner writes:
>
>> But this is a benchmark of just git_path. I don't happen to see any
>> cases where git_path is taking up an appreciable amount of runtime.
>>
>> I only added this because Junio requested a speedup.
The latest maintenance release Git v2.6.1, together with releases
for older maintenance tracks, are now available at the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the
abovementioned tags:
url
There are situations, e.g. during cross compilation, where curl-config
program is not present in the PATH.
Make the makefile use a configurable curl-config program passed through
CURL_CONFIG variable which can be set through config.mak.
Also make this variable tunable through use of
Dear Git users,
it is my pleasure to announce version 2.6.1 of Git for Windows, available from
https://git-for-windows.github.io/.
Changes since Git for Windows 2.6.0 (September 29th 2015)
New Features
• Comes with Git 2.6.1
• The installer now writes the file /etc/install-options.txt to
On Mon, Oct 05, 2015 at 12:41:34PM -0700, Jonathan Nieder wrote:
> Remi Pommarel wrote:
[...]
> Based on this dependency, shouldn't CURL_LIBCURL always include -lssl when
> statically linking? How does this relate to NEEDS_SSL_WITH_CURL?
In fact libcurl will only need -lssl when the curl
On Mon, 2015-10-05 at 06:34 +0200, Michael Haggerty wrote:
> On 09/29/2015 12:01 AM, David Turner wrote:
> > Signed-off-by: Ronnie Sahlberg
> > Signed-off-by: David Turner
> > ---
> > refs.c | 9 +
> > refs.h | 13 +
> > 2
There was a lot of repeated code to close the file descriptor of
a given pack. Let's just refactor this code into a single function.
Signed-off-by: Johannes Schindelin
---
sha1_file.c | 38 ++
1 file changed, 18 insertions(+), 20
David Turner writes:
> But this is a benchmark of just git_path. I don't happen to see any
> cases where git_path is taking up an appreciable amount of runtime.
>
> I only added this because Junio requested a speedup. So I am perfectly
> happy to drop this patch from
On Mon, 2015-10-05 at 10:37 +0200, Michael Haggerty wrote:
> On 09/29/2015 12:02 AM, David Turner wrote:
> > The file backend doesn't need this function, but other backends might.
> >
> > Signed-off-by: David Turner
> > Signed-off-by: Ronnie Sahlberg
Johannes Schindelin writes:
> There was a lot of repeated code to close the file descriptor of
> a given pack. Let's just refactor this code into a single function.
That is a very good idea, but...
> +static int close_pack_fd(struct packed_git *p)
> +{
> + if
Junio C Hamano writes:
> Matthieu Moy writes:
>
> This adds %(path) and %(path:short) atoms. The %(path) atom will print
> the path of the given ref, while %(path:short) will only print the
> subdirectory of the given ref.
Dennis Kaarsemaker writes:
> On zo, 2015-10-04 at 10:46 -0700, Junio C Hamano wrote:
>> One final question. Which configuration file does the CI use when
>> running a PR-initiated test? The one already in the repository
>> i.e. the target of the proposed pull, or the
Hello,
Thanks, for YR reply!
I'd like any solution:
- the commit hash of a chosen local or remote branchOR
- a list of each commit hashes of all local or/and remote branches.
I'd like to write a tool to check more branches in more repos, if they are up
to date or there has been
On Sat, Oct 3, 2015 at 5:38 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> diff --git a/ref-filter.c b/ref-filter.c
>> index 099acd6..48b06e3 100644
>> --- a/ref-filter.c
>> +++ b/ref-filter.c
>> @@ -1133,8 +1133,10 @@ static void
On Sat, Oct 3, 2015 at 5:32 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> Introduce format_ref_array_item() which will output the details of a
>> given ref_array_item as per the given format and quote_style to the
>> given strbuf.
>
>
To which branch was this applied?
Its still broken in git-2.6.0.
Olaf
On Fri, May 01, Pat Thoyts wrote:
> René Scharfe writes:
>
> >Looping in Pat (git-gui maintainer).
> >
> >Am 15.04.2015 um 09:22 schrieb Olaf Hering:
> >> Ping?
> >>
> >> On Tue, Feb 10, Olaf Hering wrote:
>
On 09/29/2015 12:01 AM, David Turner wrote:
> From: Ronnie Sahlberg
>
> Add a ref structure for backend methods. Start by adding method pointers
> for the transaction functions.
>
> Add a function set_refs_backend to switch between backends. The files
> based backend is the
On 09/29/2015 12:01 AM, David Turner wrote:
> Alternate refs backends might still use files to store per-worktree
> refs. So the files backend's ref-loading infrastructure should be
> available to those backends, just for use on per-worktree refs. Add
> do_for_each_per_worktree_ref, which
On 09/29/2015 12:02 AM, David Turner wrote:
> Signed-off-by: David Turner
> ---
> refs-be-files.c | 13 +++--
> refs.c | 12
> refs.h | 7 +++
> 3 files changed, 26 insertions(+), 6 deletions(-)
> [...]
I think it would be
Karthik Nayak writes:
> The problem is with colors which tag.c doesn't use by default.
> Here we need to print colors only if we're printing to a tty which supports
> colors.
Ah, and tag --format '%(color:...)' does not do the tty autodetection.
> which does not play
I was reading the git introduction in the git-scm website and the link inside
the section 'Git Generally Only Adds Data' (Undoing Things) was broken.
Webpage: https://git-scm.com/book/en/v2/Getting-Started-Git-Basics
Broken link: https://git-scm.com/book/en/v2/1-git-basics/_undoing
--
To
On 09/29/2015 12:02 AM, David Turner wrote:
> This allows them to be used by other ref backends.
>
> Signed-off-by: David Turner
> ---
> refs-be-files.c | 24
> refs.h | 24
> 2 files changed, 24 insertions(+),
On 09/29/2015 12:02 AM, David Turner wrote:
> The file backend doesn't need this function, but other backends might.
>
> Signed-off-by: David Turner
> Signed-off-by: Ronnie Sahlberg
> ---
> refs-be-files.c | 1 +
> refs.c | 4 +++-
>
On 09/29/2015 12:02 AM, David Turner wrote:
> Because HEAD and stash are per-worktree, other backends need to
> go through the files backend to manage these refs and their reflogs.
>
> To enable this, we make some files backend functions public.
I have a bad feeling about this change.
Naively I
Hi Max,
On 2015-10-05 06:57, Max Kirillov wrote:
> On Sun, Oct 04, 2015 at 04:53:30PM +0200, Johannes Schindelin wrote:
>> I guess then we would need two different patches for the
>> two different fixes, at least.
>>
>> So now I am unsure how to proceed: I do not want to step
>> on your toes, but
On 09/29/2015 12:02 AM, David Turner wrote:
> Create new function verify_no_descendants, to hold one of the ref
> conflict checks used in verify_refname_available. Multiple backends
> will need this function, so it goes in the common code.
>
> Signed-off-by: David Turner
On 09/29/2015 12:02 AM, David Turner wrote:
> Add a new option, --refs-backend-type, to allow the ref backend type to
> be set on new clones.
>
> Submodules must use the same ref backend as the parent repository, so
> we also pass the --refs-backend-type option option when cloning
> submodules.
Hi Lars,
On 2015-10-04 20:06, larsxschnei...@gmail.com wrote:
> From: Lars Schneider
>
> The tests are executed on "Ubuntu 12.04 LTS Server Edition 64 bit" and
> on "OS X Mavericks" using gcc and clang.
I think that the word "currently" is missing from this
On Mon, 2015-10-05 at 13:55 +0200, Michael Haggerty wrote:
> On 09/29/2015 12:02 AM, David Turner wrote:
> > Add a new option, --refs-backend-type, to allow the ref backend type to
> > be set on new clones.
> >
> > Submodules must use the same ref backend as the parent repository, so
> > we also
On Mon, 2015-10-05 at 11:03 +0200, Michael Haggerty wrote:
> On 09/29/2015 12:02 AM, David Turner wrote:
> > Because HEAD and stash are per-worktree, other backends need to
> > go through the files backend to manage these refs and their reflogs.
> >
> > To enable this, we make some files backend
On Mon, 2015-10-05 at 11:32 +0200, Michael Haggerty wrote:
> On 09/29/2015 12:02 AM, David Turner wrote:
> > Add a new option, --refs-backend-type, to allow the ref backend type to
> > be set on new clones.
> >
> > Submodules must use the same ref backend as the parent repository, so
> > we also
On Mon, Oct 05, 2015 at 09:29:37PM -0400, David Turner wrote:
> > Therefore, I don't think this can be merged without a bump to
> > core.repositoryformatversion. Such a bump will tell well-behaved older
> > Git clients keep their hands off the repository. (Of course repositories
> > that use the
On Mon, Oct 05, 2015 at 01:49:09PM -0700, Jonathan Nieder wrote:
> Remi Pommarel wrote:
>
> > Signed-off-by: Remi Pommarel
>
> For what it's worth, with or without the tweaks below,
>
> Reviewed-by: Jonathan Nieder
Thanks.
>
> [...]
> > --- a/Makefile
Remi Pommarel wrote:
> Do I need to resend a v4 patch with these modifications ? I am not sure
> about the correct workflow here.
If you like the changes, you can ask Junio to squash them in.
If you don't like them, that's also fine and you can just say so.
--
To unsubscribe from this list:
On Mon, Oct 05, 2015 at 02:11:07PM -0700, Jonathan Nieder wrote:
> Remi Pommarel wrote:
>
> > Do I need to resend a v4 patch with these modifications ? I am not sure
> > about the correct workflow here.
>
> If you like the changes, you can ask Junio to squash them in.
>
> If you don't like
Hi Junio,
On 2015-10-05 22:57, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
>> There was a lot of repeated code to close the file descriptor of
>> a given pack. Let's just refactor this code into a single function.
>
> That is a very good idea, but...
>
>>
Johannes Schindelin writes:
> Oh, I appreciate your feedback. I am actually not all *that* certain
> that removing the broken symref is the correct thing. It is this sort
> of fruitful exchange that allows me to throw out an idea and be
> relatively certain that
Johannes Schindelin writes:
>>> + && !p->do_not_close)
>>> + close_pack_fd(p);
>>
>> I wonder how this do_not_close bit should interact with "we are
>> shutting down (or we are spawning another to do the real work,
On Mon, 2015-10-05 at 10:25 -0700, Junio C Hamano wrote:
> Michael Haggerty writes:
>
> >> +/* refs backends */
> >> +typedef struct ref_transaction *(*ref_transaction_begin_fn)(struct strbuf
> >> *err);
> >
> > Hmmm, I thought our convention was to define typedefs for
On Mon, 2015-10-05 at 09:56 -0700, Junio C Hamano wrote:
> Dennis Kaarsemaker writes:
>
> > On Mon, Sep 28, 2015 at 06:02:18PM -0400, David Turner wrote:
> >> Add tests for the database backend.
> >>
> >> Signed-off-by: David Turner
> >> ---
>
On Mon, 2015-10-05 at 11:06 +0200, Michael Haggerty wrote:
> > + /*
> > +* Check for entries in extras that start with "$refname/". We
> > +* do that by looking for the place where "$refname/" would be
> > +* inserted in extras. If there is an entry at that position
> > +* that
Remi Pommarel wrote:
> There are situations, ie during cross compilation, where curl-config program
> is not present in the PATH.
s/ie/e.g.,/
[...]
> @@ -374,6 +378,7 @@ LDFLAGS =
> ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
> ALL_LDFLAGS = $(LDFLAGS)
> STRIP ?= strip
> +CURL_CONFIG = curl-config
On Mon, 2015-10-05 at 10:22 -0700, Junio C Hamano wrote:
> Michael Haggerty writes:
>
> > For this particular application, where we only have 19 strings to store,
> > I suppose we could tolerate the use of approximately 64k of RAM to store
> > 174 characters worth of
On Mon, 2015-10-05 at 10:19 +0200, Michael Haggerty wrote:
> On 09/29/2015 12:01 AM, David Turner wrote:
> > Alternate refs backends might still use files to store per-worktree
> > refs. So the files backend's ref-loading infrastructure should be
> > available to those backends, just for use on
On Mon, Oct 05, 2015 at 12:31:27PM -0700, Jonathan Nieder wrote:
> Remi Pommarel wrote:
>
> > There are situations, ie during cross compilation, where curl-config program
> > is not present in the PATH.
>
> s/ie/e.g.,/
Oups sorry about that.
>
> [...]
> > @@ -374,6 +378,7 @@ LDFLAGS =
> >
On Mon, Oct 05, 2015 at 10:13:00PM +0200, Jens Brejner wrote:
> I need to merge a branch, +100k changes. The vast majority of changes
> are insignificant, because they only represent a screen position in
> the editor, so these changes should never have been in git - but but
> MadCap Flare already
Remi Pommarel wrote:
> Signed-off-by: Remi Pommarel
For what it's worth, with or without the tweaks below,
Reviewed-by: Jonathan Nieder
[...]
> --- a/Makefile
> +++ b/Makefile
> @@ -39,6 +39,10 @@ all::
> # Define CURLDIR=/foo/bar if your curl header
Johannes Schindelin writes:
> diff --git a/builtin/clone.c b/builtin/clone.c
> index 578da85..cc896e2 100644
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -1064,8 +1064,10 @@ int cmd_clone(int argc, const char **argv, const char
> *prefix)
>
Hey,
I've been experiencing a very annoying bug when performing interactive
rebases. The rebase process will stall after I close the editor, and I
have to kill the process and then restart the rebase using "git rebase
--continue"
I am not sure how to debug this further. Suggestions are welcome.
On Mon, Oct 5, 2015 at 3:39 PM, Jacob Keller wrote:
> Hey,
>
> I've been experiencing a very annoying bug when performing interactive
> rebases. The rebase process will stall after I close the editor, and I
> have to kill the process and then restart the rebase using "git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
A set of releases for a handful of maintenance tracks have been
tagged (v2.6.1, v2.5.4, v2.4.10 and v2.3.10), thanks to Blake
Burkhart and Jeff
Jacob Keller writes:
>> I've been experiencing a very annoying bug when performing interactive
>> rebases. The rebase process will stall after I close the editor, and I
>> have to kill the process and then restart the rebase using "git rebase
>> --continue"
>>
>> I am not
On 2015-10-06 00.59, Junio C Hamano wrote:
> * mr/worktree-list (2015-10-02) 7 commits
> - SQUASH???
> - worktree: add 'list' command
> - worktree: add details to the worktree struct
> - worktree: add a function to get worktree details
> - SQUASH???
> - worktree: refactor find_linked_symref
On 2015-10-05 05.43, Jeff King wrote:
[]
The whole series looks good, cleans up my mess and passes t3910.
Thanks for that.
--
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
On 09/29/2015 12:02 AM, David Turner wrote:
> Add a new option, --refs-backend-type, to allow the ref backend type to
> be set on new clones.
>
> Submodules must use the same ref backend as the parent repository, so
> we also pass the --refs-backend-type option option when cloning
> submodules.
>
Hi Lars,
On 2015-10-04 20:06, larsxschnei...@gmail.com wrote:
> From: Lars Schneider
>
> diff to v1:
> * improve readabilty of Travis "before_script" section
> * make OS X Perforce brew robust against changing Perforce builds [1]
> * add a prereq to detect OS X in
The main completion function finds the name of the git command by
iterating through all the words on the command line in search for the
first non-option-looking word. As it is not aware of 'git -C's
mandatory path argument, if the '-C path' option is present, 'path' will
be the first such word
Michael Haggerty writes:
>> +/* refs backends */
>> +typedef struct ref_transaction *(*ref_transaction_begin_fn)(struct strbuf
>> *err);
>
> Hmmm, I thought our convention was to define typedefs for functions
> themselves, not for the pointer-to-function; e.g.,
>
>
On 09/29/2015 12:02 AM, David Turner wrote:
> Add a database backend for refs using LMDB. This backend runs git
> for-each-ref about 30% faster than the files backend with fully-packed
> refs on a repo with ~120k refs. It's also about 4x faster than using
> fully-unpacked refs. In addition, and
Michael Haggerty writes:
> For this particular application, where we only have 19 strings to store,
> I suppose we could tolerate the use of approximately 64k of RAM to store
> 174 characters worth of strings *if* it would bring us big time savings.
> But I think we need
Dennis Kaarsemaker writes:
> On zo, 2015-10-04 at 10:46 -0700, Junio C Hamano wrote:
>> One final question. Which configuration file does the CI use when
>> running a PR-initiated test? The one already in the repository
>> i.e. the target of the proposed pull, or the
Dennis Kaarsemaker writes:
> On Mon, Sep 28, 2015 at 06:02:18PM -0400, David Turner wrote:
>> Add tests for the database backend.
>>
>> Signed-off-by: David Turner
>> ---
>> t/t1460-refs-be-db.sh| 1103
>>
83 matches
Mail list logo