On Mon, Mar 30, 2015 at 06:22:11PM -0700, Stefan Beller wrote:
From: John Keeping j...@keeping.me.uk
stream_blob_to_fd() always frees the filter now, so there is no memory
leak in entry.c:152 just before the `goto finish`.
Signed-off-by: John Keeping j...@keeping.me.uk
Signed-off-by:
Hi,
Currently, in git-cinnabar[1], I'm using a private namespace
(refs/cinnabar) for various different things:
- references to all the imported heads (which may or may not
match remote refs),
- the last refs used for a fetch (part of the refspec protocol for
remote-helpers)
- a branch
Johannes Sixt j...@kdbg.org writes:
Junio C Hamano gits...@pobox.com writes:
[...]
The patch was discussed here:
http://thread.gmane.org/gmane.comp.version-control.git/198125
The reason that this has not progressed any further is this response
in the thread:
Hello
I’ve copied a .git folder located at the root (/) of a filesystem, into another
directory (/home/mydir). If I issue a git rev-parse —show-toplevel I got /...
I would like to change the top-level to point to /home/mydir.
I’ve also tried to bare clone the original .git folder, but the new
On 2014-04-03 at 22:49, git-pa...@agt-the-walker.net wrote:
From: Jérôme Zago git-pa...@agt-the-walker.net
build-time is used everywhere else.
Signed-off-by: Jérôme Zago git-pa...@agt-the-walker.net
You are right, it is variable set during build process,
not after project is built.
ACK (for
.git/info/config.worktree is a pattern list that splits .git/config in
to sets, the common set that does not match the patterns and the
worktree set.
In normal worktree, or in the main worktree when git checkout --to
is used, both sets are stored in .git/config. Nothing interesting.
In linked
On Tue, Mar 31, 2015 at 7:14 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
The general principle is like in the last mail: .git/config is for
both shared and private keys of main worktree (i.e. nothing is
changed from today). .git/worktrees/xx/config.worktree is for
private keys only
On Tue, Mar 31, 2015 at 3:47 AM, Max Kirillov m...@max630.net wrote:
`git prune --worktrees` was pruning worktrees which were non-existent OR
expired, while it rather should prune those which are orphaned AND
expired, as git-checkout documentation describes. Fix it.
Add test 'not prune proper
Hi List,
So I was just sent a patch generated with 'git format-patch' that 'git
am' fails to apply correctly. It applies but part of the commit
message is lost.
The problem is that the commit message has lines like
--- Foo happened
did some things to handle Foo
--- Bar happened
Still
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
On 03/31/2015 06:17 PM, Junio C Hamano wrote:
Phillip Susi ps...@ubuntu.com writes:
I made a shallow clone of my repo, then used git bundle create to
pack it all into a bundle file, then cloned from that bundle.
I think the introdution of
Junio C Hamano gits...@pobox.com writes:
Samuel Williams space.ship.travel...@gmail.com writes:
I would expect if you push to an empty repo, it would update it
(because denyCurrentBranch = updateInstead).
Good finding.
I think the current implementation of updateInstead is set up to
Hi,
for frontends or scripts it would be helpful to be able to use git
status for getting the repository status compared to HEAD~1 instead of
only HEAD (as provided by git commit --amend in the pre-filled commit
message).
Thus, I'm suggesting to add a --amend parameter (or a parameter with a
After being surprised that git-ls-files expands pathspecs, here's a patch
that would have saved me.
---
Documentation/git-ls-files.txt | 9 +
Documentation/git-ls-tree.txt | 8
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Documentation/git-ls-files.txt
Junio C Hamano gits...@pobox.com writes:
I wonder if it will be the right way to get a correct result to
apply the difference to go from B to Z on top of an old commit when
you are side-porting.
Imagine you want to backport the same X-Y history by redoing the
merge Z on top of another child
Junio C Hamano gits...@pobox.com writes:
Sergey Organov sorga...@gmail.com writes:
1. How to calculate the set of commits to rebase.
2. How to rebase merge commits.
Can we leave (1) for a while at its current state and focus on (2)?
Perhaps. You would have to be careful though, so let
Sergey Organov sorga...@gmail.com writes:
1. How to calculate the set of commits to rebase.
2. How to rebase merge commits.
Can we leave (1) for a while at its current state and focus on (2)?
Perhaps. You would have to be careful though, so let me think aloud
a bit...
Suppose you started
Joey Hess jo...@joeyh.name writes:
After being surprised that git-ls-files expands pathspecs, here's a patch
that would have saved me.
---
I have a vague recollection that we originally wanted to
consistently say pathspec but some user friendliness folks wanted
to avoid the term as much as
Jeff King p...@peff.net writes:
On Tue, Mar 31, 2015 at 04:59:27PM +0200, Sven Strickroth wrote:
for frontends or scripts it would be helpful to be able to use git
status for getting the repository status compared to HEAD~1 instead of
only HEAD (as provided by git commit --amend in the
John Keeping j...@keeping.me.uk writes:
On Mon, Mar 30, 2015 at 06:22:11PM -0700, Stefan Beller wrote:
From: John Keeping j...@keeping.me.uk
stream_blob_to_fd() always frees the filter now, so there is no memory
leak in entry.c:152 just before the `goto finish`.
Signed-off-by: John
From: Mike Hommey m...@glandium.org
[...]
So I thought, since commits are already allowed in tree objects, for
submodules, why not add a bit to the mode that would tell git that
those commit object references are meant to always be there aka strong
reference, as opposed to the current weak
Junio C Hamano gits...@pobox.com writes:
I have a feeling that it is a bit too premature to specify the
details at such a low level as capaiblities are announced by
prefixing four-byte 'c', 'a', 'p', ':' in front and a multi-record
group has its element count at the beginning (or an end
Stefan Beller stefanbel...@gmail.com writes:
On 30.03.2015 22:06, Junio C Hamano wrote:
If add-line-range does not take ownership of
parent_range from us, shouldn't we be freeing it whether we called
it or not???
In my understanding it does take ownership of it. (According to my code
Jeff King wrote:
No tests, as we would need to be able to write to / to do
so.
t1509-root-worktree.sh is supposed to test the repository-at-/ case.
But I wouldn't be surprised if it's bitrotted, since people don't set
up a throwaway chroot or VM for tests too often.
[...]
The current
The basic idea is that in a triangular workflow, it's useful to be able
to refer to both @{upstream} and the place I would push to with a
shorthand. This idea was discussed over a year ago:
http://thread.gmane.org/gmane.comp.version-control.git/240144/focus=240198
I've found it useful since
Jeff King p...@peff.net writes:
I'm not sure that's true. The precedence changed, and the is it valid
check changed.
Yeah, I must have misread the review thread.
I only noticed that the postimage does not have any lines that v1
changed from the original, but at the word level there indeed are
We'll want to use this logic as a fallback when looking up
the pushremote, so let's pull it out into its own function.
We don't technically need to make this available outside of
remote.c, but doing so will provide a consistent API with
pushremote_for_branch, which we will add later.
When we create each branch struct, we fill in the
remote_name field from the config, and then fill in the
actual remote field based on that name. However, it turns
out that nobody really cares about this field. The only two
sites that access it are:
1. git-merge, which uses it to notice when
Hi,
On Wed, Apr 1, 2015 at 1:35 AM, Junio C Hamano gits...@pobox.com wrote:
It appears to me that Peff's squash is nullifying everything you
did, so a more truthful attribution might be
From: Jeff King p...@peff.net
commit log message
S-o-b: Jeff
S-o-b:
On Tue, Mar 31, 2015 at 11:25:58AM +0200, Cedric Gava wrote:
I’ve copied a .git folder located at the root (/) of a filesystem,
into another directory (/home/mydir). If I issue a git rev-parse
—show-toplevel I got /...
I would like to change the top-level to point to /home/mydir.
Try running
Paul Tan pyoka...@gmail.com writes:
On Mon, Mar 30, 2015 at 07:44:08AM -0400, Jeff King wrote:
Yes, this was adjusted in b3256eb (standardize and improve lookup rules
for external local repos, 2012-02-02), but I failed to update the
comment.
Your patch is certainly an improvement, but I
When we read the remote config from disk, we update a
default_remote_name variable if we see branch.*.remote
config for the current branch. This isn't wrong, or even all
that complicated, but it is a bit simpler (because it
reduces our overall state) to just lazily compute the
default when we need
On Tue, Mar 31, 2015 at 04:59:27PM +0200, Sven Strickroth wrote:
for frontends or scripts it would be helpful to be able to use git
status for getting the repository status compared to HEAD~1 instead of
only HEAD (as provided by git commit --amend in the pre-filled commit
message).
Thus,
When remote.c loads its config, it records the
branch.*.pushremote for the current branch along with the
global remote.pushDefault value, and then binds them into a
single value: the default push for the current branch. We
then pass this value (which may be NULL) to remote_get_1
when looking up a
On Tue, Mar 31, 2015 at 10:35:56AM -0700, Junio C Hamano wrote:
In b3256eb (standardize and improve lookup rules for external local
repos), enter_repo() was modified to use a different precedence ordering
of suffixes for DWIM of the repository path, and to ensure that the
repository path
In a triangular workflow, each branch may have two distinct
points of interest: the @{upstream} that you normally pull
from, and the destination that you normally push to. There
isn't a shorthand for the latter, but it's useful to have.
For instance, you may want to know which commits you haven't
If you create a git repository in the root directory with
git init /, we erroneously write a core.worktree entry.
That can be surprising if you later move the .git directory
to another path (which usually moves the relative working
tree, but is foiled if there is an explicit worktree set).
The
Mike Hommey m...@glandium.org writes:
So I thought, since commits are already allowed in tree objects, for
submodules, why not add a bit to the mode that would tell git that
those commit object references are meant to always be there aka strong
reference, as opposed to the current weak
Jakub Narębski jna...@gmail.com writes:
On 2014-04-03 at 22:49, git-pa...@agt-the-walker.net wrote:
From: Jérôme Zago git-pa...@agt-the-walker.net
build-time is used everywhere else.
Signed-off-by: Jérôme Zago git-pa...@agt-the-walker.net
You are right, it is variable set during build
only now, Make 2015 the best one yourself!
http://www.google.com/url?q=%68%74tp%3A%2F%2F%63%63%62%6ftcc%2ec%6369.r%75%2F%23852%39%6e%64%35%6d%31%6c6%67%74o%77sa=Dsntz=1usg=AFQjCNHmdUNh2YMyh5HH4xz0siXbLrN_CQ
--
To
On March 31, 2015 3:55 PM Philip Oakley wrote:
From: Mike Hommey m...@glandium.org
[...]
So I thought, since commits are already allowed in tree objects, for
submodules, why not add a bit to the mode that would tell git that
those commit object references are meant to always be there aka
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
I made a shallow clone of my repo, then used git bundle create to pack
it all into a bundle file, then cloned from that bundle. The initial
shallow clone has a .git/shallow file that identifies it as a shallow
clone ( and I guess keeps things from
I'm on holiday this week, so I'll not get a chance to look at these
properly until next week.
Luke
On 30 March 2015 at 04:03, Junio C Hamano gits...@pobox.com wrote:
Vitor Antunes vitor@gmail.com writes:
* Modify source file (file2) before copying the file.
* Check that only file2 is
On Mon, Mar 30, 2015 at 07:44:08AM -0400, Jeff King wrote:
Yes, this was adjusted in b3256eb (standardize and improve lookup rules
for external local repos, 2012-02-02), but I failed to update the
comment.
Your patch is certainly an improvement, but I think there are more
inaccuracies in
On Tue, Mar 31, 2015 at 4:14 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Mike Hommey wrote:
Octopus merges are limited to 16 parents.
The note about this in fast-import is out of date (e.g., see
t/t7602-merge-octopus-many.sh and v1.6.0-rc0~194, 2008-06-27). How
about this patch?
Ahh, I
I have set up a remote repository like so:
remote $ cat .git/config
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
sharedrepository = 1
worktree = /srv/http/www.site.com
[receive]
denyNonFastforwards = true
denyCurrentBranch = updateInstead
This repo is
* Modify source file (file2) before copying the file.
* Check that only file2 is the source in the output of p4 filelog.
* Remove all case statements and replace them with simple tests to check
that source is file2.
Signed-off-by: Vitor Antunes vitor@gmail.com
---
t/t9814-git-p4-rename.sh
On Tue, Mar 31, 2015 at 04:14:49PM -0700, Jonathan Nieder wrote:
Mike Hommey wrote:
Octopus merges are limited to 16 parents.
The note about this in fast-import is out of date (e.g., see
t/t7602-merge-octopus-many.sh and v1.6.0-rc0~194, 2008-06-27). How
about this patch?
Aha! I wasn't
Samuel Williams space.ship.travel...@gmail.com writes:
I would expect if you push to an empty repo, it would update it
(because denyCurrentBranch = updateInstead).
Good finding.
I think the current implementation of updateInstead is set up to
bootstrap from an empty repository but only
On Tue, Mar 31, 2015 at 1:38 PM, Jeff King p...@peff.net wrote:
Signed-off-by: Jeff King p...@peff.net
---
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 0796118..5d9df25 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -98,6 +98,31
Jeff King p...@peff.net writes:
Let's make this more like the fetch-remote config. We'll
record the pushremote for each branch, and then explicitly
compute the correct remote for the current branch at the
time of reading.
Signed-off-by: Jeff King p...@peff.net
---
remote.c | 41
On 1 April 2015 at 00:03, David Lang da...@lang.hm wrote:
On Tue, 31 Mar 2015, Øyvind A. Holm wrote:
openhub.net (formerly ohloh.net) has an interesting comparison of
the number of public repositories on the net, based on searches of
popular hosting services. This comparison is available at
Phillip Susi ps...@ubuntu.com writes:
I made a shallow clone of my repo, then used git bundle create to pack
it all into a bundle file, then cloned from that bundle.
I think the introdution of shallow clone feature broke git bundle create
by not teaching it that its shallow boundaries are
On Tue, Mar 31, 2015 at 01:50:05PM -0700, Junio C Hamano wrote:
Getting rid of it drops one potential source of confusion:
is the value the match for remote_name, or is it the
remote we would fetch from when on that branch (i.e., does
it fall back to origin)?
I had to read the above
Jeff King p...@peff.net writes:
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 0796118..5d9df25 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -98,6 +98,31 @@ some output processing may assume ref names in UTF-8.
On Tue, 31 Mar 2015, Øyvind A. Holm wrote:
openhub.net (formerly ohloh.net) has an interesting comparison of the
number of public repositories on the net, based on searches of popular
hosting services. This comparison is available at
https://www.openhub.net/repositories/compare and shows an
openhub.net (formerly ohloh.net) has an interesting comparison of the
number of public repositories on the net, based on searches of popular
hosting services. This comparison is available at
https://www.openhub.net/repositories/compare and shows an estimated
market share between Bazaar, CVS, Git,
On Tue, Mar 31, 2015 at 01:37:35PM -0700, Junio C Hamano wrote:
When we read the remote config from disk, we update a
default_remote_name variable if we see branch.*.remote
config for the current branch. This isn't wrong, or even all
that complicated, but it is a bit simpler (because it
Jeff King p...@peff.net writes:
When we read the remote config from disk, we update a
default_remote_name variable if we see branch.*.remote
config for the current branch. This isn't wrong, or even all
that complicated, but it is a bit simpler (because it
reduces our overall state) to just
Jeff King p...@peff.net writes:
When we create each branch struct, we fill in the
remote_name field from the config, and then fill in the
actual remote field based on that name. However, it turns
out that nobody really cares about this field. The only two
sites that access it are:
1.
Jeff King p...@peff.net writes:
On Tue, Mar 31, 2015 at 01:50:05PM -0700, Junio C Hamano wrote:
it first looked somewhat unnatural that you kept the name with which
you need to trigger a search for the structure, instead of keeping
the structure, one of whose field is its name already.
...
On 1 April 2015 at 00:20, Junio C Hamano gits...@pobox.com wrote:
Øyvind A. Holm su...@sunbase.org writes:
The graphs are pretty interesting:
https://github.com/sunny256/openhub-repositories/blob/master/graph/relative.svg
Graphs of relative growth between the various version control
Dear Invited Author,
You could also upload your invited paper in our conferences in Zakynthos
Island, Greece,
July 16-20, 2015. Check them via www. inase. org and www. cscc. co
Invited Paper implies journal publication in ISI (Web of Knowledge) and SCOPUS
and double
time of presentation
On Tue, Mar 31, 2015 at 02:37:25PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 0796118..5d9df25 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -98,6 +98,31 @@
The latest maintenance release Git v2.3.5 is now available at
the usual places. It is comprised of 31 non-merge commits since
v2.3.4, contributed by 11 people, 2 of which are new faces.
This hopefully will be the last update for v2.3.x series before the
next feature release v2.4, as we flushed
Jeff King p...@peff.net writes:
+static char *tracking_ref_for(struct remote *remote, const char *refname)
+{
+ char *ret;
+
+ ret = apply_refspecs(remote-fetch, remote-fetch_refspec_nr, refname);
+ if (!ret)
+ die(_(@{push} has no local tracking branch for remote '%s'),
Mike Hommey wrote:
Octopus merges are limited to 16 parents.
The note about this in fast-import is out of date (e.g., see
t/t7602-merge-octopus-many.sh and v1.6.0-rc0~194, 2008-06-27). How
about this patch?
-- 8--
Subject: fast-import doc: remove suggested 16-parent limit
Merges with an
On Wed, 1 Apr 2015, Øyvind A. Holm wrote:
On 1 April 2015 at 00:20, Junio C Hamano gits...@pobox.com wrote:
Øyvind A. Holm su...@sunbase.org writes:
The graphs are pretty interesting:
https://github.com/sunny256/openhub-repositories/blob/master/graph/relative.svg
Graphs of relative growth
Jonathan Nieder wrote:
How
about this patch?
I think I botched the wording. Here's a second try.
-- 8 --
Subject: fast-import doc: remove suggested 16-parent limit
Merges with an absurd number of parents are still a bad idea
If a Perforce server is configured to automatically set +l (exclusive lock) on
add of certain file types, git p4 submit will fail during getP4OpenedType, as
the regex doesn't expect the trailing '*exclusive*' from p4 opened:
//depot/file.png#1 - add default change (binary+l) *exclusive*
On Tue, Mar 31, 2015 at 05:41:02PM -0400, Eric Sunshine wrote:
On Tue, Mar 31, 2015 at 1:38 PM, Jeff King p...@peff.net wrote:
Signed-off-by: Jeff King p...@peff.net
---
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 0796118..5d9df25 100644
---
On Tue, Mar 31, 2015 at 01:23:23PM -0700, Junio C Hamano wrote:
Mike Hommey m...@glandium.org writes:
So I thought, since commits are already allowed in tree objects, for
submodules, why not add a bit to the mode that would tell git that
those commit object references are meant to always
Mike Hommey m...@glandium.org writes:
Octopus merges are limited to 16 parents.
Huh?
--
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
Ping? The original version of this got some discussion, but this version -
nothing.
Thanks,
Keni
On Feb 1, 2015, at 5:32 PM, Kenneth Lorber k...@his.com wrote:
On Dec 18, 2014, at 2:18 PM, Junio C Hamano gits...@pobox.com wrote:
Kenneth Lorber k...@his.com writes:
Bug: exit codes
On Tue, Mar 31, 2015 at 5:10 PM, Kenneth Lorber k...@his.com wrote:
Ping? The original version of this got some discussion, but this version -
nothing.
Pong? I do not know what you meant by this version.
Have you followed Documentaiton/SubmittingPatches? Otherwise the
mailing list may have
74 matches
Mail list logo
