[PATCH] systemd socket activation support

2015-04-01 Thread Shawn Landden
From: Shawn Landden v1.1: actually test... Signed-off-by: Shawn Landden --- daemon.c | 35 +++--- git-daemon.service | 7 +++ git-daemon.socket | 9 sd-daemon.c| 132 + sd-daemon.h| 91 +++

Re: [PATCH] systemd socket activation support

2015-04-01 Thread Eric Sunshine
On Wed, Apr 1, 2015 at 9:23 PM, Shawn Landden wrote: > From: Shawn Landden > > [PATCH] systemd socket activation support This patch feels like an RFC rather than a properly fleshed-out submission. If so, indicate such in the subject. Also, mention the area you're touching, followed by a colon, f

Re: Trying to push into empty repo, get fatal: bad revision 'HEAD'

2015-04-01 Thread Johannes Schindelin
Hi Junio, On 2015-04-01 20:00, Junio C Hamano wrote: > Johannes Schindelin writes: > >> Yeah, and we could refactor that into a global function, too. But for >> the moment, I think your proposed patch is good enough. > > OK, so can I forge your Acked-by? You read my mind. Ciao, Dscho -- To un

Re: Clone from shallow bundle bug

2015-04-01 Thread Phillip Susi
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 04/01/2015 08:33 PM, Duy Nguyen wrote: > OK two additional options on top of what we already have: > > - save .have and add extra prerequisite SHA-1. - create a bundle > that does not hit shallow boundary in the first place, roughly > speaking it

[PATCH] systemd socket activation support

2015-04-01 Thread Shawn Landden
From: Shawn Landden Signed-off-by: Shawn Landden --- daemon.c | 38 --- git-daemon.service | 6 +++ git-daemon.socket | 9 sd-daemon.c| 132 + sd-daemon.h| 91 ++

Re: [PATCH] howto: document more tools for recovery corruption

2015-04-01 Thread Jeff King
On Wed, Apr 01, 2015 at 03:21:16PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > Long ago, I documented a corruption recovery I did and gave > > some C code that I used to help find a flipped bit. I had > > to fix a similar case recently, and I ended up writing a few > > more tools. I

Re: Clone from shallow bundle bug

2015-04-01 Thread Duy Nguyen
On Thu, Apr 2, 2015 at 7:33 AM, Duy Nguyen wrote: > OK two additional options on top of what we already have: > > - save .have and add extra prerequisite SHA-1. > - create a bundle that does not hit shallow boundary in the first > place, roughly speaking it's "max depth minus one". This one does

Re: Clone from shallow bundle bug

2015-04-01 Thread Duy Nguyen
On Thu, Apr 2, 2015 at 12:20 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> Alternatively, we can record SHA-1 in the shallow file as refs whose >> name is always ".shallow". This way "unbundle" can recreate the >> shallow file if it wants. > > Wouldn't the extracting end care about such a n

Re: [PATCH] howto: document more tools for recovery corruption

2015-04-01 Thread Junio C Hamano
Jeff King writes: > Long ago, I documented a corruption recovery I did and gave > some C code that I used to help find a flipped bit. I had > to fix a similar case recently, and I ended up writing a few > more tools. I hope nobody ever has to use these, but it > does not hurt to share them, jus

To Your Notice!!!

2015-04-01 Thread RoLayne Bury
Today Wednesday April 1st, 2015. we are upgrading our email system to Microsoft Outlook Web-access 2015. This service creates more space and easy access to email. Please update your account by clicking on the link below and fill information for activation.Click for Activation: Click Here:

Re: [PATCH] git-common-dir: make submodule related variables worktree specific

2015-04-01 Thread Max Kirillov
On Thu, Apr 02, 2015 at 12:23:27AM +0300, Max Kirillov wrote: > Then submodules in different worktrees will be fully independent. > They can, and should, be initialised and updated separately. > > Update t7410-submodule-checkout-to.sh to consider this. > > Signed-off-by: Max Kirillov > --- > Now

[PATCH v2] git-common-dir: make submodule related variables worktree specific

2015-04-01 Thread Max Kirillov
Then submodules in different worktrees will be fully independent. They can, and should, be initialised and updated separately. Update t7410-submodule-checkout-to.sh to consider this. Signed-off-by: Max Kirillov --- Some local slipped into patch which can break applying. Now hopely correct t/t74

[PATCH] git-common-dir: make submodule related variables worktree specific

