[PATCH 1/2] t750*: make tests for commit messages more pedantic

Currently messages are compared with --pretty=format:%s%b which does not retain raw format of commit message. In result it's not clear what part of expected commit msg is subject and what part is body. Also, it's impossible to test if messages with multiple lines are handled correctly, which may be

[PATCH 2/2] commit: fix ending newline for template files

git-commit with -t or -F -e uses content of user-supplied file as initial value for commit msg in editor. There is no guarantee, that this file ends with newline - it depends on file content and editor used to create file (some editors append and hide last newline from user while others do not). W

[PATCH 0/2] commit -t appends newline after template file

These are my first patches to git, so be extra pedantic during review, please. I noticed, that newline is appended, when I try to use template file - which is annoying if template ends with comment. I digged a bit and it turned out that: * my editor (vim) was appending newline before eof in templ

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

Daniel Smith 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: > http://stackoverflow.com/questions/18641864/git-bash-shell-fails-to-create-symbolic-links > > Script

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

Jeff King writes: > Whoops, yeah, it was just for debugging. I missed that one when sending > out the patch. > > Junio, the squashable patch is below (on jk/http-backend-deadlock-2.2), > and it looks like nothing has hit "next" yet. But you did do some > up-merging of the topic. Let me know if yo

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

Junio C Hamano 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 documentation I queued

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

Paul Tan 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 nice if "apply -3"

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

Allen Hubbe 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 proceed?

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: * git

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 wrote: > > + /* partial read from read_in_full means we hit EOF */ > > + len += cnt; > > + if (len < alloc) { > > + *out = buf

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

On Mon, May 25, 2015 at 9:58 PM, Junio C Hamano wrote: > Allen Hubbe 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 >> except

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

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

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

Allen Hubbe 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: $ git log --reve

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

On Mon, May 25, 2015 at 5:35 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Junio C Hamano 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 -

Re: Mark trailing whitespace error in del lines of diff

Christian Brabandt , Christian Brabandt 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 status code when only preimage had e

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" 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 use case, where ke

Re: Mark trailing whitespace error in del lines of diff

"brian m. carlson" 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 that is otherwise not O

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 foun

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

Stefan Beller 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 bothered me, so

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 traili

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

Junio C Hamano writes: > Junio C Hamano 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 >>~/.tmp-email-aliases <<-\EOF && > +

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

Junio C Hamano writes: > Allen Hubbe 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: > ... > So I do not see

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

Karthik Nayak 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 that contains >

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 che

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

"brian m. carlson" 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 original series, just in a

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/remote.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index 27a611b..1986e98 100644 --- a/builtin/remote.c +++ b/builtin/remote.

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/name-rev.c | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/builtin/name-rev.c b/builtin/name-rev.c index 41bdf0a..248a3eb 100644 --- a/builtin/name-rev.c +++ b/buil

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/pack-objects.c | 26 ++ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 81f0e57..80fe8c7 100644 --- a

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/replace.c | 18 -- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index bcf1508..0d52e7f 100644 --- a/builtin/replace.c +++ b

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/tag.c | 20 +--- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/builtin/tag.c b/builtin/tag.c index 7d8cd8c..5f6cdc5 100644 --- a/builtin/tag.c +++ b/builtin/tag.c

[PATCH v3 22/56] builtin/show-branch: rewrite functions to work with object_id

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/show-branch.c | 42 +- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index b861e41..826d9fa

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

From: Michael Haggerty They were never used. Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/remote.c | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index 1986e98..ab39fea 100644 --- a/builtin/remote.c

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

From: Michael Haggerty 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 "each_ref_sha1_fn"),

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/show-branch.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index cf918f4..b06f966 100644 --- a/builtin/show-bran

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- revision.c | 35 +-- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/revision.c b/revision.c index 93b23a6..cfe3876 100644 --- a/revision.c +++ b/revision.c

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

