Re: Pushing and pulling the result of `git replace` and objects/info/alternates

On 05/24/2015 07:28 AM, Christian Couder wrote: Hi, On Fri, May 22, 2015 at 4:38 PM, Stephen Kelly steve...@gmail.com wrote: I have tried out using `git replace --graft` and .git/objects/info/alternates to 'refer to' the history in the origin repo instead of 'duplicating' it. This is similar

[PATCH] completion: suggest sequencer commands for revert

Signed-off-by: Thomas Braun thomas.br...@virtuell-zuhause.de --- Hi, I added the sequencer commands for git revert. These are handy in case a git revert needs manual intervention. Thanks, Thomas contrib/completion/git-completion.bash | 5 + 1 file changed, 5 insertions(+) diff --git

Re: Pushing and pulling the result of `git replace` and objects/info/alternates

On Mon, May 25, 2015 at 11:49 AM, Stephen Kelly steve...@gmail.com wrote: On 05/24/2015 07:28 AM, Christian Couder wrote: Hi, On Fri, May 22, 2015 at 4:38 PM, Stephen Kelly steve...@gmail.com wrote: I have tried out using `git replace --graft` and .git/objects/info/alternates to 'refer to'

[PATCH v2 2/2] ref-filter: move code from 'for-each-ref'

Move most of the code from 'for-each-ref' to 'ref-filter' to make it publically available to other commands, this is to unify the code of 'tag -l', 'branch -l' and 'for-each-ref' so that they can share their implementations with each other. Mentored-by: Christian Couder christian.cou...@gmail.com

[WIP][Patch v2 0/2] Ref-filter: unification of 'tag -l', 'branch -l' and 'for-each-ref'

Hello, After the 1st version of the WIP patch ($gmane/269461) this is a follow up. Changes since 1st version : * restructure to have 'struct ref_filter_data' which has a list of refs 'struct ref_list list', and the filters to apply 'struct ref_filter filter' * reformat the commit to be

[PATCH v2 1/2] for-each-ref: re-structure code for moving to 'ref-filter'

Re-factoring and renaming of code to make meaningful, targeted services available to other commands in efforts to change private scope of the code to public API by moving it to 'ref-filter'. Restructuring of code done to further modularize it to make API provisions simple and effective. Rename

Re: [PATCH v5 1/1] send-email: Add sendmail email aliases format

