Re: [PATCH] Makefile: do not export mandir/htmldir/infodir

2013-02-12 Thread Jonathan Nieder
Junio C Hamano wrote: These are defined in the main Makefile to be funny values that are optionally relative to an unspecified location that is determined at runtime. [...] A longer term fix is to introduce runtime_{man,html,info}dir variables to hold these funny values, and make

Re: [PATCH] Makefile: do not export mandir/htmldir/infodir

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 03:16:51PM -0800, Jonathan Nieder wrote: Junio C Hamano wrote: These are defined in the main Makefile to be funny values that are optionally relative to an unspecified location that is determined at runtime. [...] A longer term fix is to introduce

[PATCH 1/4] contrib/subtree: Store subtree sources in .gitsubtree and use for push/pull

2013-02-12 Thread Paul Campbell
Having to remember what subtree came from what source is a waste of developer memory and doesn't transfer easily to other developers. git subtree push/pull operations would typically be to/from the same source that the original subtree was cloned from with git subtree add. The repository and

[PATCH 2/4] contrib/subtree: Allow stale .gitsubtree entries to be replaced

2013-02-12 Thread Paul Campbell
Should .gitsubtree have a prefix listed that doesn't exist on disk, allow it to be replaced/updated by a git subtree add. Ideally I would have aborted the operation if there was an existing entry and required the user to edit the .gitsubtree file by hand, but that behaviour broke a lot of the

[PATCH 3/4] contrib/subtree/t: Added tests for .gitsubtree support

2013-02-12 Thread Paul Campbell
55 add: ensure details are added to .gitsubtree 56 push: check for a SHA1 update line 57 pull: add a file on one subtree, push it to a branch, then pull into another subtree containing the same branch and confirm the files match 58 add: ensure stale .gitsubtree entry is replaced

[PATCH 4/4] contrib/subtree: update documentation

2013-02-12 Thread Paul Campbell
From 483a644fb40d14f2209116c45c1cb6beab11a181 Mon Sep 17 00:00:00 2001 From: Paul Campbell pcampb...@kemitix.net Date: Tue, 12 Feb 2013 00:07:26 + Subject: [PATCH 4/4] contrib/subtree: update documentation Signed-off-by: Paul Campbell pcampb...@kemitix.net --- contrib/subtree/git-subtree.txt

Re: [PATCH] completion: support 'git config --local'

2013-02-12 Thread Jeff King
On Tue, Feb 12, 2013 at 02:13:05PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: I'm not sure I understand the original poster's point about git config -l --local. -l does not take a limiter, does it? git config -l core.\* will just die without limiting the output to

What's cooking in git.git (Feb 2013, #05; Tue, 12)

2013-02-12 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. A preview of the upcoming release 1.8.2-rc0 is expected to be tagged late this week. You can find the changes described here in the

jn/shell-disable-interactive (Re: What's cooking in git.git (Feb 2013, #05; Tue, 12))

2013-02-12 Thread Jonathan Nieder
Junio C Hamano wrote: * jn/shell-disable-interactive (2013-02-11) 2 commits - shell: pay attention to exit status from 'help' command - shell doc: emphasize purpose and security model Will merge to 'next'. Please hold off on merging the second patch. I'd like to reroll renaming the

Re: jn/shell-disable-interactive (Re: What's cooking in git.git (Feb 2013, #05; Tue, 12))

2013-02-12 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: * jn/shell-disable-interactive (2013-02-11) 2 commits - shell: pay attention to exit status from 'help' command - shell doc: emphasize purpose and security model Will merge to 'next'. Please hold off on merging the

Re: What's cooking in git.git (Feb 2013, #05; Tue, 12)

2013-02-12 Thread Andrew Ardill
On 13 February 2013 11:06, Junio C Hamano gits...@pobox.com wrote: * jc/add-delete-default (2012-08-13) 1 commit - git add: notice removal of tracked paths by default git add dir/ updated modified files and added new files, but does not notice removed files, which may be Huh? to some

Re: What's cooking in git.git (Feb 2013, #05; Tue, 12)

2013-02-12 Thread Junio C Hamano
Andrew Ardill andrew.ard...@gmail.com writes: On 13 February 2013 11:06, Junio C Hamano gits...@pobox.com wrote: * jc/add-delete-default (2012-08-13) 1 commit - git add: notice removal of tracked paths by default git add dir/ updated modified files and added new files, but does not

Re: What's cooking in git.git (Feb 2013, #05; Tue, 12)

2013-02-12 Thread Andrew Ardill
On 13 February 2013 11:34, Junio C Hamano gits...@pobox.com wrote: The change could negatively affect people who expect that removing files that are not used for their purpose (e.g. a large file that is unnecessary for their build) will _not_ affect what they get from git add .; How big a

Re: Git-aware HTTP transport docs

2013-02-12 Thread H. Peter Anvin
Hi Shawn, You wrote a really great protocol spec for the smart HTTP protocol back in the day. It would be really great if it could be checked into the git repository (updated if need be). Someone mentioned today trying to reverse-engineer the protocol because of a lack of specs, and I was a bit

Re: Git-aware HTTP transport docs

2013-02-12 Thread Scott Chacon
I don't believe it was ever merged into the Git docs. I have a copy of it here: https://www.dropbox.com/s/pwawp8kmwgyc3w2/http-protocol.txt Scott On Tue, Feb 12, 2013 at 5:34 PM, H. Peter Anvin h...@zytor.com wrote: Hi Shawn, You wrote a really great protocol spec for the smart HTTP

Re: [PATCH] completion: support 'git config --local'

2013-02-12 Thread Matthieu Moy
Jeff King p...@peff.net writes: So yeah. Matthieu's patch is the right thing to do, as it covers both Thanks, (mine fixed only half of it). (Sorry, I had missed yours) -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line unsubscribe git in the

<    1   2