Re: [PATCH 0/8] object_id part 2

2015-06-10 Thread Junio C Hamano
brian m. carlson sand...@crustytoothpaste.net writes: On Wed, Jun 10, 2015 at 11:51:14PM +, brian m. carlson wrote: On Wed, Jun 10, 2015 at 03:50:32PM -0700, Junio C Hamano wrote: brian m. carlson sand...@crustytoothpaste.net writes: Convert struct object to object_id It seems

Re: [PATCH v4] receive-pack: Create a HEAD ref for ref namespace

2015-06-10 Thread Johannes Löthberg
On 05/06, Johannes Löthberg wrote: Each ref namespace have their own separate branches, tags, and HEAD, so when pushing to a namespace we need to make sure that there exists a HEAD ref for the namespace, otherwise you will not be able to check out the repo after cloning from a namespace

Re: [PATCH 0/8] object_id part 2

2015-06-10 Thread brian m. carlson
On Wed, Jun 10, 2015 at 11:51:14PM +, brian m. carlson wrote: On Wed, Jun 10, 2015 at 03:50:32PM -0700, Junio C Hamano wrote: brian m. carlson sand...@crustytoothpaste.net writes: Convert struct object to object_id It seems that the last one didn't make it... It appears the

What's cooking in git.git (Jun 2015, #03; Wed, 10)

2015-06-10 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'. Somehow we are getting quite a many new topics in the past few weeks. All the new contributors we acquired recently, including but not limited

Re: [PATCH 0/8] object_id part 2

2015-06-10 Thread brian m. carlson
On Wed, Jun 10, 2015 at 03:50:32PM -0700, Junio C Hamano wrote: brian m. carlson sand...@crustytoothpaste.net writes: Convert struct object to object_id It seems that the last one didn't make it... It appears the mail was too large for vger. Unfortunately for bisectability reasons, it is

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

2015-06-10 Thread Michael Rappazzo
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: Michael Rappazzo rappa...@gmail.com ---

[PATCH] Allow to control the namespace for replace refs

2015-06-10 Thread Mike Hommey
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 refs are more powerful, they don't

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

2015-06-10 Thread Michael Rappazzo
Difference between v2 and v3 of this patch: - Fixed autosquash - Added documentation on the config options - Added two tests to t3414 (rebase-autosquash) Michael Rappazzo (1): git-rebase--interactive.sh: add config option for custom instruction format

Re: [PATCH] Allow to control the namespace for replace refs

2015-06-10 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

Re: [PATCH] Allow to control the namespace for replace refs

2015-06-10 Thread Mike Hommey
On Wed, Jun 10, 2015 at 09:55:30PM -0700, Junio C Hamano wrote: 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

Re: [PATCH 0/8] object_id part 2

2015-06-10 Thread brian m. carlson
On Wed, Jun 10, 2015 at 05:21:33PM -0700, Junio C Hamano wrote: brian m. carlson sand...@crustytoothpaste.net writes: [0] https://github.com/bk2204/git.git object-id-part2 No approach other than just letting reviewers fetch from there and taking a look is reasonable, I would think. Did

Re: [PATCH 3/4] bisect: simplify the add of new bisect terms

2015-06-10 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Louis-Alexandre Stuber stub...@ensimag.grenoble-inp.fr writes: That is very different from ENOENT, which is an expected error when you are not using a customized terms. But in the current state, we are going to create bisect_terms even if

Re: [PATCH v2 11/19] pull: check if in unresolved merge state

2015-06-10 Thread Paul Tan
On Wed, Jun 10, 2015 at 10:38 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: Paul Tan pyoka...@gmail.com writes: @@ -422,6 +423,14 @@ int cmd_pull(int argc, const char **argv, const char *prefix) parse_repo_refspecs(argc, argv, repo, refspecs);

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

2015-06-10 Thread Ed Avis
'restore' may be more consistent with git's internal terminology. But from an outsider's perspective, 'revert' rather than 'restore' is in my view much clearer and more consistent with other version control systems: for example 'svn revert' is what you use to revert files in the working copy. The

Re: [PATCH v3 7/7] send-email: suppress leading and trailing whitespaces before alias expansion

2015-06-10 Thread Junio C Hamano
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes: I agree, I'd like to put it right after split_at_commas in a separate function trim_list. Is it a good idea even if the function is one line long ? Hmph, if I have A, B, C and call a function that gives an array of addresses,

Re: [PATCH v3 5/7] send-email: allow multiple emails using --cc, --to and --bcc

2015-06-10 Thread Junio C Hamano
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes: From: Jorge Juan Garcia Garcia jorge-juan.garcia-gar...@ensimag.imag.fr Accept a list of emails separated by commas in flags --cc, --to and --bcc. Multiple addresses can already be given by using these options multiple times, but

Re: [PATCH/RFCv5 3/3] git rebase -i: add static check for commands and SHA-1

2015-06-10 Thread Matthieu Moy
Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr writes: +# from the todolist in stdin +check_bad_cmd_and_sha () { + git stripspace --strip-comments | + while read -r command sha1 rest + do + case $command in + ''|noop|x|exec) +

Re: Using clean/smudge scripts from repository

2015-06-10 Thread Junio C Hamano
Bob Bell b_...@thebellsplace.com writes: Is this a proper solution, or did I just luck out? Am I perhaps doing something foolish? Yes, we happen to run checkout in the index order, but that is not something we guarantee, so you can call yourself lucky. You are being doubly lucky that nobody

Re: git lock files (Was: GIT for Microsoft Access projects)

2015-06-10 Thread Stefan Beller
On Wed, Jun 10, 2015 at 12:47 AM, Fredrik Gustafsson iv...@iveqy.com wrote: On Tue, Jun 09, 2015 at 10:19:43AM -0700, Stefan Beller wrote: Just because Git allows distributed workflows, doesn't mean we should only focus on being distributed IMHO. The question for content not being mergable

Re: [PATCH 4/4] bisect: add the terms old/new

2015-06-10 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Somebody else did it like that is not a good justification. Especially when the previous code was not merged: the code wasn't finished. But I actually disagree with the fact that it was not the idea. The point of having the terms in

<    1   2