On Sat, May 23, 2015 at 6:24 PM, Allen Hubbe alle...@gmail.com wrote: On Sat, May 23, 2015 at 2:07 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: A small thing I noticed in the test (and this patch is not adding a new breakage---there are a few existing

Re: [PATCH v2 1/2] for-each-ref: re-structure code for moving to 'ref-filter'

Karthik Nayak karthik@gmail.com writes: -struct refinfo { - char *refname; - unsigned char objectname[20]; - int flag; +struct ref_filter_item { + unsigned char sha1[20]; + int flags; const char *symref; struct atom_value *value; + char *name;

Re: Suggestion to add a new command(git print-tree)

With discussions i have on the irc channel(#git) i just noticed there is the git ls-tree command but it doesn't format the tree so it will be a good thing for the tree to be formatted. I will like to embark on the project. Regards Alangi Derick Ndimnain On Mon, May 25, 2015 at 5:17 PM, Alangi

[PATCH] Fixed a typographical error

From e8c2ea38865cf5dcc135e34ec2e80def8736b582 Mon Sep 17 00:00:00 2001 From: Alangi Derick alangider...@gmail.com Date: Sun, 24 May 2015 14:58:30 +0100 Subject: [PATCH] Fixed a typographical error This is a patch to fix a typographical error in the 2.5.0.txt file in the Documentation/RelNotes

Re: Suggestion to add a new command(git print-tree)

Regards Alangi Derick Ndimnain On Mon, May 25, 2015 at 5:21 PM, Alangi Derick alangider...@gmail.com wrote: With discussions i have on the irc channel(#git) i just noticed there is the git ls-tree command but it doesn't format the tree so it will be a good thing for the tree to be formatted.

Re: [PATCH v5 1/1] send-email: Add sendmail email aliases format

Allen Hubbe alle...@gmail.com writes: Looking closer at this and the other test cases, they are inconsistent about using .mailrc, ~/.mailrc, and $(pwd)/.mailrc. This would add another one, $HOME/.mailrc. In t9001, I see two tests on mailrc: * Create .mailrc in the current directory and

Re: [PATCH v11 5/5] help: respect new common command grouping

On 05/21/2015 08:04 PM, Eric Sunshine wrote: On Thu, May 21, 2015 at 1:39 PM, Sébastien Guimmara sebastien.guimm...@gmail.com wrote: 'git help' shows common commands in alphabetical order: The most commonly used git commands are: addAdd file contents to the index bisect

Suggestion to add a new command(git print-tree)

Hello everyone, I will like us to discuss on this topic to add a new command into git that will enable us to print the entire working tree in a git repository. Something similar to work happens when you run the linux command: pstree. This is important in searching and also more that i

[PATCH v3 35/56] remote: rewrite functions to take object_id arguments

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- remote.c | 19 --- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/remote.c b/remote.c index

[PATCH v3 44/56] find_symref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- upload-pack.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index

[PATCH v3 55/56] warn_if_dangling_symref(): convert local variable junk to object_id

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- refs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/refs.c b/refs.c index 162760c..7515c2e 100644 ---

[PATCH v3 37/56] handle_one_reflog(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- revision.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/revision.c b/revision.c index cfe3876..1d903cf

[PATCH v3 50/56] mark_complete_oid(): new function, taking an object_oid

From: Michael Haggerty mhag...@alum.mit.edu This function can be used with for_each_ref() without having to be wrapped. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- fetch-pack.c | 11 +++ 1 file changed, 7

[PATCH v3 42/56] write_refs_to_temp_dir(): convert local variable sha1 to object_id

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- transport.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/transport.c b/transport.c index

[PATCH v3 54/56] each_ref_fn_adapter(): remove adapter

From: Michael Haggerty mhag...@alum.mit.edu All of the callers of the for_each_ref family of functions have now been rewritten to work with object_ids, so this adapter is no longer needed. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson

[PATCH v3 32/56] add_ref_decoration(): convert local variable original_sha1 to object_id

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- log-tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/log-tree.c b/log-tree.c index abf5cc3..01beb11

[PATCH v3 48/56] mark_complete(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- walker.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/walker.c b/walker.c index bb2e0b9..44a936c

[PATCH v3 36/56] register_replace_ref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- replace_object.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/replace_object.c b/replace_object.c index

[PATCH v3 51/56] mark_complete(): remove unneeded arguments

From: Michael Haggerty mhag...@alum.mit.edu Now that the function is not being used as an each_ref_sha1_fn, we can delete the unused arguments in its signature. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- fetch-pack.c | 6

[PATCH v3 31/56] add_ref_decoration(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- log-tree.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/log-tree.c b/log-tree.c index

[PATCH v3 45/56] find_symref(): convert local variable unused to object_id

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- upload-pack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index

[PATCH v3 56/56] struct ref_lock: convert old_sha1 member to object_id

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- refs.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/refs.c b/refs.c index

[PATCH v3 46/56] upload-pack: rewrite functions to take object_id arguments

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- upload-pack.c | 32 ++-- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/upload-pack.c

[PATCH v3 49/56] clear_marks(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- fetch-pack.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/fetch-pack.c b/fetch-pack.c index

[PATCH v3 53/56] rev_list_insert_ref(): remove unneeded arguments

From: Michael Haggerty mhag...@alum.mit.edu Now that the function is not being used as an each_ref_sha1_fn, we can delete the unused arguments in its signature. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- fetch-pack.c | 6

[PATCH v3 41/56] submodule: rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- submodule.c | 22 +++--- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/submodule.c b/submodule.c

[PATCH v3 28/56] append_similar_ref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- help.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/help.c b/help.c index f813093..6f3415b 100644 ---

[PATCH v3 47/56] send_ref(): convert local variable peeled to object_id

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- upload-pack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index

[PATCH v3 52/56] rev_list_insert_ref_oid(): new function, taking an object_oid

From: Michael Haggerty mhag...@alum.mit.edu This function can be used with for_each_ref() without having to be wrapped. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- fetch-pack.c | 10 +++--- 1 file changed, 7

[PATCH v3 39/56] handle_one_ref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- sha1_name.c | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index

[PATCH v3 43/56] write_one_ref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- transport.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/transport.c b/transport.c index

[PATCH v3 34/56] add_one_ref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- reachable.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/reachable.c b/reachable.c index

Re: [PATCH v3 00/56] Convert parts of refs.c to struct object_id

brian m. carlson sand...@crustytoothpaste.net writes: Changes from v2: * Adopt Michael Haggerty's patch series that uses an adapter function. * Squash some of these patches together where it makes sense in order to reduce the quantity of patches. This does only slightly more than my

[PATCH v3 01/56] refs: convert struct ref_entry to use struct object_id

Signed-off-by: brian m. carlson sand...@crustytoothpaste.net Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- refs.c | 44 ++-- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/refs.c b/refs.c index 8480d8d..9ca4651 100644 ---

[PATCH v3 25/56] builtin/show-ref: rewrite to use object_id

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/show-ref.c | 33 +++-- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git

[PATCH v3 17/56] builtin/remote: rewrite functions to take object_id arguments

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/remote.c | 21 - 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/builtin/remote.c

[PATCH v3 14/56] builtin/reflog: rewrite ref functions to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/reflog.c | 16 ++-- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/builtin/reflog.c

[PATCH v3 23/56] cmd_show_branch(): fix error message

From: Michael Haggerty mhag...@alum.mit.edu We need to convert the SHA-1 to hexadecimal before printing it. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/show-branch.c | 2 +- 1 file changed, 1 insertion(+), 1

[PATCH v3 38/56] add_info_ref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- server-info.c | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/server-info.c b/server-info.c index

[PATCH v3 24/56] fsck: change functions to use object_id

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/fsck.c | 29 + 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/builtin/fsck.c

[PATCH v3 30/56] show_head_ref(): convert local variable unused to object_id

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- http-backend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http-backend.c b/http-backend.c index

[PATCH v3 40/56] shallow: rewrite functions to take object_id arguments

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- shallow.c | 29 +++-- 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/shallow.c b/shallow.c

[PATCH v3 13/56] show_ref_cb(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/receive-pack.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin/receive-pack.c

[PATCH v3 29/56] http-backend: rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- http-backend.c | 23 +-- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/http-backend.c

[PATCH v3 10/56] grab_single_ref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/for-each-ref.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/builtin/for-each-ref.c

[PATCH v3 26/56] show_ref(): convert local variable peeled to object_id

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/show-ref.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/show-ref.c b/builtin/show-ref.c

[PATCH v3 06/56] append_ref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/branch.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index

[PATCH v3 20/56] builtin/show-branch: rewrite functions to take object_id arguments

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/show-branch.c | 35 +-- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git

Re: [PATCH v2 1/2] for-each-ref: re-structure code for moving to 'ref-filter'

Karthik Nayak karthik@gmail.com writes: I do not see much point in renaming between these two. The latter makes it sound as if this is only for filtering and from that angle of view is probably a worse name. If you do not think of a better one, and if you are going to name the array

Re: [PATCH v3 00/56] Convert parts of refs.c to struct object_id

On Mon, May 25, 2015 at 12:34:59PM -0700, Junio C Hamano wrote: [PATCH 01/56] was authored by you but has Michael's sign-off, which looked somewhat odd to me, though. Yes, it does. He picked it up from me, and signed off, and I took his branch. I don't believe he changed it, but I didn't

Re: [PATCH v11 2/5] command-list.txt: add the common groups block

On 05/21/2015 08:01 PM, Eric Sunshine wrote: On Thu, May 21, 2015 at 1:39 PM, Sébastien Guimmara sebastien.guimm...@gmail.com wrote: The ultimate goal is for git help to display common commands in groups rather than alphabetically. As a first step, define the groups in a new block, and then

[PATCH v3 09/56] builtin/fetch: rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/fetch.c | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/builtin/fetch.c

[PATCH v3 16/56] add_branch_for_removal(): don't set util field of string_list entries

From: Michael Haggerty mhag...@alum.mit.edu They were never used. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/remote.c | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/builtin/remote.c

[PATCH v3 02/56] each_ref_fn: change to take an object_id parameter

From: Michael Haggerty mhag...@alum.mit.edu Change typedef each_ref_fn to take a const struct object_id *oid parameter instead of const unsigned char *sha1. To aid this transition, implement an adapter that can be used to wrap old-style functions matching the old typedef, which is now called

[PATCH v3 19/56] append_matching_ref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/show-branch.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/builtin/show-branch.c

[PATCH v3 04/56] handle_one_ref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- revision.c | 35 +-- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/revision.c

[PATCH v3 08/56] get_name(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Rewrite to take an object_id argument and convert the local variable peeled object_id. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/describe.c | 16 +++- 1

[PATCH v3 33/56] string_list_add_one_ref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- notes.c | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/notes.c b/notes.c index baa1c41..df08209 100644 ---

[PATCH v3 03/56] builtin/rev-parse: rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/rev-parse.c | 41 + 1 file changed, 17 insertions(+), 24 deletions(-) diff --git

[PATCH v3 21/56] append_one_rev(): rewrite to work with object_id

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/show-branch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/show-branch.c

[PATCH v3 07/56] add_pending_uninteresting_ref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/checkout.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c

[PATCH v3 15/56] add_branch_for_removal(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/remote.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index

[PATCH v3 11/56] name_ref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/name-rev.c | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/builtin/name-rev.c

[PATCH v3 12/56] builtin/pack-objects: rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/pack-objects.c | 26 ++ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git

[PATCH v3 18/56] show_reference(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/replace.c | 18 -- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/builtin/replace.c

[PATCH v3 27/56] builtin/show-ref: rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/tag.c | 20 +--- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/builtin/tag.c b/builtin/tag.c

[PATCH v3 05/56] register_ref(): rewrite to take an object_id argument

From: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- bisect.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/bisect.c b/bisect.c index 0848d91..03d5cd9

[PATCH v3 00/56] Convert parts of refs.c to struct object_id

This is a conversion of parts of refs.c to use struct object_id. refs.c, and the for_each_ref series of functions explicitly, is the source for many instances of object IDs in the codebase. Therefore, it makes sense to convert this series of functions to provide a basis for further conversions.

Re: [PATCH v2 1/2] for-each-ref: re-structure code for moving to 'ref-filter'

I do not see much point in renaming between these two. The latter makes it sound as if this is only for filtering and from that angle of view is probably a worse name. If you do not think of a better one, and if you are going to name the array that contains this thing ref_list, calling

Re: [PATCH v5 1/1] send-email: Add sendmail email aliases format

Junio C Hamano gits...@pobox.com writes: Allen Hubbe alle...@gmail.com writes: Looking closer at this and the other test cases, they are inconsistent about using .mailrc, ~/.mailrc, and $(pwd)/.mailrc. This would add another one, $HOME/.mailrc. In t9001, I see two tests on mailrc: ...

Re: Mark trailing whitespace error in del lines of diff

Christian Brabandt cbli...@256bit.org, Christian Brabandt c...@256bit.org writes: As far as I can see, this does not break any tests and also the behaviour of git-diff --check does not change. Even if this change introduced a bug that changed the behaviour (e.g. say, exited with failure

Re: [PATCH v5 1/1] send-email: Add sendmail email aliases format

Allen Hubbe alle...@gmail.com writes: Thanks for letting me know. Are you still expecting v6 from me then? The other thing you asked for was a change in the documentation: just mention the email programs' documentation, and describe the exceptions. Could you fetch from me and then run: $

Re: [PATCH v2 3/3] http-backend: spool ref negotiation requests to buffer

On 20 May 2015 at 03:37, Jeff King p...@peff.net wrote: + /* partial read from read_in_full means we hit EOF */ + len += cnt; + if (len alloc) { + *out = buf; + warning(request size was %lu, (unsigned

Implementing git-am -3 with git-apply -3?

Hi Junio, I noticed that you implemented a 3-way merge fallback[1] in git-apply that is meant to be similar to git-am's. I wonder if it is possible to implement the 3-way merge in git-am using git-apply. Are there any issues/deficiencies that I need to be aware of? So far, I noticed that: *

Mark trailing whitespace error in del lines of diff

Currently git-diff only highlights trailing whitespace in the new lines (prefixed with '+'), thus it is not visible in the deleted lines (prefixed with '-'). Therefore introduce a new configuration variable for the core.whitespace setting blank-at-eol-old (default off) that will highlight

Re: [PATCH v5 1/1] send-email: Add sendmail email aliases format

On Mon, May 25, 2015 at 9:58 PM, Junio C Hamano gits...@pobox.com wrote: Allen Hubbe alle...@gmail.com writes: Thanks for letting me know. Are you still expecting v6 from me then? The other thing you asked for was a change in the documentation: just mention the email programs' documentation,

Re: [PATCH v5 1/1] send-email: Add sendmail email aliases format

Junio C Hamano gits...@pobox.com writes: Junio C Hamano gits...@pobox.com writes: FYI, I have tentatively queued this on top of your patch. Please see git log master..cf954075 to double check. Sorry but I had a typo there... git format-patch -1 -o outdir - cat

Re: Mark trailing whitespace error in del lines of diff

On Mon, May 25, 2015 at 04:27:40PM -0700, Junio C Hamano wrote: brian m. carlson sand...@crustytoothpaste.net writes: My use case is determining whether a patch to a pristine-tar repository introduced trailing whitespace (which is not okay) or just left it there (which is okay). In your

Re: [PATCH v5 1/1] send-email: Add sendmail email aliases format

On Mon, May 25, 2015 at 5:35 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: Junio C Hamano gits...@pobox.com writes: FYI, I have tentatively queued this on top of your patch. Please see git log master..cf954075 to double check. Sorry but I had a typo

Re: Mark trailing whitespace error in del lines of diff

brian m. carlson sand...@crustytoothpaste.net writes: I like this idea. I don't. My use case is determining whether a patch to a pristine-tar repository introduced trailing whitespace (which is not okay) or just left it there (which is okay). In your use case, where keeping trailing blank

Re: [PATCH v2 3/3] http-backend: spool ref negotiation requests to buffer

On Mon, May 25, 2015 at 10:07:50PM -0400, Konstantin Ryabitsev wrote: On 20 May 2015 at 03:37, Jeff King p...@peff.net wrote: + /* partial read from read_in_full means we hit EOF */ + len += cnt; + if (len alloc) { + *out =

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

Stefan Beller sbel...@google.com writes: DESCRIPTION --- +This command will inspect, update and manage submodules. +Submodules allow you to keep another Git repository in a subdirectory +of your repository. The other repository has its own history,... The first line somehow

Re: Mark trailing whitespace error in del lines of diff

On Mon, May 25, 2015 at 11:11:34PM +0200, Christian Brabandt wrote: Here is my use case: I have been working in a team repository, reformatting the source and wondered, why my reformatting did introduce some trailing whitespace. I suspected a bug in Vim and started to debug it, until I found

Re: [PATCH v5 1/1] send-email: Add sendmail email aliases format

Allen Hubbe alle...@gmail.com writes: Could you fetch from me and then run: $ git log --reverse -3 -p 6b733ee4ba330e1187017895b8426dd9171c33b8 to see if you agree with the result? That is what I queued on 'pu' for now with my fixups. It looks good to me. How would you like me to

Re: Implementing git-am -3 with git-apply -3?

Paul Tan pyoka...@gmail.com writes: I wonder if it is possible to implement the 3-way merge in git-am using git-apply. Are there any issues/deficiencies that I need to be aware of? Anything is possible ;-) Even though I suspect it might be of significant complexity, it certainly would be

Re: [PATCH] git-new-workdir: add windows compatibility

Daniel Smith dansmit...@gmail.com writes: When running on Windows in MinGW, creating symbolic links via ln always failed. Using mklink instead of ln is the recommended method of creating links on Windows:

Re: [PATCH v5 1/1] send-email: Add sendmail email aliases format

Junio C Hamano gits...@pobox.com writes: It probably should be two patches. Your sendmail thing with docs and tests as one patch (with $HOME in test), and fix to mailrc tests I did (minus the part that fixes your sendmail test, which should now become unnecessary) on top. If the