merge master into the subtree branches

2015-06-12 Thread Nico Schlömer
Hi everyone, I have a large Git project which I would like to dissect into subprojects with their own repositories. Git subtrees are ideal for this task: I first * create a branch with the contents of only one subfoldergit subtree split -P name-of-folder -b name-of-new-branch and then * pull

Bug when doing make test using root user

2015-06-12 Thread Jean-Yves LENHOF
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

Re: [PATCH v2] fetch-pack: optionally save packs to disk

2015-06-12 Thread Johannes Sixt
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 software, shouldn't you test drive the server via the bare metal protocol

git init with template dir

2015-06-12 Thread Alex Cornejo
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,

Re: [PATCH] Fix power checking on OS X

2015-06-12 Thread Panagiotis Astithas
On Fri, Jun 12, 2015 at 6:46 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Thu, Jun 11, 2015 at 10:37 AM, Panagiotis Astithas past...@gmail.com 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

Re: Need some help on patching buildin-files // was: Looking for feedback and help with a git-mirror for local usage

2015-06-12 Thread Bernd Naumann
-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

[PATCH] checkout: don't check worktrees when not necessary

2015-06-12 Thread Nguyễn Thái Ngọc Duy
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 sba...@catern.com Signed-off-by: Nguyễn Thái Ngọc Duy

RFC: reverse history tree, for faster background clones

2015-06-12 Thread Andres G. Aragoneses
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

Re: RFC: reverse history tree, for faster background clones

2015-06-12 Thread Dennis Kaarsemaker
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 not, it stores

Re: RFC: reverse history tree, for faster background clones

2015-06-12 Thread Andres G. Aragoneses
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

strange result of `git describe` while bisecting

2015-06-12 Thread Philippe De Muyter
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:

Re: strange result of `git describe` while bisecting

2015-06-12 Thread Andreas Schwab
Philippe De Muyter p...@macq.eu 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

Re: Bug when doing make test using root user

2015-06-12 Thread Paul Tan
On Fri, Jun 12, 2015 at 5:43 PM, Jean-Yves LENHOF jean-y...@lenhof.eu.org 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

Re: [PATCH 2/3] pkt-line: tighten sideband PACK check when tracing

2015-06-12 Thread Stefan Beller
On Fri, Jun 12, 2015 at 2:41 PM, Jeff King p...@peff.net 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 question on

Re: [PATCH 2/3] pkt-line: tighten sideband PACK check when tracing

2015-06-12 Thread Jeff King
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 be improved

Re: [PATCH v4] git-rebase--interactive.sh: add config option for custom instruction format

2015-06-12 Thread Junio C Hamano
Mike Rappazzo rappa...@gmail.com writes: On Fri, Jun 12, 2015 at 4:56 PM, Junio C Hamano gits...@pobox.com 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

Re: [PATCH v2] upload-pack: Fail if cloning empty namespace

2015-06-12 Thread Johannes Löthberg
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 johan...@kyriasis.com --- Changes since v1: * Fixed the namespace check, since I apparently

Re: [PATCH v2] fetch-pack: optionally save packs to disk

2015-06-12 Thread Jeff King
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

Re: [PATCH 2/3] pkt-line: tighten sideband PACK check when tracing

2015-06-12 Thread Stefan Beller
On Fri, Jun 12, 2015 at 2:28 PM, Jeff King p...@peff.net 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

[PATCH/RFC] upload-pack: Fail if cloning empty namespace

2015-06-12 Thread Johannes Löthberg
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 johan...@kyriasis.com --- In version 4 of the ArchLinux User Repository, which is a hosting platform for recepies for building Arch

Re: [PATCH v4] git-rebase--interactive.sh: add config option for custom instruction format

2015-06-12 Thread Junio C Hamano
Michael Rappazzo rappa...@gmail.com 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.

Re: [PATCH v4] git-rebase--interactive.sh: add config option for custom instruction format

2015-06-12 Thread Mike Rappazzo
On Fri, Jun 12, 2015 at 6:05 PM, Junio C Hamano gits...@pobox.com 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

[PATCH v2] upload-pack: Fail if cloning empty namespace

2015-06-12 Thread Johannes Löthberg
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 johan...@kyriasis.com --- Changes since v1: * Fixed the namespace check, since I apparently forgot to check with a bare repo in my

Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort

