Re: [PATCH] blame: display a more helpful error message if the file was deleted

Alex Henrie writes: > `git blame 22414770 generate-cmdlist.perl` currently results in: > fatal: cannot stat path '22414770': No such file or directory > > This patch changes the error message to: > fatal: ambiguous argument 'generate-cmdlist.perl': unknown

Re: [PATCHv2 0/7] Rerolling sb/submodule-parallel-fetch for the time after 2.7

Stefan Beller writes: > I am sending out a new version for replacing sb/submodule-parallel-fetch for > the time after the 2.7 release. > > * Dropped the patch, which introduces xread_nonblock > * strbuf_read_once uses xread now. This is safe as we poll before using >

Re: [PATCH 1/2] push: Fully test --recurse-submodules on command line overrides config

On Thu, Dec 3, 2015 at 5:10 AM, Mike Crowe wrote: > t5531 only checked that the push.recurseSubmodules config option was > overridden by passing --recurse-submodules=check on the command line. > Add new tests for overriding with --recurse-submodules=no, > --no-recurse-submodules

Re: [PATCH 2/2] push: add '-d' as shorthand for '--delete'

Jeff King writes: > At this point, it seems that "--delete" is useful, and nothing else has > been proposed for "-d" in the intervening years. It seems like a > reasonable use of the flag to me. I think there were two (and a half) reasons why we didn't let "--delete" use a

Re: [PATCH v2 05/11] ref-filter: skip deref specifier in match_atom_name()

On Wed, Dec 16, 2015 at 10:29 AM, Karthik Nayak wrote: > In upcoming patches we make calls to match_atom_name() with the '*' > deref specifier still attached to the atom name. This causes > undesirable errors, hence, if present skip over the '*' deref > specifier in the

Re: [PATCH] credential-store: don't pass strerror to die_errno()

On Wed, Dec 16, 2015 at 12:22:55PM +0100, SZEDER Gábor wrote: > Signed-off-by: SZEDER Gábor > --- > > v2 fixed this, but it fell on the floor, I suppose because of the > maintainer switch. Anyway, I should have noticed it while the patch > was still cooking, sorry. Oops. I

Re: [PATCH] mingw: emulate write(2) that fails with a EPIPE

Johannes Schindelin writes: > On Windows, when writing to a pipe fails, errno is always > EINVAL. However, Git expects it to be EPIPE. > > According to the documentation, there are two cases in which write() > triggers EINVAL: the buffer is NULL, or the length is odd

Re: [PATCH v2 01/11] strbuf: introduce strbuf_split_str_without_term()

On Wed, Dec 16, 2015 at 10:29 AM, Karthik Nayak wrote: > strbuf: introduce strbuf_split_str_without_term() s/without/omit/ > The current implementation of 'strbuf_split_buf()' includes the > terminator at the end of each strbuf post splitting. Add an option > wherein we

Re: [PATCH] mingw: emulate write(2) that fails with a EPIPE