From: Michael Haggerty Rewrite to take an object_id argument and convert the local variable "peeled" object_id. Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/describe.c | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/builtin/d

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- notes.c | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/notes.c b/notes.c index baa1c41..df08209 100644 --- a/notes.c +++ b/notes.c @@ -918,7 +918,7 @@ out: return ret;

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/rev-parse.c | 41 + 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index e75ce75..b623239 100644

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/show-branch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 7e00657..b861e41 100644 --- a/builtin/show-branch.c +++

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/checkout.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 9416aa2..9b49f0e 100644 --- a/builtin/checkout.c +++ b/builtin

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/fetch.c | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index 4878c3d..8d5b2db 100644 --- a/builtin/fetch.c +++ b/b

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- replace_object.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/replace_object.c b/replace_object.c index a8a2da9..f0b39f0 100644 --- a/replace_object.c +++ b/replace_object.

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

From: Michael Haggerty 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 Signed-off-by: brian m. carlson --- fetch-pack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- log-tree.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/log-tree.c b/log-tree.c index 1a0e170..abf5cc3 100644 --- a/log-tree.c +++ b/log-tree.c @@ -89,7 +89,8 @@ const

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- upload-pack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index 96dbedc..8268037 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -746,11 +746,1

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- refs.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/refs.c b/refs.c index 7515c2e..a742d79 100644 --- a/refs.c +++ b/refs.c @@ -10,7 +10,7 @@ struct ref_

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- reachable.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/reachable.c b/reachable.c index acac86a..9cff25b 100644 --- a/reachable.c +++ b/reachable.c @@ -22,9 +22,10 @@

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- upload-pack.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index 52fab23..96dbedc 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -741,8 +74

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- refs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/refs.c b/refs.c index 162760c..7515c2e 100644 --- a/refs.c +++ b/refs.c @@ -1757,7 +1757,7 @@ int ref_exists(const char *r

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- revision.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/revision.c b/revision.c index cfe3876..1d903cf 100644 --- a/revision.c +++ b/revision.c @@ -1293,7 +1293,8 @@ static

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

From: Michael Haggerty This function can be used with for_each_ref() without having to be wrapped. Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- fetch-pack.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fetch-pack.c b/fetch-pack.c index

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- transport.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/transport.c b/transport.c index 58cb9ed..df87386 100644 --- a/transport.c +++ b/transport.c @@ -299,18 +299,18 @@ s

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

From: Michael Haggerty 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 Signed-off-by: brian m. carlson --- refs.c | 8 refs.h | 11 --- 2 files ch

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- log-tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/log-tree.c b/log-tree.c index abf5cc3..01beb11 100644 --- a/log-tree.c +++ b/log-tree.c @@ -98,14 +98,14 @@ static int

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- walker.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/walker.c b/walker.c index bb2e0b9..44a936c 100644 --- a/walker.c +++ b/walker.c @@ -200,9 +200,11 @@ static int in

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- transport.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/transport.c b/transport.c index df87386..40692f8 100644 --- a/transport.c +++ b/transport.c @@ -278,8 +278,8

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- upload-pack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index 929284f..1cb9a94 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -717,7 +717,

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

From: Michael Haggerty This function can be used with for_each_ref() without having to be wrapped. Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- fetch-pack.c | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fetch-pack.c b/fetch-pack.c index

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- sha1_name.c | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 1aad0a322..1cb8108 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -831,11 +831,11

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- remote.c | 19 --- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/remote.c b/remote.c index 6d66ec1..1623eae 100644 --- a/remote.c +++ b/remote.c @@ -2024,7 +2024,8 @@ int

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- upload-pack.c | 32 ++-- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index 8268037..929284f 100644 --- a/upload-pack.c +++ b/

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- fetch-pack.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/fetch-pack.c b/fetch-pack.c index 5380b1b..1e875cf 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -70,9 +70

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

From: Michael Haggerty 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 Signed-off-by: brian m. carlson --- fetch-pack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- submodule.c | 22 +++--- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/submodule.c b/submodule.c index f0f34b6..e4c59df 100644 --- a/submodule.c +++ b/submodule.c @@ -422

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- help.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/help.c b/help.c index f813093..6f3415b 100644 --- a/help.c +++ b/help.c @@ -407,7 +407,7 @@ struct similar_ref_cb {

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- server-info.c | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/server-info.c b/server-info.c index 317dda8..c82e9ee 100644 --- a/server-info.c +++ b/server-info.c @@ -47,1

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/fsck.c | 29 + 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/builtin/fsck.c b/builtin/fsck.c index 48d0c2e..4e8e2ee 100644 --- a/builtin/fsck.c +++ b

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- http-backend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http-backend.c b/http-backend.c index a2d388d..55353ad 100644 --- a/http-backend.c +++ b/http-backend.c @@ -408,10 +

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- shallow.c | 29 +++-- 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/shallow.c b/shallow.c index 9488edc..257d811 100644 --- a/shallow.c +++ b/shallow.c @@ -475,1

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/show-branch.c | 35 +-- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index b06f966..7e00657 100644

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/receive-pack.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 12ecacd..94d0571 100644 --- a/builtin/receive-pack

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- http-backend.c | 23 +-- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/http-backend.c b/http-backend.c index e4f3de3..a2d388d 100644 --- a/http-backend.c +++ b/http-b

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/for-each-ref.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index caccd93..05ce28c 100644 --- a/builtin/for-each-re

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/show-ref.c | 33 +++-- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 8e25536..18f84fb 100644 --- a/buil

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/remote.c | 21 - 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index ab39fea..f4a6ec9 100644 --- a/builtin/remote.c +++ b/

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/reflog.c | 16 ++-- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/builtin/reflog.c b/builtin/reflog.c index 1163dd6..c2eb8ff 100644 --- a/builtin/reflog.c +++ b/built

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

From: Michael Haggerty We need to convert the SHA-1 to hexadecimal before printing it. Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/show-branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/show-branch.c b/builtin/show-branch.c in

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/show-ref.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 18f84fb..dfbc314 100644 --- a/builtin/show-ref.c +++ b/builtin/s

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- builtin/branch.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index b27adcb..0d3b9af 100644 --- a/builtin/branch.c +++ b/builtin/branch.

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

Signed-off-by: brian m. carlson Signed-off-by: Michael Haggerty --- refs.c | 44 ++-- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/refs.c b/refs.c index 8480d8d..9ca4651 100644 --- a/refs.c +++ b/refs.c @@ -161,7 +161,7 @@ struct ref_val

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

From: Michael Haggerty Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson --- bisect.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/bisect.c b/bisect.c index 0848d91..03d5cd9 100644 --- a/bisect.c +++ b/bisect.c @@ -400,16 +400,16 @@ struct com

[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 "r

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 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 assign a group to each commo

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 wrote: 'git help' shows common commands in alphabetical order: The most commonly used git commands are: addAdd file contents to the index bisect Find by binary search the chan

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

Karthik Nayak 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; > +}; I do not

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

Allen Hubbe 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 point at i

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 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. I will like to embar

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 Der

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 w

[PATCH] Fixed a typographical error

>From e8c2ea38865cf5dcc135e34ec2e80def8736b582 Mon Sep 17 00:00:00 2001 From: Alangi Derick 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 directory. The error was

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

On Sat, May 23, 2015 at 6:24 PM, Allen Hubbe wrote: > On Sat, May 23, 2015 at 2:07 PM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> A small thing I noticed in the test (and this patch is not adding a >>> new "breakage"---there are a few existing instances) is the use of >>> "~/"; it sh

[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 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 Mentored-by: Matthieu Moy

[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 b

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

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

[PATCH] completion: suggest sequencer commands for revert

Signed-off-by: Thomas Braun --- 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 a/contrib/completion/git-completion.b

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 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 to how Qt