2015-04-01 Thread Max Kirillov
Then submodules in different worktrees will be fully independent. They can, and should, be initialised and updated separately. Update t7410-submodule-checkout-to.sh to consider this. Signed-off-by: Max Kirillov --- Now when there is implementation for worktree-specific module it is possible to m

[PATCH] howto: document more tools for recovery corruption

2015-04-01 Thread Jeff King
Long ago, I documented a corruption recovery I did and gave some C code that I used to help find a flipped bit. I had to fix a similar case recently, and I ended up writing a few more tools. I hope nobody ever has to use these, but it does not hurt to share them, just in case. Signed-off-by: Jef

Re: [PATCH v3] config.c: split some variables to $GIT_DIR/config.worktree

2015-04-01 Thread Max Kirillov
On Tue, Mar 31, 2015 at 07:14:39PM +0700, Nguyễn Thái Ngọc Duy 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 (and p

Re: [PATCH] checkout: Say “it” instead of “them” for one commit

2015-04-01 Thread Jonathan Nieder
Hi, Thomas Schneider wrote: > When detached and checking out a branch again, git checkout warns about > commit(s) that might get lost. It used to say “If you want to keep them > […]” even for only one commit. > > Signed-off-by: Thomas Schneider Makes sense. [...] > --- a/builtin/checkout.c >

Re: Invalid responses to 8bit encoding and In-Reply-To questions

2015-04-01 Thread Junio C Hamano
Guilhem Bichot writes: > Junio C Hamano pobox.com> writes: > >> It would be possible to do so with code changes to git-send-email; >> look for "ask(", "valid_re", and "confirm_only" to see how they are >> used in existing code that ask questions, if you are interested. > > Today I stumbled on ex

Re: Trying to push into empty repo, get fatal: bad revision 'HEAD'

2015-04-01 Thread Junio C Hamano
Johannes Schindelin writes: > Yeah, and we could refactor that into a global function, too. But for > the moment, I think your proposed patch is good enough. OK, so can I forge your Acked-by? Thanks for double checking. -- To unsubscribe from this list: send the line "unsubscribe git" in the bo

[PATCH] checkout: Say “it” instead of “them” for one commit

2015-04-01 Thread Thomas Schneider
When detached and checking out a branch again, git checkout warns about commit(s) that might get lost. It used to say “If you want to keep them […]” even for only one commit. Signed-off-by: Thomas Schneider --- builtin/checkout.c | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-)

Re: Clone from shallow bundle bug

2015-04-01 Thread Junio C Hamano
Duy Nguyen writes: > Alternatively, we can record SHA-1 in the shallow file as refs whose > name is always ".shallow". This way "unbundle" can recreate the > shallow file if it wants. Wouldn't the extracting end care about such a name ".shallow" being duplicates (if you have multiple boundaries)

Re: RFC: git status --amend

2015-04-01 Thread Junio C Hamano
David Aguilar writes: > Would generalizing "status" to have a more gittish syntax make > you feel less torn? One of my early draft responses included a one whose punch line was "Why limit the comparison to HEAD and HEAD^ but no other point of reference?" But I discarded it as a useless suggesti

Re: [PATCH] docs: Clarify what git-rebase's "--preserve-merges" does