2015-06-12 Thread Junio C Hamano
Christian Couder christian.cou...@gmail.com 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

Re: [PATCH v2] Allow to control where the replace refs are looked for

2015-06-12 Thread Junio C Hamano
Mike Hommey m...@glandium.org 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

[PATCH 3/3] pkt-line: support tracing verbatim pack contents

2015-06-12 Thread Jeff King
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

Re: [PATCH 1/3] pkt-line: simplify starts_with checks in packet tracing

2015-06-12 Thread Stefan Beller
On Fri, Jun 12, 2015 at 2:28 PM, Jeff King p...@peff.net 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

Re: [PATCH 0/8] object_id part 2

2015-06-12 Thread brian m. carlson
On Fri, Jun 12, 2015 at 03:14:25PM -0700, Junio C Hamano wrote: brian m. carlson sand...@crustytoothpaste.net 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

Re: [PATCH] checkout: don't check worktrees when not necessary

2015-06-12 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com 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

Re: [PATCH v2] Allow to control where the replace refs are looked for

2015-06-12 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Mike Hommey m...@glandium.org 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

Re: [PATCH v4] git-rebase--interactive.sh: add config option for custom instruction format

2015-06-12 Thread Mike Rappazzo
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

[PATCH 1/3] pkt-line: simplify starts_with checks in packet tracing

2015-06-12 Thread Jeff King
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

[PATCH 2/3] pkt-line: tighten sideband PACK check when tracing

2015-06-12 Thread Jeff King
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

Re: [PATCH 0/8] object_id part 2

2015-06-12 Thread Junio C Hamano
brian m. carlson sand...@crustytoothpaste.net 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

Re: git push keeps writing after server failure

2015-06-12 Thread Jeff King
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 entire pack was

Re: GNU diff and git diff - difference on myers algorithm?

2015-06-12 Thread Luis R. Rodriguez
On Tue, Jun 9, 2015 at 1:25 AM, Johannes Schindelin johannes.schinde...@gmx.de 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.

Re: [PATCHv3 0/4] git-p4: fixing --changes-block-size handling

2015-06-12 Thread Lex Spoon
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

Re: [PATCH] git-checkout.txt: Document git checkout pathspec better

2015-06-12 Thread Torsten Bögershausen
On 2015-06-12 06.49, Scott Schmit wrote: 'git checkout' with paths 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 tree-ish (most often a commit-ish) instead of switching branches.

Re: [PATCH v7 11/12] for-each-ref: introduce filter_refs()

2015-06-12 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Karthik Nayak karthik@gmail.com 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

Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort

2015-06-12 Thread Christian Couder
On Fri, Jun 12, 2015 at 8:29 PM, Karthik Nayak karthik@gmail.com wrote: On 06/12/2015 11:34 PM, Junio C Hamano wrote: Karthik Nayak karthik@gmail.com writes: What change since 9f613dd do you have in mind, exactly, though? Well initially the atoms were indexed into used_atom array,

Re: [PATCH 0/8] object_id part 2

2015-06-12 Thread brian m. carlson
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

Re: [PATCH/RFC] upload-pack: Fail if cloning empty namespace

2015-06-12 Thread Junio C Hamano
Johannes Löthberg johan...@kyriasis.com 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

Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort

2015-06-12 Thread karthik nayak
On Sat, Jun 13, 2015 at 1:57 AM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com 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

Re: [PATCH v4] git-rebase--interactive.sh: add config option for custom instruction format

2015-06-12 Thread Junio C Hamano
Mike Rappazzo rappa...@gmail.com 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,

Re: [PATCH v2 09/19] pull: error on no merge candidates

2015-06-12 Thread Paul Tan
On Wed, Jun 10, 2015 at 7:56 AM, Junio C Hamano gits...@pobox.com wrote: Paul Tan pyoka...@gmail.com 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

Re: [PATCH] Fix power checking on OS X

2015-06-12 Thread Eric Sunshine
On Fri, Jun 12, 2015 at 4:53 AM, Panagiotis Astithas past...@gmail.com wrote: On Fri, Jun 12, 2015 at 6:46 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Thu, Jun 11, 2015 at 10:37 AM, Panagiotis Astithas past...@gmail.com wrote: The output of pmset -g batt changed at some point from

Re: git init with template dir

