On Wed, Jun 10, 2015 at 7:56 AM, Junio C Hamano wrote:
> Paul Tan writes:
>
>> /**
>> + * Appends merge candidates from FETCH_HEAD that are not marked
>> not-for-merge
>> + * into merge_heads.
>> + */
>
> Hmph, I vaguely recall doing that in C elsewhere already, even
> though I do not remember
Mike Rappazzo writes:
> In the second loop, I changed it to recalculate the presented message
> when the re-ordered commit is added:
>
> + if test -n "${format}"
> + then
> +msg_content=$(git log -n 1 --format="${format}" ${squash})
>
> That is the "$rest".
Ahh, yeah, I m
Junio C Hamano writes:
> Mike Hommey writes:
>
>> It can be useful to have grafts or replace refs for specific use-cases while
>> keeping the default "view" of the repository pristine (or with a different
>> set of grafts/replace refs).
>>
>> It is possible to use a different graft file with GIT
On 13/06, Johannes Löthberg wrote:
Git should fail to clone if trying to clone from an non-existing
ref namespace, since it's the same as a non-existing repository
Signed-off-by: Johannes Löthberg
---
Changes since v1:
* Fixed the namespace check, since I apparently forgot to check with a
ba
Mike Hommey writes:
> It can be useful to have grafts or replace refs for specific use-cases while
> keeping the default "view" of the repository pristine (or with a different
> set of grafts/replace refs).
>
> It is possible to use a different graft file with GIT_GRAFT_FILE, but while
> replace
On Fri, Jun 12, 2015 at 03:14:25PM -0700, Junio C Hamano wrote:
> "brian m. carlson" writes:
>
> > While I did run the tests between each commit, I hadn't noticed they
> > were failing because I don't have Apache installed on my laptop, so they
> > were silently skipped. I'll resubmit with that
Nguyễn Thái Ngọc Duy writes:
> When --patch or pathspecs are passed to git checkout, the working tree
> will not be switching branch, so there's no need to check if the branch
> that we are running checkout on is already checked out.
Yeah, I agree that having this check in parse_branchname_arg(
Git should fail to clone if trying to clone from an non-existing
ref namespace, since it's the same as a non-existing repository
Signed-off-by: Johannes Löthberg
---
Changes since v1:
* Fixed the namespace check, since I apparently forgot to check with a
bare repo in my last test. D'oh.
Two
On Fri, Jun 12, 2015 at 6:05 PM, Junio C Hamano wrote:
> But because you overwrite the $message variable you read from the
> original insn sheet (which uses the custom format) and compute $rest
> based on the default "%s" and store that in "$1.sq", lines in
> "$1.sq" do not know anything about the
"brian m. carlson" writes:
> While I did run the tests between each commit, I hadn't noticed they
> were failing because I don't have Apache installed on my laptop, so they
> were silently skipped. I'll resubmit with that fixed.
It is somewhat strange that _only_ http part had failures like thi
Mike Rappazzo writes:
> On Fri, Jun 12, 2015 at 4:56 PM, Junio C Hamano wrote:
> ...
>> The autosquash part somehow makes me feel uneasy, though. The
>> feature fundamentally has to have %s as the first thing in the
>> format to work, but by making the format overridable, you are
>> potentially
On Fri, Jun 12, 2015 at 2:41 PM, Jeff King wrote:
> On Fri, Jun 12, 2015 at 02:39:01PM -0700, Stefan Beller wrote:
>
>> > - if (starts_with(buf, "PACK") || starts_with(buf + 1, "PACK")) {
>> > + if (starts_with(buf, "PACK") || starts_with(buf, "\1PACK")) {
>>
>> This answers the questi
On Fri, Jun 12, 2015 at 02:39:01PM -0700, Stefan Beller wrote:
> > - if (starts_with(buf, "PACK") || starts_with(buf + 1, "PACK")) {
> > + if (starts_with(buf, "PACK") || starts_with(buf, "\1PACK")) {
>
> This answers the question on the previous patch actually, maybe the
> code could
On Fri, Jun 12, 2015 at 2:28 PM, Jeff King wrote:
> To find the start of the pack data, we accept the word PACK
> at the beginning of any sideband channel, even though what
> we really want is to find the pack data on channel 1. In
> practice this doesn't matter, as sideband-2 messages tend to
> s
On Fri, Jun 12, 2015 at 2:28 PM, Jeff King wrote:
> We carefully check that our pkt buffer has enough characters
> before seeing if it starts with "PACK". The intent is to
> avoid reading random memory if we get a short buffer like
> "PAC".
>
> However, we know that the traced packets are always
>
To find the start of the pack data, we accept the word PACK
at the beginning of any sideband channel, even though what
we really want is to find the pack data on channel 1. In
practice this doesn't matter, as sideband-2 messages tend to
start with "error:" or similar, but it is a good idea to be
ex
We carefully check that our pkt buffer has enough characters
before seeing if it starts with "PACK". The intent is to
avoid reading random memory if we get a short buffer like
"PAC".
However, we know that the traced packets are always
NUL-terminated. They come from one of these sources:
1. A st
When debugging the pack protocol, it is sometimes useful to
store the verbatim pack that we sent or received on the
wire. Looking at the on-disk result is often not helpful for
a few reasons:
1. If the operation is a clone, we destroy the repo on
failure, leaving nothing on disk.
2. If t
On Fri, Jun 12, 2015 at 02:00:05PM -0400, Jeff King wrote:
> When I added GIT_TRACE_PACKET long ago, I had always intended to
> follow-up with a GIT_TRACE_PACKFILE. The former stops tracing when we
> get to the binary data, but I had intended the latter to store the pure
> on-the-wire packfile tra
On Sat, Jun 13, 2015 at 1:57 AM, Junio C Hamano wrote:
> Christian Couder writes:
>
>> I think it is needed later when "struct ref_sort" is moved into
>> ref-filter.h, because then the used_atom[] array is not moved.
>
> Now I am confused. used_atom[] is the mechanism we use to give a
> small in
It only needs the '%s' for the autosquash when the todo/instruction
list order is determined. For this, in the rearrange_squash function,
it will re-calculate the message:
+ test -z "${format}" || message=$(git log -n 1
--format="%s" ${sha1})
Additionally, it may also rerun the log
Johannes Löthberg writes:
> + if (get_git_namespace() && !symref.items) {
> + die("git upload-pack: tried to clone from empty namespace");
> + }
Is this sufficient?
get_git_namespace() returns environment.c::namespace, which is set
up in setup_git_env() by calling expand_nam
Michael Rappazzo writes:
> A config option 'rebase.instructionFormat' can override the
> default 'oneline' format of the rebase instruction list.
>
> Since the list is parsed using the left, right or boundary mark plus
> the sha1, they are prepended to the instruction format.
>
> Signed-off-by: M
On 2015-06-12 06.49, Scott Schmit wrote:
> 'git checkout' with or `--patch` is used to restore modified or
> deleted paths to their original contents from the index or replace paths
> with the contents from a named (most often a commit-ish)
> instead of switching branches.
---
I w
On Thu, Jun 11, 2015 at 01:00:04PM -0700, Junio C Hamano wrote:
> Fetched that branch, built and found out that it does not pass the
> tests, at least these (there may be others I do not usually run that
> are broken by this series; I dunno), so I'll discard what I fetched
> for now X-<.
>
> Test
Christian Couder writes:
> I think it is needed later when "struct ref_sort" is moved into
> ref-filter.h, because then the used_atom[] array is not moved.
Now I am confused. used_atom[] is the mechanism we use to give a
small integer to each atom used in the %(placeholder) string, so
that we d
Git should fail to clone if trying to clone from an non-existing
ref namespace, since it's the same as a non-existing repository
Signed-off-by: Johannes Löthberg
---
In version 4 of the ArchLinux User Repository, which is a hosting
platform for recepies for building Arch packages, we use Git to
On Fri, Jun 12, 2015 at 8:29 PM, Karthik Nayak wrote:
> On 06/12/2015 11:34 PM, Junio C Hamano wrote:
>>
>> Karthik Nayak writes:
>>
What change since 9f613dd do you have in mind, exactly, though?
>>>
>>>
>>> Well initially the atoms were indexed into used_atom array, which
>>> later was rem
Matthieu Moy writes:
> Karthik Nayak writes:
>
>> +filter_refs(&array, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN,
>> &filter);
>
> I think it is more common to have options at the end, so I'd write it as
>
> filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN);
>
>
The latest patch series LGTM. It's a pity about the more complicated
structure with two different ways to query the changes list, but it
does look hard to make it any simpler.
Lex Spoon
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.ker
On Tue, Jun 9, 2015 at 1:25 AM, Johannes Schindelin
wrote:
> Hi Luis,
>
> On 2015-06-08 20:34, Luis R. Rodriguez wrote:
>> Based on a cursory review of the git code I get the impression that
>> GNU diff and git 'diff' do not share any code for the possible diff
>> algorithms.
>
> Indeed, Git's dif
On Fri, Jun 12, 2015 at 02:20:45PM -0400, Jeff King wrote:
> > > Notice GitHub prints "remote: fatal: pack exceeds maximum allowed
> > > size". That interrupted my "Writing objects" progress meter, and then
> > > git push just kept going and wrote really really fast (170 MiB/s!)
> > > until the en
On 06/12/2015 11:34 PM, Junio C Hamano wrote:
Karthik Nayak writes:
What change since 9f613dd do you have in mind, exactly, though?
Well initially the atoms were indexed into used_atom array, which
later was removed. Hence the comment becomes obsolete.
Later in which commit? In builtin/fo
On Fri, Jun 12, 2015 at 02:12:56PM -0400, Jeff King wrote:
> > $ git push --all g...@github.com:spearce/wk.git
> > Counting objects: 2752427, done.
> > Delta compression using up to 12 threads.
> > Compressing objects: 100% (442684/442684), done.
> > remote: fatal: pack exceeds maximum allowed siz
The term "index" is translated as "Staging-Area" to
match a majority of German books and to not confuse
Git beginners who don't know about Git's index.
"Staging Area" is used in German books as a thing where
content can be staged for commit. While the translation
is good for those kind of message
On Fri, Jun 12, 2015 at 10:31:33AM -0700, Shawn Pearce wrote:
> I did something stupid like trying to push a copy of WebKit[1] into my
> GitHub account. This is ~5.2 GiB of data, which GitHub prefers not to
> accept. Ok ...
Heh, yeah. We cap it at 2G, and if you are going to have a WebKit fork,
w
Karthik Nayak writes:
>> What change since 9f613dd do you have in mind, exactly, though?
>
> Well initially the atoms were indexed into used_atom array, which
> later was removed. Hence the comment becomes obsolete.
Later in which commit? In builtin/for-each-ref.c in the version
after applying
On Fri, Jun 12, 2015 at 08:07:36AM -0700, Junio C Hamano wrote:
> Johannes Sixt writes:
>
> > What is the problem with the current fetch-pack implementation? Does
> > it remove a bogus packfile after download? Does it abort during
> > download when it detects a broken packfile? Does --keep not d
Shawn Pearce writes:
> I did something stupid like trying to push a copy of WebKit[1] into my
> GitHub account. This is ~5.2 GiB of data, which GitHub prefers not to
> accept. Ok ...
> ...
> Shouldn't git push realize its stream is broken and stop writing when
> the peer is all like "uh, no, I'm
On 06/12/2015 11:10 PM, Junio C Hamano wrote:
Karthik Nayak writes:
The comment in 'ref_sort' hasn't been changed 9f613dd.
Bad grammar? "hasn't been changed since 9f613dd", perhaps?
Yes! thanks :)
But more importantly, don't just give an abbreviated object name. I
think "the comment h
Karthik Nayak writes:
> The comment in 'ref_sort' hasn't been changed 9f613dd.
Bad grammar? "hasn't been changed since 9f613dd", perhaps?
But more importantly, don't just give an abbreviated object name. I
think "the comment hasn't changed since the for-each-ref command was
originally introdu
On 06/12/2015 11:00 PM, Junio C Hamano wrote:
Karthik Nayak writes:
Extract two helper functions out of grab_single_ref(). Firstly,
new_refinfo() which is used to allocate memory for a new refinfo
structure and copy the objectname, refname and flag to it.
Secondly, match_name_as_path() which w
I did something stupid like trying to push a copy of WebKit[1] into my
GitHub account. This is ~5.2 GiB of data, which GitHub prefers not to
accept. Ok ...
$ git push --all g...@github.com:spearce/wk.git
Counting objects: 2752427, done.
Delta compression using up to 12 threads.
Compressing objects
Karthik Nayak writes:
> Extract two helper functions out of grab_single_ref(). Firstly,
> new_refinfo() which is used to allocate memory for a new refinfo
> structure and copy the objectname, refname and flag to it.
> Secondly, match_name_as_path() which when given an array of patterns
> and the
On Fri, Jun 12, 2015 at 11:07 AM, Junio C Hamano wrote:
>> What is the problem with the current fetch-pack implementation? Does
>> it remove a bogus packfile after download? Does it abort during
>> download when it detects a broken packfile? Does --keep not do what
>> you need?
>
> Doesn't the inc
On Fri, Jun 12, 2015 at 2:22 AM, Johannes Sixt wrote:
>
> Am 11.06.2015 um 20:59 schrieb Augie Fackler:
>>
>> When developing server software, it's often helpful to save a
>> potentially-bogus pack for later analysis. This makes that trivial,
>> instead of painful.
>
>
> When you develop server so
Scott Schmit writes:
> On Wed, Jun 10, 2015 at 08:05:32AM -0700, Junio C Hamano wrote:
>
>> How about this?
>>
>> 'git checkout' with or `--patch` is used to restore
>> modified or deleted paths to their original contents from
>> the index file or from a named (most oft
Alex Cornejo writes:
> Junio C Hamano pobox.com> writes:
>
>> Hmmm, I do not seem to be able to do this, though.
>>
>> $ ln -s $HOME/g/share/git-core/templates /var/tmp/git-template
>> $ cd /var/tmp
>> $ git init --template=/var/tmp/git-template new
>> $ find new
Junio C Hamano pobox.com> writes:
> Hmmm, I do not seem to be able to do this, though.
>
> $ ln -s $HOME/g/share/git-core/templates /var/tmp/git-template
> $ cd /var/tmp
> $ git init --template=/var/tmp/git-template new
> $ find new/.git -type l
> ... nothin
On Fri, Jun 12, 2015 at 4:53 AM, Panagiotis Astithas wrote:
> On Fri, Jun 12, 2015 at 6:46 AM, Eric Sunshine
> wrote:
>> On Thu, Jun 11, 2015 at 10:37 AM, Panagiotis Astithas
>> wrote:
>>> The output of "pmset -g batt" changed at some point from
>>> "Currently drawing from 'AC Power'" to the s
Alex Cornejo writes:
> I was surprised to see that when using git-init, if the template folder
> is itself a symlink, then the contents of the template is NOT copied to
> the resulting git repository, but instead each individual file is
> symlinked.
Hmmm, I do not seem to be able to do this, tho
Johannes Sixt writes:
> What is the problem with the current fetch-pack implementation? Does
> it remove a bogus packfile after download? Does it abort during
> download when it detects a broken packfile? Does --keep not do what
> you need?
Doesn't the incoming data still go through the fattenin
Panagiotis Astithas writes:
> On Fri, Jun 12, 2015 at 6:46 AM, Eric Sunshine
> wrote:
>> On Thu, Jun 11, 2015 at 10:37 AM, Panagiotis Astithas
>> wrote:
>>> The output of "pmset -g batt" changed at some point from
>>> "Currently drawing from 'AC Power'" to the slightly different
>>> "Now draw
On Fri, Jun 12, 2015 at 09:29:58PM +0800, Paul Tan wrote:
> The test expects that "chmod -r ~/.git-credentials" would make it
> unreadable to the user, and thus needs the SANITY prerequisite.
Yup, looks obviously correct to me. Thanks for a quick turnaround.
-Peff
--
To unsubscribe from this lis
The test expects that "chmod -r ~/.git-credentials" would make it
unreadable to the user, and thus needs the SANITY prerequisite.
Reported-by: Jean-Yves LENHOF
Signed-off-by: Paul Tan
---
t/t0302-credential-store.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t0302-cre
On Fri, Jun 12, 2015 at 03:17:40PM +0200, Andreas Schwab wrote:
> Philippe De Muyter writes:
>
> > I am bisecting the kernel tree between v3.17 and v3.18, and 'git describe'
> > is used by the kernel compilation process. Why do I get a version
> > v3.17-rc7-1626-ga4b4a2b, that seems outside of [
Philippe De Muyter writes:
> I am bisecting the kernel tree between v3.17 and v3.18, and 'git describe'
> is used by the kernel compilation process. Why do I get a version
> v3.17-rc7-1626-ga4b4a2b, that seems outside of [v3.17..v3.18] ?
Because your are testing a side branch that is based on v
On Fri, Jun 12, 2015 at 5:43 PM, Jean-Yves LENHOF
wrote:
> Hi,
>
> I tried to compile git 2.4.3 using root on a server. It failed on test 41 of
> t0302-credential-store.sh
> In fact even if we remove read access on a directory, root still can acces
> this directory.
> Using a not privilegied user
Hi,
I am bisecting the kernel tree between v3.17 and v3.18, and 'git describe'
is used by the kernel compilation process. Why do I get a version
v3.17-rc7-1626-ga4b4a2b, that seems outside of [v3.17..v3.18] ?
To reproduce :
git bisect start
git bisect bad v3.18
git bisect good v3.17
Bisecting:
On vr, 2015-06-12 at 13:39 +0200, Andres G. Aragoneses wrote:
> On 12/06/15 13:33, Dennis Kaarsemaker wrote:
> > On vr, 2015-06-12 at 13:26 +0200, Andres G. Aragoneses wrote:
> >
> >> AFAIU git stores the contents of a repo as a sequence of patches in the
> >> .git metadata folder.
> >
> > It does
On 12/06/15 13:33, Dennis Kaarsemaker wrote:
On vr, 2015-06-12 at 13:26 +0200, Andres G. Aragoneses wrote:
AFAIU git stores the contents of a repo as a sequence of patches in the
.git metadata folder.
It does not, it stores full snapshots of files.
In bare repos too?
1. `git clone --dept
On vr, 2015-06-12 at 13:26 +0200, Andres G. Aragoneses wrote:
> AFAIU git stores the contents of a repo as a sequence of patches in the
> .git metadata folder.
It does not, it stores full snapshots of files.
[I've cut the example, as it's not how git works]
> 1. `git clone --depth 1` would be
Hello git devs,
I'm toying with an idea of an improvement I would like to work on, but
not sure if it would be desirable enough to be considered good to merge
in the end, so I'm requesting your opinions before I work on it.
AFAIU git stores the contents of a repo as a sequence of patches in t
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Hello again,
After digging the code I may have got a clue where to start but I
would still appreciate some help from a developer, cause I have never
learned to write C. (Some basics at school which happened over a
decade ago.)
Currently I have quest
When --patch or pathspecs are passed to git checkout, the working tree
will not be switching branch, so there's no need to check if the branch
that we are running checkout on is already checked out.
Original-patch-by: Spencer Baugh
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/checkout.c
Hi,
I tried to compile git 2.4.3 using root on a server. It failed on test
41 of t0302-credential-store.sh
In fact even if we remove read access on a directory, root still can
acces this directory.
Using a not privilegied user make the test work.
Perhaps the test should be adapted to this corn
On Fri, Jun 12, 2015 at 6:46 AM, Eric Sunshine wrote:
> On Thu, Jun 11, 2015 at 10:37 AM, Panagiotis Astithas
> wrote:
>> The output of "pmset -g batt" changed at some point from
>> "Currently drawing from 'AC Power'" to the slightly different
>> "Now drawing from 'AC Power'". Starting the match
I was surprised to see that when using git-init, if the template folder
is itself a symlink, then the contents of the template is NOT copied to
the resulting git repository, but instead each individual file is
symlinked.
For my particular use case, this is undesirable (since if I am not
careful, t
68 matches
Mail list logo
