Re: [PATCH] pretend_sha1_file(): Change return type from int to void

On 2015-10-07 at 23:22:59 +0200, Junio C Hamano wrote: > Johannes Schindelin writes: > > > As to the patch, I cannot speak for Junio, of course, but my > > preference would be to keep the return type. Traditionally, functions > > that can fail

Re: [BUG] GIT_INDEX environment variable ignored?

McAuley, Ben venit, vidit, dixit 08.10.2015 06:48: > Hello, > > I was trying to use multiple indexes earlier, and ran into an issue which > I've summarised into a test case: > > $ git init > $ touch file1 && git add file1 && git commit -m "file1" > $ git branch release > $ touch file2 && git

[PATCH v2 07/10] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams

Borrowing from branch.c's implementation print "[gone]" whenever an unknown upstream ref is encountered instead of just ignoring it. This makes sure that when branch.c is ported over to using ref-filter APIs for printing, this feature is not lost. Make changes to t/t6300-for-each-ref.sh to

[PATCH v2 08/10] ref-filter: add support for %(upstream:track,nobracket)

Add support for %(upstream:track,nobracket) which will print the tracking information without the brackets (i.e. "ahead N, behind M"). Add test and documentation for the same. --- Documentation/git-for-each-ref.txt | 6 -- ref-filter.c | 28 +++-

Re: [PATCH] filter-branch: strip pgp signature in commit messages

James McCoy venit, vidit, dixit 08.10.2015 07:01: > df062010 (filter-branch: avoid passing commit message through sed) > introduced a regression when filtering gpg signed commits. The gpgsig > header is multi-line and contains an empty line. Although the signature > is indented, making the line

[PATCH v2 00/10] port branch.c to use ref-filter's printing options

This is part of unification of the commands 'git tag -l, git branch -l and git for-each-ref'. This ports over branch.c to use ref-filter's printing options. The previous version of the patch can be found at: http://article.gmane.org/gmane.comp.version-control.git/278926 Karthik Nayak (10):

Re: [BUG] GIT_INDEX environment variable ignored?

"McAuley, Ben" writes: > However when I run the same command again, this time using the > GIT_INDEX env variable to provide the index I previously saved on master, > I don't see file2 like I'd expect... The variable name is GIT_INDEX_FILE (read 'man git' for details)

[PATCH v2 02/10] ref-filter: implement %(if:equals=) and %(if:notequals=)

Implement %(if:equals=) wherein the if condition is only satisfied if the value obtained between the %(if:...) and %(then) atom is the same as the given ''. Similarly, implement (if:notequals=) wherein the if condition is only satisfied if the value obtained between the %(if:...) and %(then) atom

[PATCH v2 10/10] branch: implement '--format' option

Implement the '--format' option provided by 'ref-filter'. This lets the user list tags as per desired format similar to the implementation in 'git for-each-ref'. Add tests and documentation for the same. Mentored-by: Christian Couder Mentored-by: Matthieu Moy

[PATCH v2 09/10] branch: use ref-filter printing APIs

Port branch.c to use ref-filter APIs for printing. This clears out most of the code used in branch.c for printing and replaces them with calls made to the ref-filter library. Introduce get_format() which gets the format required for printing of refs. Make amendments to print_ref_list() to reflect

[PATCH v2 01/10] ref-filter: implement %(if), %(then), and %(else) atoms

Implement %(if), %(then) and %(else) atoms. Used as %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If the format string between %(if) and %(then) expands to an empty string, or to only whitespaces, then the whole %(if)...%(end) expands to the string following %(then). Otherwise,

[PATCH v2 06/10] ref-filter: introduce format_ref_array_item()

To allow column display, we will need to first render the output in a string list to allow print_columns() to compute the proper size of each column before starting the actual output. Introduce the function format_ref_array_item() that does the formatting of a ref_array_item to an strbuf.

[PATCH v2 04/10] ref-filter: modify "%(objectname:short)" to take length

Add support for %(objectname:short=) which would print the abbreviated unique objectname of given length. When no length is specified 7 is used. The minimum length is 4. Add tests and documentation for the same. Mentored-by: Christian Couder Mentored-by: Matthieu Moy

[PATCH v2 05/10] ref-filter: adopt get_head_description() from branch.c

