Am 07.10.2015 um 00:00 schrieb Stefan Beller:
So a discussing started in a Gerrit change [1] if we want to name it
submodule or subproject.
We decided to stick with the git core convention of naming it
subproject for now.
What convention? Isn't diff output the only place where we talk
about sub
Hi Johannes
On 2015-10-06 at 16:30:36 +0200, Johannes Schindelin
wrote:
> On 2015-10-06 15:51, Tobias Klauser wrote:
>
> > On 2015-10-06 at 15:16:12 +0200, Johannes Schindelin
> > wrote:
> >>
> >> On 2015-10-06 14:15, Tobias Klauser wrote:
> >> > prented_sha1_file() always returns 0 and its on
Stijn De Ruyck venit, vidit, dixit 06.10.2015 15:03:
> Hello,
>
> Consider a repository with a develop branch tracking origin/develop and where
> HEAD = 545a36f = develop = origin/develop.
> Tested with Git 2.4.3 and 1.8.3.4 on Linux.
>
> 1) git checkout develop
> 2) git branch | head -1 (or git
Yes it is the tip.
So all I'm doing is checking out the exact same commit (the tip of a branch),
but in different ways and in different sequences. The result on disk is the
same, but the issue is git branch/status doesn't always reflect what I just
did...
If I do git checkout origin/develop, g
[Please make sure to bottom-post or reply-inline on the git-ml.]
Stijn De Ruyck venit, vidit, dixit 07.10.2015 11:57:
> Yes it is the tip.
> So all I'm doing is checking out the exact same commit (the tip of a branch),
> but in different ways and in different sequences. The result on disk is the
On 10/07/2015 03:25 AM, David Turner wrote:
> 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.
>>>
>>
Hi all,
I have a concern with r10k used by Puppet.
r10k is a Puppet tool based on the git workflow.
My concern is that one important file (Puppetfile) needs to be pushed to my
remote repository so I can check the changes I commited.
To do that, I need to commit changes (included to the
Other date formats already have their format specifiers and so should
these, so they will be available in pretty format aliases as well.
Signed-off-by: SZEDER Gábor
---
Documentation/pretty-formats.txt | 4
pretty.c | 6 ++
2 files changed, 10 insertions(+)
diff
Rudy YAYON writes:
> My concern is that one important file (Puppetfile) needs to be pushed to my
> remote repository so I can check the changes I commited.
> To do that, I need to commit changes (included to the Puppetfile) then I
> need to push it to the remote repository.
>
> Once I w
Signed-off-by: Tobias Klauser
---
Documentation/git-interpret-trailers.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-interpret-trailers.txt
b/Documentation/git-interpret-trailers.txt
index d6d9231..0ecd497 100644
--- a/Documentation/git-interpret-trail
On Wed, Oct 7, 2015 at 12:33 AM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> If you look closely, thats only for the local branches, the remotes
>> have `align` atom when
>> printing in verbose.
>
> Yes, but that's already one thing factored out of the if, even if it's
> just for local.
>
>
Michael Haggerty writes:
>> Right now, for cross-backend reads/writes, the lmdb code cheats. It
>> simply does the write directly and immediately. This means that these
>> portions of transactions cannot be rolled back. That's clearly bad.
>
> That's a really good point.
>
> I hate to break it
Johannes Schindelin writes:
> As to the patch, I cannot speak for Junio, of course, but my
> preference would be to keep the return type. Traditionally, functions
> that can fail either die() or return an int; non-zero indicates an
> error. In this case, it seems that we do not have any condition
Johannes Schindelin writes:
> It is quite possible for, say, a remote HEAD to become broken, e.g.
> when the default branch was renamed.
>
> We should still be able to pack our objects when such a thing happens;
> simply ignore broken symrefs (because they cannot matter for the packing
> process
Johannes Schindelin writes:
> 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 windo
Karthik Nayak writes:
> On Wed, Oct 7, 2015 at 12:33 AM, Matthieu Moy
> wrote:
>
>> To go a bit further, you can pre-build a string or strbuf aligned_short
>> with value like "%%(align:20,left)%%(refname:short)%%(end)" and use it
>> where needed (it's not a constant because you have to introduce
On Wed, Oct 7, 2015 at 11:28 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> On Wed, Oct 7, 2015 at 12:33 AM, Matthieu Moy
>> wrote:
>>
>>> To go a bit further, you can pre-build a string or strbuf aligned_short
>>> with value like "%%(align:20,left)%%(refname:short)%%(end)" and use it
>>>
On 10/07/2015 03:51 AM, David Turner wrote:
> On Mon, 2015-10-05 at 17:47 +0200, Michael Haggerty wrote:
>> On 09/29/2015 12:02 AM, David Turner wrote:
>>> Add a database backend for refs using LMDB. [...]
>>
>> I think you have said before that if one writer holds the write lock on
>> the DB, the
Michael Haggerty writes:
> I'm really happy about your work.
>
> Regarding strategy: I think a good approach would be to get as much of
> the preparatory work as possible (the abstraction and separation of
> refs-be-files) to the point where it can be merged before there is too
> much more code c
On Wed, 2015-10-07 at 20:31 +0200, Michael Haggerty wrote:
> On 10/07/2015 03:51 AM, David Turner wrote:
> > On Mon, 2015-10-05 at 17:47 +0200, Michael Haggerty wrote:
> >> On 09/29/2015 12:02 AM, David Turner wrote:
> >>> Add a database backend for refs using LMDB. [...]
> >>
> >> I think you hav
SZEDER Gábor writes:
> @@ -120,6 +120,8 @@ The placeholders are:
> - '%at': author date, UNIX timestamp
> - '%ai': author date, ISO 8601-like format
> - '%aI': author date, strict ISO 8601 format
> +- '%as': author date, short format
> +- '%aR': author date, raw format
Hmmm, are these two a g
Compare to a patch[1] I sent a while back and the discussion on it.
[1] https://www.mail-archive.com/git@vger.kernel.org/msg70474.html
--
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.
On Wed, 2015-10-07 at 18:00 +0200, Michael Haggerty wrote:
> On 10/07/2015 03:25 AM, David Turner wrote:
> > 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 thr
Stefan Beller writes:
> Compare to a patch[1] I sent a while back and the discussion on it.
>
> [1] https://www.mail-archive.com/git@vger.kernel.org/msg70474.html
It is not clear what conclusion you want others to draw from the
comparison, I am afraid.
I am guessing that you are in favor of dro
Johannes Schindelin writes:
> As to the patch, I cannot speak for Junio, of course, but my
> preference would be to keep the return type. Traditionally, functions
> that can fail either die() or return an int; non-zero indicates an
> error. In this case, it seems that we do not have any condition
On Wed, Oct 7, 2015 at 2:14 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> Compare to a patch[1] I sent a while back and the discussion on it.
>>
>> [1] https://www.mail-archive.com/git@vger.kernel.org/msg70474.html
>
> It is not clear what conclusion you want others to draw from the
> co
Stefan Beller writes:
>> By the way, it is not a very good comparison, though. The patch in
>> the old thread deliberately attempted to discard a useful piece of
>> information. The information the patch in this thread attempts to
>> discard is not so useful, as there currently is nobody that r
I plan to start merging the topics that have been cooking just above
'next' down in the coming days.
Thanks.
--
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
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 tip of 'next' has been rewound and rebuilt. I plan to start
merging the topics that have been cooking just above 'next' down in
the coming
Since 77d604c (Enhanced sq_quote(), 10 Oct 2005), the
comment at the beginning of quote.c is broken.
Let's fix it.
Signed-off-by: Christian Couder
---
The only change in this v2 is the added Signed-off-by ;-)
Sorry for the spam.
quote.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/quote.
A big comment at the beginning of quote.c is really
related to sq_quote_buf(), so let's move it in front
of this function.
Signed-off-by: Christian Couder
---
quote.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/quote.c b/quote.c
index 890885a..fe884d2 100644
--
On 10/07/2015 09:20 PM, David Turner wrote:
> On Wed, 2015-10-07 at 20:31 +0200, Michael Haggerty wrote:
>> [...]
>> I'm really happy about your work.
>>
>> Regarding strategy: I think a good approach would be to get as much of
>> the preparatory work as possible (the abstraction and separation of
Thanks, will queue.
--
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
On 10/07/2015 10:55 PM, David Turner wrote:
> On Wed, 2015-10-07 at 18:00 +0200, Michael Haggerty wrote:
>>
>> That's a really good point.
>>
>> I hate to break it to you, but the handling of symrefs in Git is already
>> a mess. HEAD is the only symref that I would really trust to work
>> correctly
Alex Henrie writes:
> 2015-10-05 23:38 GMT-06:00 Junio C Hamano :
>> 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 figured out how to reproduce the problem: Running gitk with any
parameter causes it to crash. For example:
$ gitk e334ca2b9d9a48a1636f73fc12606b6eaa58b7d9
Error in startup script: bad menu entry index "Edita la vista..."
while executing
".bar.view entryconf [mca "Edit view..."] -state normal
On Thu, Oct 1, 2015 at 3:39 PM, Jacob Keller wrote:
> From: Jacob Keller
>
> Create a new expansion function, expand_loose_notes_ref which will
> expand any ref using get_sha1, but falls back to expand_notes_ref if
> this fails. The contents of the strbuf will be either the hex string of
> the sh
On Wed, Oct 7, 2015 at 9:33 AM, Andreas Schwab wrote:
> Rudy YAYON writes:
>
>> My concern is that one important file (Puppetfile) needs to be pushed to
>> my remote repository so I can check the changes I commited.
>> To do that, I need to commit changes (included to the Puppetfile) then I
On Mon, Jul 13, 2015 at 09:35:40AM -0700, Junio C Hamano wrote:
> What is interesting is to think what should happen when amlog@{1}
> is given. The version with your patch gives the same output as we
> saw earlier, because amlog@{1} tree exists, but does not know about
> your patch (yet), so does
init_notes() is the main point of entry to the notes API. It ensures
that the input can be used as ref, because it needs a ref to update to
store notes tree after modifying it.
There however are many use cases where notes tree is only read, e.g.
"git log --notes=...". Any notes-shaped treeish cou
Hello,
I was trying to use multiple indexes earlier, and ran into an issue which I've
summarised into a test case:
$ git init
$ touch file1 && git add file1 && git commit -m "file1"
$ git branch release
$ touch file2 && git add file2 && git commit -m "file2"
$ cp .git/index .git/indexMaster
$ g
df062010 (filter-branch: avoid passing commit message through sed)
introduced a regression when filtering gpg signed commits. The gpgsig
header is multi-line and contains an empty line. Although the signature
is indented, making the line a whitespace only line, this still results
in $header_line
42 matches
Mail list logo