2015-06-12 Thread Alex Cornejo
Junio C Hamano gitster at 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 ...

Re: git init with template dir

2015-06-12 Thread Junio C Hamano
Alex Cornejo acorn...@gmail.com writes: Junio C Hamano gitster at 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

Re: [PATCH] git-checkout.txt: Document git checkout pathspec better

2015-06-12 Thread Junio C Hamano
Scott Schmit i.g...@comcast.net writes: On Wed, Jun 10, 2015 at 08:05:32AM -0700, Junio C Hamano wrote: How about this? 'git checkout' with paths or `--patch` is used to restore modified or deleted paths to their original contents from the index file or from a

[PATCH] t0302: unreadable test needs SANITY prereq

2015-06-12 Thread Paul Tan
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 jean-y...@lenhof.eu.org Signed-off-by: Paul Tan pyoka...@gmail.com --- t/t0302-credential-store.sh | 2 +- 1 file changed, 1 insertion(+),

Re: RFC: reverse history tree, for faster background clones

2015-06-12 Thread Dennis Kaarsemaker
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

Re: [PATCH] t0302: unreadable test needs SANITY prereq

2015-06-12 Thread Jeff King
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 list:

Re: [PATCH] Fix power checking on OS X

2015-06-12 Thread Junio C Hamano
Panagiotis Astithas past...@gmail.com writes: On Fri, Jun 12, 2015 at 6:46 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Thu, Jun 11, 2015 at 10:37 AM, Panagiotis Astithas past...@gmail.com wrote: The output of pmset -g batt changed at some point from Currently drawing from 'AC

Re: [PATCH v2] fetch-pack: optionally save packs to disk

2015-06-12 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org 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

Re: git init with template dir

2015-06-12 Thread Junio C Hamano
Alex Cornejo acorn...@gmail.com 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

Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort

2015-06-12 Thread Junio C Hamano
Karthik Nayak karthik@gmail.com 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

Re: [PATCH v2] fetch-pack: optionally save packs to disk

2015-06-12 Thread Augie Fackler
On Fri, Jun 12, 2015 at 11:07 AM, Junio C Hamano gits...@pobox.com 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

Re: [PATCH v7 01/12] for-each-ref: extract helper functions out of grab_single_ref()

2015-06-12 Thread Karthik Nayak
On 06/12/2015 11:00 PM, Junio C Hamano wrote: Karthik Nayak karthik@gmail.com 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,

Re: [PATCH v2] fetch-pack: optionally save packs to disk

2015-06-12 Thread Augie Fackler
On Fri, Jun 12, 2015 at 2:22 AM, Johannes Sixt j...@kdbg.org 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

git push keeps writing after server failure

2015-06-12 Thread Shawn Pearce
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

Re: [PATCH v7 01/12] for-each-ref: extract helper functions out of grab_single_ref()

2015-06-12 Thread Junio C Hamano
Karthik Nayak karthik@gmail.com 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

Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort

2015-06-12 Thread Karthik Nayak
On 06/12/2015 11:10 PM, Junio C Hamano wrote: Karthik Nayak karthik@gmail.com 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

Re: git push keeps writing after server failure

2015-06-12 Thread Junio C Hamano
Shawn Pearce spea...@spearce.org 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

Re: [PATCH v2] fetch-pack: optionally save packs to disk

2015-06-12 Thread Jeff King
On Fri, Jun 12, 2015 at 08:07:36AM -0700, Junio C Hamano wrote: Johannes Sixt j...@kdbg.org 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

Re: git push keeps writing after server failure

2015-06-12 Thread Jeff King
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, we

Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort

2015-06-12 Thread Karthik Nayak
On 06/12/2015 11:34 PM, Junio C Hamano wrote: Karthik Nayak karthik@gmail.com 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

Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort

2015-06-12 Thread Junio C Hamano
Karthik Nayak karthik@gmail.com 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

[PATCH v3] l10n: de.po: translate index as Index

2015-06-12 Thread Ralf Thielow
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 messages,

Re: git push keeps writing after server failure

2015-06-12 Thread Jeff King
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 size

Re: strange result of `git describe` while bisecting

2015-06-12 Thread Philippe De Muyter
On Fri, Jun 12, 2015 at 03:17:40PM +0200, Andreas Schwab wrote: Philippe De Muyter p...@macq.eu 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