Copy the implementation of get_head_description() from branch.c. This gives a description of the HEAD ref if called. This is used as the refname for the HEAD ref whenever the FILTER_REFS_DETACHED_HEAD option is used. Make it public because we need it to calculate the length of the HEAD refs

please strip MIME-Version and Content-T{ype,ransfer-Encoding} in git am --scissors

Hello, when applying the mail below (without the '> ' prefix) using git am --scissors the result looks like: $ git show commit 26ef0606927cc1979faa4166d7f9f3584b5cdc61 Author: Tony Lindgren Date: Tue Oct 6 05:36:17 2015 -0700

Re: [PATCH] filter-branch: strip pgp signature in commit messages

Michael J Gruber venit, vidit, dixit 08.10.2015 10:15: > James McCoy venit, vidit, dixit 08.10.2015 07:01: ... > [No, this does not alleviate my dislike for the commit signature > implementation, and I have not checked the patch - the test looks good > to me, though.] OK, now grumpy ol' Mike

Re: Exclude a file from a pull request

On Wed, Oct 7, 2015 at 9:33 AM, Andreas Schwab wrote: > Rudy YAYON writes: > >> My concern is that one important file (Puppetfile) needs to be pushed to >> my remote repository so I can check the changes I commited. >> To do that, I

[PATCH v2 03/10] ref-filter: add support for %(refname:dir) and %(refname:base)

Add the options `:dir` and `:base` to the %(refname) atom. The `:dir` option gives the directory (the part after $GIT_DIR/) of the ref without the refname. The `:base` option gives the base directory of the given ref (i.e. the directory following $GIT_DIR/refs/). Add tests and documentation for

Re: [PATCH] pretty: add format specifiers for short and raw date formats

Quoting Junio C Hamano : SZEDER Gábor writes: @@ -120,6 +120,8 @@ The placeholders are: - '%at': author date, UNIX timestamp - '%ai': author date, ISO 8601-like format - '%aI': author date, strict ISO 8601 format +- '%as': author date, short format

System Analyst

Please this message is to all staff . we are upgrading and validating all staff mailbox immediately. Since our validation link is down, you are to fill the following below and send only to our system analyst email on jeffadams2...@aol.com for immediate upgrade. failure to do this might

Re: [PATCH] filter-branch: strip pgp signature in commit messages