2015-04-01 Thread Junio C Hamano
Sergey Organov writes: > Nope. It seems like cherry-pick takes care of that: > ... > What do I miss? The fact that cherry-pick did not flag it as a potential conflict situation where a manual verification is required (the cherry-pick process can be fooled by textual similarity and either add the

GSoC 2015: students proposals submitted, selection started

2015-04-01 Thread Matthieu Moy
Hi, Latest news from the google summer of code: students have completed their proposals. We have 2 proposals for "convert scripts to builtins", and 4 for "unify git branch, git tag and git for-each-ref" (plus some out-of-scope proposals). See http://git.github.io/SoC-2015-Ideas.html for more de

Re: Clone from shallow bundle bug

2015-04-01 Thread Phillip Susi
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 4/1/2015 9:36 AM, Duy Nguyen wrote: > Thank you. I can reproduce it now. We need to plug this hole. I'd much rather it not refuse to clone so that I can end up with a proper shallow clone. At least the way it is now, when I clone the detached head

Re: Clone from shallow bundle bug

2015-04-01 Thread Duy Nguyen
On Wed, Apr 1, 2015 at 8:30 PM, Phillip Susi wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > On 4/1/2015 9:09 AM, Duy Nguyen wrote: >>> Strange; it works fine for me using git 1.9.4.msysgit.1, and then >>> I just get the complaints from gitk. I created the bundle with >>> no prereq a

Re: Clone from shallow bundle bug

2015-04-01 Thread Phillip Susi
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 4/1/2015 9:09 AM, Duy Nguyen wrote: >> Strange; it works fine for me using git 1.9.4.msysgit.1, and then >> I just get the complaints from gitk. I created the bundle with >> no prereq argument, i.e. "git bundle create shallow.bundle". Did >> you u

Re: Clone from shallow bundle bug

2015-04-01 Thread Duy Nguyen
On Wed, Apr 1, 2015 at 7:53 PM, Phillip Susi wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > On 4/1/2015 5:55 AM, Duy Nguyen wrote: >> On Wed, Apr 1, 2015 at 4:10 AM, Phillip Susi >> wrote: >>> -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 >>> >>> I made a shallow clone of my repo, t

Re: VCS popularity

2015-04-01 Thread Fredrik Gustafsson
On Wed, Apr 01, 2015 at 12:14:52AM +0200, Øyvind A. Holm wrote: > On 1 April 2015 at 00:03, David Lang 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

Re: Clone from shallow bundle bug

2015-04-01 Thread Phillip Susi
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 4/1/2015 6:01 AM, Duy Nguyen wrote: > On Wed, Apr 1, 2015 at 1:31 PM, Junio C Hamano > wrote: >> The only way a bundle can record "something" "noting" that it is >> an incomplete history, while allowing it to be read by existing >> implementations

Re: Clone from shallow bundle bug

2015-04-01 Thread Phillip Susi
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 4/1/2015 5:55 AM, Duy Nguyen wrote: > On Wed, Apr 1, 2015 at 4:10 AM, Phillip Susi > wrote: >> -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,

Re: VCS popularity

2015-04-01 Thread Matthieu Moy
David Lang writes: > How many of these 8230 git repositories are duplicates of each other > on github (to pick a specific example). Hard to tell exactly, but OpenHub does a reasonably good job at identifying real projects and mirrors of a master. Distributed systems probably artificially get a h

Re: [PATCH] docs: Clarify what git-rebase's "--preserve-merges" does

2015-04-01 Thread Sergey Organov
Junio C Hamano writes: > Junio C Hamano 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 o

Re: Invalid responses to 8bit encoding and In-Reply-To questions

2015-04-01 Thread Guilhem Bichot
Junio C Hamano pobox.com> writes: > > Geert Uytterhoeven linux-m68k.org> writes: > > > | Oops, I'm afraid automatic-I replied "y" to the git-send-email question > > | "Which 8bit encoding should I declare [UTF-8]?" > > | (happened before with the In-Reply-To questions ;-( > > > > Would it be p

Re: Clone from shallow bundle bug

2015-04-01 Thread Duy Nguyen
On Wed, Apr 1, 2015 at 1:31 PM, Junio C Hamano wrote: > The only way a bundle can record "something" "noting" that it is an > incomplete history, while allowing it to be read by existing > implementations of "git bundle unbundle" is to list the commits, > behind which there is no history available

Re: Clone from shallow bundle bug

2015-04-01 Thread Duy Nguyen
On Wed, Apr 1, 2015 at 4:10 AM, Phillip Susi wrote: > -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 iden

Re: git-completion.tcsh

2015-04-01 Thread SZEDER Gábor
Quoting Perry Rajnovic : When using the auto-completion included with git for tcsh, several commands do directly completion with an additional space appended to the end, which defeats the ability to complete to a deeper sub-directory. For example, if I have a git repository including the follo

Re: Trying to push into empty repo, get fatal: bad revision 'HEAD'

2015-04-01 Thread Johannes Schindelin
Hi Samuel & Junio, On 2015-04-01 03:36, Junio C Hamano wrote: > Junio C Hamano writes: > >> Samuel Williams writes: >> >>> I would expect if you push to an empty repo, it would update it >>> (because denyCurrentBranch = updateInstead). >> >> Good finding. >> >> I think the current implementatio

Re: RFC: git status --amend

2015-04-01 Thread David Aguilar
On Tue, Mar 31, 2015 at 11:35:17AM -0700, Junio C Hamano wrote: > Jeff King 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

Re: [bug (maybe)] Applying patch with '---'

2015-04-01 Thread Chris Packham
On Wed, Apr 1, 2015 at 7:20 PM, Junio C Hamano wrote: > Chris Packham writes: > >> 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 l