Eric Sunshine writes: >> + if (result < 0 && errno == EINVAL && buf) { > > Here, errno is EINVAL... > >> + /* check if fd is a pipe */ >> + HANDLE h = (HANDLE) _get_osfhandle(fd); >> + if (GetFileType(h) == FILE_TYPE_PIPE)

Re: [PATCH] mingw: emulate write(2) that fails with a EPIPE

On Wednesday, December 16, 2015, Johannes Schindelin wrote: > On Windows, when writing to a pipe fails, errno is always > EINVAL. However, Git expects it to be EPIPE. > > According to the documentation, there are two cases in which write() > triggers EINVAL: the buffer

Re: [PATCH v2 03/11] ref-filter: introduce struct used_atom

On Wed, Dec 16, 2015 at 10:29 AM, Karthik Nayak wrote: > Introduce the 'used_array' structure which would replace the existing > implementation of 'used_array' (which a list of atoms). This helps us > parse atom's before hand and store required details into the >

Re: [PATCH] rebase: add --verify-signatures

Alexander 'z33ky' Hirsch <1ze...@gmail.com> writes: > On Thu, Dec 10, 2015 at 11:53:45AM -0800, Junio C Hamano wrote: > >> In a workflow that is built around "pull --rebase", you are _given_ >> the authoritative history with all the good things from another >> place and then you rebuild your own

Re: What's cooking in git.git (Dec 2015, #05; Tue, 15)

Torsten Bögershausen writes: > On 15.12.15 23:48, Junio C Hamano wrote: >> * tb/ls-files-eol (2015-11-28) 2 commits >> - convert.c: mark a file-local function static >> - ls-files: Add eol diagnostics >> >> Add options to ls-files to help diagnose end-of-line problems. >> >>

Re: [PATCH 2/2] git-svn: test for git-svn prefixed globs

Hello Eric, sorry, I just copy pasted your old t9108-git-svn-glob.sh, changed branch names to be prefixed and added test for "exact" prefix match. If it is necessary I can rewrite it according to current guidelines. On 12/17/2015 12:28 AM, Eric Wong wrote: Thanks for this work. Most things

Re: [PATCH] rebase: add --verify-signatures

On Wed, Dec 16, 2015 at 10:12:12AM -0800, Junio C Hamano wrote: > I do not quite understand how that would help anything. I do not > personally believe in projects that wants to sign each and every > commit, but to them, "an empty signed commit on top" would not fix > anything once they have an

[PATCH v2 0/4] Fix git-gui when recentrepo list has duplicates

git-gui won't start if either there are duplicate invalid entries or the user selects a duplicated entry from the gui.recentrepo list. Such duplicates have been found in the wild. V2 corrects the spellings, grammar and quoting errors in the commit messages as noted by Eric Sunshine ($gmane/282430

Re: [PATCH 2/2] git-svn: test for git-svn prefixed globs

Thanks for this work. Most things look fine with 1/2, comments on 2/2 below... Victor Leschuk wrote: > Add test for git-svn prefixed globs. Why a separate patch? Unless there's some documentation purpose for a regression, usually tests and a feature should be added

[PATCH v2 10/17] remote.c: read $GIT_DIR/remotes/* with strbuf_getline_crlf()

These files can be edited with a DOS editor, leaving CR at the end of the line if read with strbuf_getline(). Signed-off-by: Junio C Hamano --- remote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remote.c b/remote.c index 1101f82..e88d936 100644 ---

[PATCH v2 15/17] send-pack: read list of refs with strbuf_getline_crlf()

Signed-off-by: Junio C Hamano --- builtin/send-pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/send-pack.c b/builtin/send-pack.c index f6e5d64..02e6e24 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -212,7 +212,7 @@ int

[PATCH v2 17/17] test-sha1-array: read command stream with strbuf_getline_crlf()

The input to this command comes from a pipeline in t0064, whose upstream has bunch of "echo"s. It is not unreasonable to expect that it may be fed CRLF lines on DOSsy systems. Signed-off-by: Junio C Hamano --- test-sha1-array.c | 2 +- 1 file changed, 1 insertion(+), 1

[PATCH v2 13/17] cat-file: read batch stream with strbuf_getline_crlf()

It is possible to prepare a text file with a DOS editor and feed it as a batch command stream to the command. Signed-off-by: Junio C Hamano --- builtin/cat-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index

[PATCH v2 16/17] grep: read -f file with strbuf_getline_crlf()

List of patterns file could come from a DOS editor. This is iffy; you may actually be trying to find a line with ^M in it on a system whose line ending is LF. You can of course work it around by having a line that has "^M^M^J", let the strbuf_getline_crlf() eat the last "^M^J", leaving just the

[PATCH v2 09/17] ident.c: read /etc/mailname with strbuf_getline_crlf()

Just in case /etc/mailname file was edited with a DOS editor, read it with strbuf_getline_crlf() so that a stray CR is not included as the last character of the mail hostname. We _might_ want to more aggressively discard whitespace characters around the line with strbuf_trim(), but that is a bit

[PATCH v2 06/17] hash-object: read --stdin-paths with strbuf_getline_crlf()

The list of paths could have been written with a DOS editor. Signed-off-by: Junio C Hamano --- builtin/hash-object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/hash-object.c b/builtin/hash-object.c index 43b098b..57c743d 100644 ---

[PATCH v2 00/17] Peace with CRLF

We have too many topics titled "War on something"; let's try to make peace for a change. This is a reroll with small changes of the previous one that appears here: http://thread.gmane.org/gmane.comp.version-control.git/280401 which is a continuation to $gmane/275735, which is filed in the

[PATCH v2 14/17] column: read lines with strbuf_getline_crlf()

Multiple lines read here are concatenated on a single line to form a multi-column output line. We do not want to have a CR at the end, even if the input file consists of CRLF terminated lines. Signed-off-by: Junio C Hamano --- builtin/column.c | 2 +- 1 file changed, 1

[PATCH v2 02/17] check-attr, check-ignore, checkout-index: read paths with strbuf_getline_crlf()

These commands read list of paths from their standard input under the --stdin option (in order to avoid busting limit on the length of the command line). When they are using text input mode (i.e. line_termination is set to '\n'), we should try to be more friendly to our DOSsy friends and accept

[PATCH v2 12/17] transport-helper: read helper response with strbuf_getline_crlf()

Our implementation of helpers never use CRLF line endings, and they do not depend on the ability to place a CR as payload at the end of the line, so this is essentially a no-op for in-tree users. However, this allows third-party implementation of helpers to give us their line with CRLF line

[PATCH v2 04/17] update-index: read list of paths with strbuf_getline_crlf() under --stdin

Signed-off-by: Junio C Hamano --- builtin/update-index.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index a7a9a7e..3a6c5b2 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -1075,7

[PATCH v2 03/17] update-index: read --index-info with strbuf_getline_crlf()

Signed-off-by: Junio C Hamano --- builtin/update-index.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index 7431938..a7a9a7e 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -473,7

[PATCH v2 07/17] revision: read --stdin with strbuf_getline_crlf()

Reading with getwholeline() and manually stripping the terminating '\n' would leave CR at the end of the line if the input comes from a DOS editor. Contrasting this with the previous few changes, one may realize that the way "log" family of commands read the paths with --stdin looks inconsistent

[PATCH v2 08/17] rev-parse: read parseopt spec with strbuf_getline_crlf()

"rev-parse --parseopt" specification is clearly text and we should anticipate that we may be fed CRLF lines. Signed-off-by: Junio C Hamano --- builtin/rev-parse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c

[PATCH v2 11/17] clone/sha1_file: read info/alternates with strbuf_getline_crlf()

$GIT_OBJECT_DIRECTORY/info/alternates is a text file that can be edited with a DOS editor. We do not want to use the real path with CR appended at the end. Signed-off-by: Junio C Hamano --- builtin/clone.c | 2 +- sha1_file.c | 2 +- 2 files changed, 2 insertions(+), 2

[PATCH v2 05/17] mktree: read textual tree representation with strbuf_getline_crlf()

The input can come from a DOS editor. Signed-off-by: Junio C Hamano --- builtin/mktree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/mktree.c b/builtin/mktree.c index a964d6b..c6cafb6 100644 --- a/builtin/mktree.c +++ b/builtin/mktree.c @@

Re: [PATCH v2 06/11] ref-filter: introduce color_atom_parser()

On Wed, Dec 16, 2015 at 10:29 AM, Karthik Nayak wrote: > Introduce color_atom_parser() which will parse a "color" atom and > store its color in the "use_atom" structure for further usage in Same comment as last time: s/use_atom/used_atom/ > 'populate_value()'. s/'//g

[PATCH] git-gui: do not use obsolete `git merge $msg HEAD $branch'

Use the modern `git merge' invocation pattern. Since both `git merge' and `git fmt-merge-msg' obey the merge.log configuration, instruct the former not to generate the log summary to avoid that it appears twice in the commit message. Signed-off-by: Johannes Sixt ---

Re: [PATCH v2 07/11] ref-filter: introduce align_atom_parser()

On Wed, Dec 16, 2015 at 10:29 AM, Karthik Nayak wrote: > Introduce align_atom_parser() which will parse an "align" atom and > store the required alignment position and width in the "use_atom" > structure for further usage in 'populate_value()'. > > Helped-by: Ramsay Jones

Re: Odd rebase behavior

On Tue, Dec 15, 2015 at 09:17:30PM -0600, David A. Greene wrote: > According to the rebase man page, rebase gathers commits as in "git log > ..HEAD." However, that is not what happens in the tests > below. Some of the commits disappear. > > The test basically does this: > > - Setup a master

Re: [PATCH 1/2] push: Fully test --recurse-submodules on command line overrides config

On Wed, Dec 16, 2015 at 2:41 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Thu, Dec 3, 2015 at 5:10 AM, Mike Crowe wrote: >>> t5531 only checked that the push.recurseSubmodules config option was >>> overridden by passing

Re: [PATCH v1 1/4] git-gui: remove duplicate entries from .gitconfig's gui.recentrepo

From: "Eric Sunshine" On Monday, December 14, 2015, Philip Oakley wrote: The git gui's recent repo list may become contaminated with duplicate entries. The git gui would barf when attempting to remove one entry. Remove them all - there is no

[PATCH v2 2/4] git gui: cope with duplicates in _get_recentrepo

_get_recentrepo will fail if duplicate invalid entries are present in the recentrepo config list. The previous commit fixed the 'git config' limitations in _unset_recentrepo by unsetting all config entries, however this code would fail on the second attempt to unset it. Refactor the code to

[PATCH v2 3/4] git gui: de-dup selected repo from recentrepo history

When the gui/user selects a repo for display, that repo is brought to the end of the recentrepo config list. The logic can fail if there are duplicate old entries for the repo (you cannot unset a single config entry when duplicates are present). Similarly, the maxrecentrepo logic could fail if

[PATCH v2 4/4] git gui: allow for a long recentrepo list

The gui.recentrepo list may be longer than the maxrecent setting. Allow extra space to show any extra entries. In an ideal world, the git gui would limit the number of entries to the maxrecent setting, however the recentrepo config list may have been extended outside of the gui, or the maxrecent

[PATCH v2 1/4] git-gui: de-dup entries from gui.recentrepo

The git gui's recent repo list may become contaminated with duplicate entries. The git gui would barf when attempting to remove one entry. Remove them all - there is no option within 'git config' to selectively remove one of the entries. This issue was reported on the 'Git User' list

Re: [PATCH] submodule: Port resolve_relative_url from shell to C

On Wed, Dec 9, 2015 at 10:48 PM, Johannes Sixt wrote: > Am 10.12.2015 um 02:07 schrieb Stefan Beller: >> >> This reimplements the helper function `resolve_relative_url` in shell >> in C. This functionality is needed in C for introducing the groups >> feature later on. When using

Re: [PATCH 1/2] push: Fully test --recurse-submodules on command line overrides config

Stefan Beller writes: > On Thu, Dec 3, 2015 at 5:10 AM, Mike Crowe wrote: >> t5531 only checked that the push.recurseSubmodules config option was >> overridden by passing --recurse-submodules=check on the command line. >> Add new tests for overriding with

Re: [PATCH 2/2] push: add '-d' as shorthand for '--delete'

On Wed, Dec 16, 2015 at 12:29:38PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > At this point, it seems that "--delete" is useful, and nothing else has > > been proposed for "-d" in the intervening years. It seems like a > > reasonable use of the flag to me. > > I

[PATCH v2 01/17] strbuf: make strbuf_getline_crlf() global

Often we read "text" files that are supplied by the end user (e.g. commit log message that was edited with $GIT_EDITOR upon 'git commit -e'), and in some environments lines in a text file are terminated with CRLF. Existing strbuf_getline() knows to read a single line and then strip the

[PATCHv2] submodule: Port resolve_relative_url from shell to C

This reimplements the helper function `resolve_relative_url` in shell in C. This functionality is needed in C for introducing the groups feature later on. When using groups, the user should not need to run `git submodule init`, but it should be implicit at all appropriate places, which are all in

[PATCHv2] Porting resolve_relative_url from shell to C

A new version of the patch, which spells out more its intent and may actually work in Windows. Any comment welcome, Thanks, Stefan Stefan Beller (1): submodule: Port resolve_relative_url from shell to C builtin/submodule--helper.c | 151

[PATCH] revision.c: propagate tag names from pending array

When we unwrap a tag to find its commit for a traversal, we do not propagate the "name" field of the tag in the pending array (i.e., the ref name the user gave us in the first place) to the commit (instead, we use an empty string). This means that "git log --source" will never show the tag-name

Re: 'Comma in -to/-cc entry' on valid addresses

Andy Lutomirski writes: > $ git send-email --to='"Address, Valid" ' > Comma in --to entry: "Address, Valid" ' > $ git --version > git version 2.5.0 > > This appears to be a recent regression. It's not: the check was introduced

[RFC] Git Developer Summit, April 4th, 2016, NYC

GitHub is organizing another Git Merge conference this coming April in New York City, USA. The organizers have offered to host a developer's summit similar to what we did last year in Paris (one day, developers sitting around chatting). The venue has not been booked yet, and they've asked for

'Comma in -to/-cc entry' on valid addresses

$ git send-email --to='"Address, Valid" ' Comma in --to entry: "Address, Valid" ' $ git --version git version 2.5.0 This appears to be a recent regression. For an authority on why the current behavior is wrong, see RFC 2822 section 3.4, which

Re: [PATCH 2/2] git-svn: test for git-svn prefixed globs

Victor Leschuk wrote: > Hello Eric, sorry, I just copy pasted your old > t9108-git-svn-glob.sh, changed branch names to be prefixed and added > test for "exact" prefix match. If it is necessary I can rewrite it > according to current guidelines. Yes, please do if you can. I

Re: [PATCH 15/16] refs: add LMDB refs backend

On Wed, 2015-12-16 at 17:00 -0800, Jonathan Nieder wrote: > David Turner wrote: > > > --- a/Documentation/config.txt > > +++ b/Documentation/config.txt > > @@ -496,6 +496,13 @@ core.repositoryFormatVersion:: > > Internal variable identifying the repository format and > > layout > >

Re: [PATCH 15/16] refs: add LMDB refs backend

David Turner wrote: > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -496,6 +496,13 @@ core.repositoryFormatVersion:: > Internal variable identifying the repository format and layout > version. > > +core.refsBackendType:: > + Type of refs backend. Default

Re: [PATCHv2] Porting resolve_relative_url from shell to C

On 17.12.15 01:26, Stefan Beller wrote: > A new version of the patch, which spells out more its intent and > may actually work in Windows. > > Any comment welcome, > Thanks, > Stefan > > Stefan Beller (1): > submodule: Port resolve_relative_url from shell to C > > builtin/submodule--helper.c

Re: [PATCH v1 1/4] git-gui: remove duplicate entries from .gitconfig's gui.recentrepo

On Wed, Dec 16, 2015 at 6:41 PM, Philip Oakley wrote: > From: "Eric Sunshine" >> On Monday, December 14, 2015, Philip Oakley wrote: >>> The git gui's recent repo list may become contaminated with duplicate >>> entries. The git

Re: [PATCH 7/8] config: add core.untrackedCache

On Tue, Dec 15, 2015 at 10:05:57PM -0800, Junio C Hamano wrote: > Junio C Hamano writes: > > > This is why the_index.has_untracked_cache is not just a simple "Do I > > want to use this feature?" boolean configuration. The index also > > stores the real data, and "Am I using

Re: [PATCH] rebase: add --verify-signatures

On Thu, Dec 10, 2015 at 11:53:45AM -0800, Junio C Hamano wrote: > Junio C Hamano writes: > > > Alexander 'z33ky' Hirsch <1ze...@gmail.com> writes: > > > >> + if test -n "$rebase_root" > >> + then > >> + foreign_revisions="$orig_head..$onto" > >> + else > >> +

Re: Help debugging git-svn

On Wed, Dec 16, 2015 at 1:41 AM, Eric Wong wrote: > > Any chance you can reproduce this on a Linux system? > I do not use non-Free systems and have no debugging experience > there at all. > My wish But it's a big resounding "no". >> With my very flawed knowledge of

Re: [PATCH 2/2] Fix tyop in the 2.7.0 release notes

/^Subject:/ s/tyop/typo/ ;) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH] mingw: emulate write(2) that fails with a EPIPE

On Windows, when writing to a pipe fails, errno is always EINVAL. However, Git expects it to be EPIPE. According to the documentation, there are two cases in which write() triggers EINVAL: the buffer is NULL, or the length is odd but the mode is 16-bit Unicode (the broken pipe is not mentioned as

[PATCH 2/2] git-svn: test for git-svn prefixed globs

Add test for git-svn prefixed globs. Signed-off-by: Victor Leschuk --- t/t9168-git-svn-prefixed-glob.sh | 136 +++ 1 file changed, 136 insertions(+) create mode 100755 t/t9168-git-svn-prefixed-glob.sh diff --git

[PATCH 1/2] git-svn: support for prefixed globs in config

Introduce prefixed globs for branches and tags in git-svn. Signed-off-by: Victor Leschuk --- Documentation/git-svn.txt | 5 + perl/Git/SVN/GlobSpec.pm | 9 - 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Documentation/git-svn.txt

[PATCH 0/2] git-svn: add support for prefixed globs in config

There are existing old SVN repos which use patterns in branch (and tag) names to indicate some information. For example: branches/release_01, branches/release_02, etc, however non-patterned branches co-exist with them (like branches/dev). If someone maintains git mirror of such a repo it is

Re: [PATCH/RFC 00/10] ref-filter: use parsing functions

On Mon, Dec 14, 2015 at 3:25 AM, Eric Sunshine wrote: > On Sun, Dec 13, 2015 at 4:31 AM, Karthik Nayak wrote: >> On Sun, Dec 13, 2015 at 11:10 AM, Eric Sunshine >> wrote: >>> If the intention is to rid that inner loop of

[PATCH v2 00/11] ref-filter: use parsing functions

This series cleans up populate_value() in ref-filter, by moving out the parsing part of atoms to separate parsing functions. This ensures that parsing is only done once and also improves the modularity of the code. The previous version can be found here:

[PATCH v2 04/11] ref-fitler: bump match_atom() name to the top

Bump match_atom() to the top for usage in further patches. Signed-off-by: Karthik Nayak --- ref-filter.c | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index 043a02a..f4a6414 100644 ---

[PATCH v2 03/11] ref-filter: introduce struct used_atom

Introduce the 'used_array' structure which would replace the existing implementation of 'used_array' (which a list of atoms). This helps us parse atom's before hand and store required details into the 'used_array' for future usage. Also introduce a parsing function for each atom in valid_atom.

[PATCH v2 02/11] ref-filter: use strbuf_split_str_omit_term()

Use the newly introduced strbuf_split_str_omit_term() rather than using strbuf_split_str() and manually removing the ',' terminator. Signed-off-by: Karthik Nayak --- ref-filter.c | 9 + 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ref-filter.c

[PATCH v2 06/11] ref-filter: introduce color_atom_parser()

Introduce color_atom_parser() which will parse a "color" atom and store its color in the "use_atom" structure for further usage in 'populate_value()'. Helped-by: Ramsay Jones Signed-off-by: Karthik Nayak --- ref-filter.c | 21

[PATCH v2 05/11] ref-filter: skip deref specifier in match_atom_name()

In upcoming patches we make calls to match_atom_name() with the '*' deref specifier still attached to the atom name. This causes undesirable errors, hence, if present skip over the '*' deref specifier in the atom name. Signed-off-by: Karthik Nayak --- ref-filter.c | 4

[PATCH v2 01/11] strbuf: introduce strbuf_split_str_without_term()

The current implementation of 'strbuf_split_buf()' includes the terminator at the end of each strbuf post splitting. Add an option wherein we can drop the terminator if desired. In this context introduce a wrapper function 'strbuf_split_str_without_term()' which splits a given string into strbufs

[PATCH v2 08/11] ref-filter: introduce prefixes for the align atom

Introduce optional prefixes "width=" and "position=" for the align atom so that the atom can be used as "%(align:width=,position=)". Add Documetation and tests for the same. Signed-off-by: Karthik Nayak --- Documentation/git-for-each-ref.txt | 20 +++-- ref-filter.c

Re: [PATCH 2/2] Fix tyop in the 2.7.0 release notes

Hi Gábor, On Wed, 16 Dec 2015, SZEDER Gábor wrote: > /^Subject:/ s/tyop/typo/ That was actually on purpose... I guess I made it a habit in another project to call it tyop from time to time to take out the edge (many scientists are pretty bda at speling ;-)). But sure, if that joke is lost,

No auto CRLF conversion in Commit Message comments

Hi there, I'm new to Git, so apologies if this is already available, but after some searching and experimenting I haven't been able to resolve it. I am running Git 2.6.4.windows.1 on Windows 7 64 bit. I have the global configuration variable core.autocrlf=true When I commit, the commit

[PATCH v2 07/11] ref-filter: introduce align_atom_parser()

Introduce align_atom_parser() which will parse an "align" atom and store the required alignment position and width in the "use_atom" structure for further usage in 'populate_value()'. Helped-by: Ramsay Jones Signed-off-by: Karthik Nayak ---

[PATCH v2 11/11] ref-filter: introduce objectname_atom_parser()

Introduce objectname_atom_parser() which will parse the '%(objectname)' atom and store information into the 'used_atom' structure based on the modifiers used along with the atom. Helped-by: Ramsay Jones Signed-off-by: Karthik Nayak ---

[PATCH v2 09/11] ref-filter: introduce remote_ref_atom_parser()

Introduce remote_ref_atom_parser() which will parse the '%(upstream)' and '%(push)' atoms and store information into the 'used_atom' structure based on the modifiers used along with the corresponding atom. Helped-by: Ramsay Jones Signed-off-by: Karthik Nayak

[PATCH v2 10/11] ref-filter: introduce contents_atom_parser()

Introduce contents_atom_parser() which will parse the '%(contents)' atom and store information into the 'used_atom' structure based on the modifiers used along with the atom. Helped-by: Ramsay Jones Signed-off-by: Karthik Nayak ---

[PATCH] credential-store: don't pass strerror to die_errno()

Signed-off-by: SZEDER Gábor --- v2 fixed this, but it fell on the floor, I suppose because of the maintainer switch. Anyway, I should have noticed it while the patch was still cooking, sorry. credential-store.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff

Re: Question: Exclusions for AV-Software

Hi Roman, On Wed, 16 Dec 2015, ro...@roume.de wrote: > do you have any recommendations how exclusions must be set in an anti > virus software what directories etc.? If you are talking about a Git for Windows installed into C:\Program Files (or even C:\Program Files (x86)), it is safe to exclude

[PATCH 2/2] Fix tyop in the 2.7.0 release notes

Signed-off-by: Johannes Schindelin --- Documentation/RelNotes/2.7.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/RelNotes/2.7.0.txt b/Documentation/RelNotes/2.7.0.txt index a84caba..eb179cc 100644 ---

[PATCH 1/2] t3404: fix typo

Signed-off-by: Johannes Schindelin --- t/t3404-rebase-interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 544f9ad..11dde66 100755 --- a/t/t3404-rebase-interactive.sh +++

[PATCH 0/2] Fix two tyops

These two grammar fixes are here solely to ramp up my commit count. :-) Johannes Schindelin (2): t3404: fix typo Fix tyop in the 2.7.0 release notes Documentation/RelNotes/2.7.0.txt | 2 +- t/t3404-rebase-interactive.sh| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --

Re: What's cooking in git.git (Dec 2015, #05; Tue, 15)

Hi Junio, On Tue, 15 Dec 2015, Junio C Hamano wrote: > Junio C Hamano writes: > > > There already was strbuf_getline_crlf(), and I wanted a new name to > > be conservative. > > When I re-read the series, I realize that the existing one had > exactly the same semantics as

[PATCH] dir: mark add_untracked_ident() as a file local symbol

Signed-off-by: Ramsay Jones --- Hi Christian, If you need to re-roll your 'cc/untracked' branch, could you please squash the relevant parts of this into your patches. Thanks! Also, you may what to consider removing the emulation of uname() on MinGW, since this is

Re: No auto CRLF conversion in Commit Message comments

Hi A.J., On Wed, 16 Dec 2015, Harfoot A.J. wrote: > I'm new to Git, so apologies if this is already available, but after > some searching and experimenting I haven't been able to resolve it. > > I am running Git 2.6.4.windows.1 on Windows 7 64 bit. > > I have the global configuration variable

Re: [PATCHv3] Makefile: add missing phony target

Elia Pinto writes: > Add some missing phony target to Makefile. > > Signed-off-by: Elia Pinto > Helped-by: Matthieu Moy > --- > This is the third version of this patch. Thanks. I double-checked with grep .PHONY

Re: (unknown)

On Tue, Dec 15, 2015 at 09:57:50PM -0800, Junio C Hamano wrote: > David Greene writes: > > > - If new option --keep-redundant is specified, invoke cherry-pick with > > --keep-redundant-commits. > > This came up in the past several weeks, I think; you would need to >

[PATCH v2 2/2] push: add '-d' as shorthand for '--delete'

It is possible to delete branches on remotes by specifying the '--delete' flag. The `git-branch` command, which can be used to delete local branches with the same '--delete' flag, also accepts the shorthand '-d'. This may cause confusion for users which are frequently using the shorthand form of

[PATCH v2 1/2] push: add '--delete' flag to synopsis

The delete flag is not mentioned in the synopsis of `git-push`. Add the flag to make it more discoverable. Signed-off-by: Patrick Steinhardt --- Only change to version 1 [1] is a slightly altered commit message of the second commit. Previously, it suggested that '--delete' is the

GIT 2.6.4 is listed on Software Informer

Good day! Software.informer.com would like to inform you that your product GIT 2.6.4 has been reviewed by our editors http://git.software.informer.com/. We would be grateful if you place our logo with a link to our review on your website. On our part, we can offer featuring your program in our