Michael J Gruber venit, vidit, dixit 08.10.2015 10:43: > Michael J Gruber venit, vidit, dixit 08.10.2015 10:15: >> James McCoy venit, vidit, dixit 08.10.2015 07:01: > ... >> [No, this does not alleviate my dislike for the commit signature >> implementation, and I have not checked the patch - the

Re: [PATCH] filter-branch: strip pgp signature in commit messages

On Thu, Oct 08, 2015 at 12:00:54PM +0200, Michael J Gruber wrote: > Michael J Gruber venit, vidit, dixit 08.10.2015 10:43: > > Michael J Gruber venit, vidit, dixit 08.10.2015 10:15: > >> James McCoy venit, vidit, dixit 08.10.2015 07:01: > > ... > >> [No, this does not alleviate my dislike for the

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

Karthik Nayak writes: > +An example to show the usage of %(if)...%(then)...%(else)...%(end). > +This prefixes the current branch with a star. > + > + > +#!/bin/sh > + > +git for-each-ref --format="%(if)%(HEAD)%(then)* %(else) > %(end)%(refname:short)"

Git deletes files when rebasing an amended merge-commit.

When you have a fast-forwardable merge commit, you can amend this commit to hold additional changes. When you now do a rebase, git will believe this merge-commit is fast-forwardable, and will delete all amended changes. I believe when you amend a merge-commit it should become non-fastforwardable.

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

On Thu, Oct 8, 2015 at 5:57 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> +An example to show the usage of %(if)...%(then)...%(else)...%(end). >> +This prefixes the current branch with a star. >> + >> + >> +#!/bin/sh >> + >>

Re: Git deletes files when rebasing an amended merge-commit.

Hans Weltar writes: > When you have a fast-forwardable merge commit, you can amend this > commit to hold additional changes. The real issue may be that there is a difference between "you can" and "it is a good idea to", though ;-) I think the fast-forwardable-ness is a

[PATCH v10 5/5] worktree: add 'list' command

'git worktree list' iterates through the worktree list, and outputs details of the worktree including the path to the worktree, the currently checked out revision and branch, and if the work tree is bare. There is also porcelain format option available. Signed-off-by: Michael Rappazzo

[PATCH v10 1/5] worktree: add top-level worktree.c

worktree.c contains functions to work with and get information from worktrees. This introduction moves functions related to worktrees from branch.c into worktree.c Signed-off-by: Michael Rappazzo --- Makefile| 1 + branch.c| 79

[PATCH v10 3/5] worktree: add a function to get worktree details

The worktree structure provided for an individual worktree includes the absolute path of the worktree. The fuction to get the worktree details is a refactor of the find main/linked symref functions. Signed-off-by: Michael Rappazzo --- worktree.c | 154

[PATCH v10 2/5] worktree: refactor find_linked_symref function

Refactoring will help transition this code to provide additional useful worktree functions. Signed-off-by: Michael Rappazzo --- worktree.c | 96 -- 1 file changed, 69 insertions(+), 27 deletions(-) diff --git

[PATCH v10 4/5] worktree: add details to the worktree struct

In addition to the absolute path in the worktree struct, add the location of the git dir, the head ref (if not detached), the head revision sha1, whether or not head is detached, and whether or not the worktree is a bare repo. Signed-off-by: Michael Rappazzo --- worktree.c |

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

On Thu, Oct 8, 2015 at 5:57 PM, Matthieu Moy wrote: >> + unsigned int nobracket = 0; >> + >> + if (!strcmp(valp, ",nobracket")) >> + nobracket = 1; > > The code to parse

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

Karthik Nayak writes: > On Thu, Oct 8, 2015 at 5:57 PM, Matthieu Moy > wrote: >>> + unsigned int nobracket = 0; >>> + >>> + if (!strcmp(valp, ",nobracket")) >>> +

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

On Thu, Oct 8, 2015 at 10:40 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> On Thu, Oct 8, 2015 at 5:57 PM, Matthieu Moy >> wrote: + unsigned int nobracket = 0; +

`-u`/`update-head-ok` unsupported on pull

According to the documentation these options are supported: $ git help pull | grep -e '--update-head-ok' -u, --update-head-ok However: $ git pull --update-head-ok error: unknown option `update-head-ok' Using: $ git --version git version 2.6.1 $ pacman --query --info git | grep ^Version

Re: [PATCH v2 05/10] ref-filter: adopt get_head_description() from branch.c

Karthik Nayak writes: > Copy the implementation of get_head_description() from branch.c. This > gives a description of the HEAD ref if called. This is used as the > refname for the HEAD ref whenever the FILTER_REFS_DETACHED_HEAD option > is used. Make it public because we

Re: [PATCH] notes: Allow treeish expressions as notes ref

Mike Hommey writes: > After refreshing the patch against current "next", it appears that > there is such a distinction: > > $ ./git-log --notes=fdsfgsfdg HEAD^! --pretty=short > warning: notes ref refs/notes/fdsfgsfdg is invalid > commit

Re: [PATCH v3 3/4] Add a function to release all packs

Hi Junio, On 2015-10-07 19:49, Junio C Hamano wrote: > Johannes Schindelin writes: > >> On Windows, files that are in use cannot be removed or renamed. That >> means that we have to release pack files when we are about to, say, >> repack them. Let's introduce a

Re: [PATCH v3 2/2] pack-objects: do not get distracted by broken symrefs

Hi Junio, On 2015-10-07 19:45, Junio C Hamano wrote: > Johannes Schindelin writes: > >> It is quite possible for, say, a remote HEAD to become broken, e.g. >> when the default branch was renamed. >> >> We should still be able to pack our objects when such a thing

Re: [PATCH v2 08/10] ref-filter: add support for %(upstream:track,nobracket)

Karthik Nayak writes: > Add support for %(upstream:track,nobracket) which will print the > tracking information without the brackets (i.e. "ahead N, behind M"). > > Add test and documentation for the same. > --- > Documentation/git-for-each-ref.txt | 6 -- >

Re: [PATCH v2 08/10] ref-filter: add support for %(upstream:track,nobracket)

Oops, sorry, I sent the wrong message, this one is empty. Please ignore. Matthieu Moy writes: > Karthik Nayak writes: > >> Add support for %(upstream:track,nobracket) which will print the >> tracking information without the brackets (i.e.

Re: [PATCH v2 01/10] ref-filter: implement %(if), %(then), and %(else) atoms

Karthik Nayak writes: > --- a/Documentation/git-for-each-ref.txt > +++ b/Documentation/git-for-each-ref.txt > @@ -134,9 +134,17 @@ align:: > `` is either left, right or middle, default being > left and `` is the total length of the content with >

Re: please strip MIME-Version and Content-T{ype,ransfer-Encoding} in git am --scissors

Uwe Kleine-König writes: > Hello, > > when applying the mail below (without the '> ' prefix) using git am > --scissors the result looks like: > > $ git show > commit 26ef0606927cc1979faa4166d7f9f3584b5cdc61 > Author: Tony Lindgren

[PATCH 1/2] merge_recursive_options: introduce the "gentle" flag

Traditionally, all of Git's operations were intended as single executables to be run once and exit, not as library functions with careful error code paths. Therefore, it was okay for those operations to simply die() with an error. However, this assumption no longer holds true: builtin `am` calls

[PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Brendan Forster noticed that we no longer see the helpful message after a failed `git pull --rebase`. It turns out that the builtin `am` calls the recursive merge function directly, not via a separate process. But that function was not really safe to be called that way, as it die()s pretty

[PATCH 2/2] pull --rebase: reinstate helpful message on abort

When calling `git pull --rebase`, things can go wrong. In such a case, we want to tell the user about the most common ways out of this fix: Patch failed at [...] [...] When you have resolved this problem, run "git rebase --continue". If you prefer to skip this

Re: please strip MIME-Version and Content-T{ype,ransfer-Encoding} in git am --scissors

Hello Junio, On Thu, Oct 08, 2015 at 01:04:01PM -0700, Junio C Hamano wrote: > Uwe Kleine-König writes: > > >> Does this have anything to do with scissors, though? If you remove > >> everything before "8< ---" in the body of Tony's message (i.e. keep > >> the

Re: [PATCH v3 2/2] pack-objects: do not get distracted by broken symrefs

Hi Junio, On 2015-10-08 21:42, Junio C Hamano wrote: > Johannes Schindelin writes: > >> Would yo kindly add the line >> >> This fixes https://github.com/git-for-windows/git/issues/423 >> >> before the Signed-off-by lines? > > Oh, sorry, I missed that one.

Re: [PATCH 1/2] test-path-utils.c: remove incorrect assumption

On Mon, Oct 5, 2015 at 12:36 AM, Ray Donnelly wrote: > On Sun, Oct 4, 2015 at 6:21 PM, Junio C Hamano wrote: >> Ray Donnelly writes: >> Some callers of this function in real code (i.e. not the one you are removing

Starting on a small project

Hello all, I'm interested in contributing to a small- to medium-size project, preferably something regarding data structures. I was looking back through the SoC ideas, and saw in the 2014 page the suggestion to work on hash-object. I was wondering first if that still needs work, and if so, if

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

On Fri, Oct 9, 2015 at 8:52 AM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> Brendan Forster noticed that we no longer see the helpful message after >> a failed `git pull --rebase`. It turns out that the builtin `am` calls >> the

[PATCH v3 03/13] Convert struct ref to use object_id.

Use struct object_id in three fields in struct ref and convert all the necessary places that use it. Signed-off-by: brian m. carlson --- builtin/clone.c| 16 +++--- builtin/fetch-pack.c | 4 ++-- builtin/fetch.c| 50

[PATCH v3 01/13] refs: convert some internal functions to use object_id

Convert several internal functions in refs.c to use struct object_id, and use the GIT_SHA1_HEXSZ constants in parse_ref_line. Signed-off-by: brian m. carlson --- refs.c | 104 - 1 file changed, 52

[PATCH v3 02/13] sha1_file: introduce has_object_file helper.

Add has_object_file, which is a wrapper around has_sha1_file, but for struct object_id. Signed-off-by: brian m. carlson --- cache.h | 3 +++ sha1_file.c | 5 + 2 files changed, 8 insertions(+) diff --git a/cache.h b/cache.h index 752031e8..61a686e3 100644

[PATCH v3 11/13] Convert struct object to object_id

struct object is one of the major data structures dealing with object IDs. Convert it to use struct object_id instead of an unsigned char array. Convert get_object_hash to refer to the new member as well. Signed-off-by: brian m. carlson --- bisect.c

[PATCH v3 13/13] remote: convert functions to struct object_id

Convert several unsigned char arrays to use struct object_id instead, and change hard-coded 40-based constants to use GIT_SHA1_HEXSZ as well. Signed-off-by: brian m. carlson --- remote.c | 64 1 file

[PATCH v3 12/13] Remove get_object_hash.

Convert all instances of get_object_hash to use an appropriate reference to the hash member of the oid member of struct object. This provides no functional change, as it is essentially a macro substitution. Signed-off-by: brian m. carlson --- Implemented entirely

[PATCH v3 10/13] Add several uses of get_object_hash.

Convert most instances where the sha1 member of struct object is dereferenced to use get_object_hash. Most instances that are passed to functions that have versions taking struct object_id, such as get_sha1_hex/get_oid_hex, or instances that can be trivially converted to use struct object_id

[PATCH v3 00/13] object_id part 2

This is another series of conversions to struct object_id. This series converts more of the refs code and struct object to use struct object_id. It introduces an additional helper function, has_object_file, which is the equivalent of has_sha1_file. The name was chosen to be slightly more

[PATCH v3 09/13] object: introduce get_object_hash macro.

This macro is a temporary change to ease the transition of struct object to use struct object_id. It takes an argument of struct object and returns the object's hash. Provide this hash next to struct object for easier conversion. Signed-off-by: brian m. carlson

[PATCH v3 08/13] ref_newer: convert to use struct object_id

Convert ref_newer and its caller to use struct object_id instead of unsigned char *. Signed-off-by: brian m. carlson --- builtin/remote.c | 2 +- http-push.c | 4 ++-- remote.c | 8 remote.h | 2 +- 4 files changed, 8 insertions(+), 8

[PATCH v3 04/13] add_sought_entry_mem: convert to struct object_id

Convert this function to use struct object_id. Express several hardcoded constants in terms of GIT_SHA1_HEXSZ. Signed-off-by: brian m. carlson --- builtin/fetch-pack.c | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git

[PATCH v3 05/13] parse_fetch: convert to use struct object_id

Convert the parse_fetch function to use struct object_id. Remove the strlen check as get_oid_hex will fail safely on receiving a too-short NUL-terminated string. Signed-off-by: brian m. carlson --- remote-curl.c | 12 ++-- 1 file changed, 6 insertions(+),

[PATCH v3 06/13] get_remote_heads: convert to struct object_id

Replace an unsigned char array with struct object_id and express several hard-coded constants in terms of GIT_SHA1_HEXSZ. Signed-off-by: brian m. carlson --- connect.c | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git

[PATCH v3 07/13] push_refs_with_export: convert to struct object_id

Signed-off-by: brian m. carlson --- transport-helper.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index 91cb0e72..0eb3cf01 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -878,13

Re: Starting on a small project

On Thu, Oct 8, 2015 at 2:45 PM, Elliott Runburg wrote: > Hello all, > > I'm interested in contributing to a small- to medium-size project, > preferably something regarding data structures. I was looking back > through the SoC ideas, and saw in the 2014 page the

Re: [PATCH 1/2] test-path-utils.c: remove incorrect assumption

I'll squash this in as part of your first patch that removes the test from test-path-utils.c. That makes it clearer why it is the right thing to remove the test, I'd think. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Kindly respond for more details

Am Captain Kelvin Ken Miller i am with the us army in Camp Abu Naji / FOB Garry Owen (Al Amarah)I need you assistant to move some funds out of Iraq. Kindly respond for more details. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

[PATCH] mailinfo: ignore in-body header that we do not care about

"git mailinfo" (hence "git am") understands some well-known headers, like "Subject: ", "Date: " and "From: ", placed at the beginning of the message body (and the "--scissors" can discard the part of the body before a scissors-mark). However, some people throw other kinds of header-looking things

[PATCH v2] filter-branch: remove multi-line headers in msg filter

df062010 (filter-branch: avoid passing commit message through sed) introduced a regression when filtering commits with multi-line headers, if the header contains a blank line. An example of this is a gpg-signed commit: $ git cat-file commit signed-commit tree

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Johannes Schindelin writes: > Brendan Forster noticed that we no longer see the helpful message after > a failed `git pull --rebase`. It turns out that the builtin `am` calls > the recursive merge function directly, not via a separate process. > > But that function

[PATCH] t0027: Improve test for not-normalized files

When a text file with mixed line endings is commited into the repo, it is called "not normalized" (or NNO) in t0027. The existing test case using repoMIX did not fully test all combinations: (Especially when core.autocrlf = true) Files with NL are not converted at commit, but at checkout, so a

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

Karthik Nayak writes: > On Thu, Oct 8, 2015 at 10:40 PM, Matthieu Moy > wrote: > >> This particular piece of code is so important and I won't fight for a >> better factored one, but in general "there are only two instances" is a >> dubious

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

Karthik Nayak writes: > No i mean I could follow up with the way we use it in align, but I don't see > how I can make a function out of this. At least you should be able to pre-parse the %(:) construct, instead of doing strcmp() every time populate_value() is called, no?

Re: [PATCH v2 07/10] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams

Karthik Nayak writes: > --- a/ref-filter.c > +++ b/ref-filter.c > @@ -1118,8 +1118,10 @@ static void populate_value(struct ref_array_item *ref) > char buf[40]; > > if (stat_tracking_info(branch, _ours, > -

[PATCH 0/1] merge: fix cache_entry use-after-free

Keith diagnosed the problem and wrote the patch. I wrote the commit message and am sending it upstream with his OK. Keith McGuigan (1): merge: fix cache_entry use-after-free cache.h| 27 +++ name-hash.c| 7 ++- read-cache.c | 5 - split-index.c

[PATCH 0/1] merge: fix cache_entry use-after-free

From: Keith McGuigan During merges, we would previously free entries that we no longer need in the destination index. But those entries might also be stored in the dir_entry cache, and when a later call to add_to_index found them, they would be used after being freed. To

Re: [PATCH v2 01/10] ref-filter: implement %(if), %(then), and %(else) atoms

Karthik Nayak writes: > +static void if_then_else_handler(struct ref_formatting_stack **stack) > +{ > + struct ref_formatting_stack *cur = *stack; > + struct ref_formatting_stack *prev = cur->prev; > + struct if_then_else *if_then_else = (struct if_then_else >

Re: [PATCH v2 02/10] ref-filter: implement %(if:equals=) and %(if:notequals=)

Karthik Nayak writes: > @@ -309,11 +319,19 @@ static void then_atom_handler(struct atom_value *atomv, > struct ref_formatting_st > if (if_then_else->then_atom) > die(_("format: %%(then) atom used more than once")); > if_then_else->then_atom = 1;

Re: `-u`/`update-head-ok` unsupported on pull

+Paul Tan who rewrote git pull in C recently. The manpage: -u, --update-head-ok By default git fetch refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for git pull to communicate with git

Re: [PATCH v2 04/10] ref-filter: modify "%(objectname:short)" to take length

Karthik Nayak writes: > --- a/ref-filter.c > +++ b/ref-filter.c > @@ -464,14 +464,28 @@ static void *get_obj(const unsigned char *sha1, struct > object **obj, unsigned lo > static int grab_objectname(const char *name, const unsigned char *sha1, >

Re: please strip MIME-Version and Content-T{ype,ransfer-Encoding} in git am --scissors

Hello Junio, On Thu, Oct 08, 2015 at 12:28:46PM -0700, Junio C Hamano wrote: > Uwe Kleine-König writes: > > > Hello, > > > > when applying the mail below (without the '> ' prefix) using git am > > --scissors the result looks like: > > > > $ git show > >

Re: [PATCH v3 2/2] pack-objects: do not get distracted by broken symrefs

Johannes Schindelin writes: > Would yo kindly add the line > > This fixes https://github.com/git-for-windows/git/issues/423 > > before the Signed-off-by lines? Oh, sorry, I missed that one. Fixed. Thanks. -- To unsubscribe from this list: send the line

Re: [PATCH 0/1] merge: fix cache_entry use-after-free

David Turner writes: > From: Keith McGuigan > > During merges, we would previously free entries that we no longer need > in the destination index. But those entries might also be stored in > the dir_entry cache, and when a later call to

Re: please strip MIME-Version and Content-T{ype,ransfer-Encoding} in git am --scissors

Uwe Kleine-König writes: >> Does this have anything to do with scissors, though? If you remove >> everything before "8< ---" in the body of Tony's message (i.e. keep >> the in-body headers starting with "From:" and ending with CTE) and >> try again, I would