Re: ./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ?

On Wed, Dec 30, 2015 at 8:20 AM, Torsten Bögershausen wrote: > I got 2 failures on pu under Mac OS, (Linux is OK) > I did some very basic debugging, it seems as if grep doesn't find > a needed string. > Does anybody have an idea here ? I'm unable to reproduce these failures on

Re: [PATCH] worktree: stop supporting moving worktrees manually

On Tue, Dec 29, 2015 at 8:55 AM, Duy Nguyen wrote: > On Mon, Dec 28, 2015 at 1:22 PM, Eric Sunshine > wrote: >> On Sun, Dec 27, 2015 at 10:43:16AM +0700, Nguyễn Thái Ngọc Duy wrote: >>> If you move a linked working tree to another file system, or >>>

Re: [PATCH 1/2] avoid shifting signed integers 31 bits

On Thu, Dec 31, 2015 at 12:10:33PM +0700, Duy Nguyen wrote: > On Tue, Dec 29, 2015 at 1:35 PM, Jeff King wrote: > > We sometimes use 32-bit unsigned integers as bit-fields. > > It's fine to access the MSB, because it's unsigned. However, > > doing so as "1 << 31" is wrong, because

Re: [PATCH 1/2] avoid shifting signed integers 31 bits

On Tue, Dec 29, 2015 at 1:35 PM, Jeff King wrote: > We sometimes use 32-bit unsigned integers as bit-fields. > It's fine to access the MSB, because it's unsigned. However, > doing so as "1 << 31" is wrong, because the constant "1" is > a signed int, and we shift into the sign bit,

[PATCH] dir.h: remove orphaned declaration

Signed-off-by: Ramsay Jones --- Hi Christian, If you need to re-roll your 'cc/untracked' branch, could you please squash this into your patches. You seem to have only half applied my last fixup patch! ;-) (I'm guessing that you had already renamed the function

Re: Feature request: git bisect merge to usable base

Andy Lutomirski writes: > I'm currently bisecting a Linux bug on my laptop. The starting good > commit is v4.4-rc3 and the starting bad commit is v4.4-rc7. > Unfortunately, anything much older than v4.4-rc3 doesn't boot at all. > > I'd like to say: > > $ git bisect merge-to

Re: [bug] Graph log and orphan branches

> - return "*"; > + return commit->parents ? "*" : "^" ; I like this idea. -- 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

Re: Feature request: git bisect merge to usable base

Hi, On Wed, Dec 30, 2015 at 11:40 AM, Andy Lutomirski wrote: > Hi- > > I'm currently bisecting a Linux bug on my laptop. The starting good > commit is v4.4-rc3 and the starting bad commit is v4.4-rc7. > Unfortunately, anything much older than v4.4-rc3 doesn't boot at all. > >

[bug] Graph log and orphan branches

Hi all, the graph output of log show orphan branches in a way that suggests they have a parent. See for example: http://stackoverflow.com/questions/22541261/git-log-of-all-branchs-in-only-the-current-tree I think this is a bug in the UI. Cheers -- Carlos -- To unsubscribe from this list: send

Re: [bug] Graph log and orphan branches

Carlos Pita writes: > the graph output of log show orphan branches in a way that suggests > they have a parent. Reminds me of this ancient RFH topic http://thread.gmane.org/gmane.comp.version-control.git/236708/focus=239580 which unfortunately got no help... -- To

Re: [PATCH] dir.h: remove orphaned declaration

Hi Ramsay, On Wed, Dec 30, 2015 at 6:11 PM, Ramsay Jones wrote: > > Signed-off-by: Ramsay Jones > --- > > Hi Christian, > > If you need to re-roll your 'cc/untracked' branch, could you > please squash this into your patches. > > You seem

Re: [bug] Graph log and orphan branches

> http://stackoverflow.com/questions/22541261/git-log-of-all-branchs-in-only-the-current-tree > > I think this is a bug in the UI. Please notice this happens only for the --oneline output. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: [bug] Graph log and orphan branches

On wo, 2015-12-30 at 11:54 -0800, Junio C Hamano wrote: > Carlos Pita writes: > > > the graph output of log show orphan branches in a way that suggests > > they have a parent. > > Reminds me of this ancient RFH topic > >

Re: [PATCH/RFC v2 0/2] add regex match flags to git describe

On 12/29/2015 07:27 PM, Junio C Hamano wrote: Mostyn Bramley-Moore writes: I do not think it is wrong per-se to add an option to use regular expressions instead of globs, but if we are to do so, the endgame we aim for MUST be that we do so consistently to all the other

Re: [PATCH v3] reflog-walk: don't segfault on non-commit sha1's in the reflog

Dennis Kaarsemaker writes: > This turned out to be doable in the same code segment: just keep on > processing reflog entries until you hit a commit or run out of entries. > That (and the updated foremerly-failing test) are the only changes > between v2 and v3. > > I'll

Re: [PATCH/RFC v2 0/2] add regex match flags to git describe

On 12/30/2015 10:52 AM, Duy Nguyen wrote: What about not using command line options? We could go with something like pathspec magic. I think as long as we provide three options: literal, some pattern matching and backquote, then the user has enough flexibility to specify any set of refs. For

Re: [PATCH V2] user-manual: add addition gitweb information

On Wednesday, December 30, 2015 03:29:09 PM Junio C Hamano wrote: > "Stephen P. Smith" writes: > > > The gitweb cgi script provides users an easy way to browse your > > -project's files and history without having to install Git; see the file > > -gitweb/INSTALL in the Git

Re: [PATCH/RFC v2 0/2] add regex match flags to git describe

Mostyn Bramley-Moore writes: > OK, brainstorming a bit, how about either of these: > > 1) > --match-pattern-type= > > It's a bit lengthy (maybe --match-type would be sufficient), but I > like that the value names are

Re: [PATCH V2] user-manual: add addition gitweb information

On Wednesday, December 30, 2015 03:29:09 PM Junio C Hamano wrote: > "Stephen P. Smith" writes: > > > The gitweb cgi script provides users an easy way to browse your > > -project's files and history without having to install Git; see the file > > -gitweb/INSTALL in the Git

Re: [PATCH V2] user-manual: add addition gitweb information

Stephen & Linda Smith writes: > [Re-worded my explanation.] > > "revisions, file contents and logs was in the second sentence of the first > patch. > "files and history" was in the first sentence of the first patch. > > When I was getting rid of the duplication I decided that

Re: [PATCH v4 09/10] config: add core.untrackedCache

On Tue, Dec 29, 2015 at 11:35 PM, Junio C Hamano wrote: > Christian Couder writes: > >> +core.untrackedCache:: >> + Determines if untracked cache will be automatically enabled or >> + disabled. It can be `keep`, `true` or `false`. Before

Re: [PATCH] commit: ensure correct permissions of the commit message

Johannes Schindelin writes: > So maybe > > fcreate_or_truncate(const char *path) > { >FILE *ret = fopen(path, "w"); > >if (!ret && errno == EPERM) { >if (!unlink(path)) >

Re: [PATCH v4 09/10] config: add core.untrackedCache

Christian Couder writes: > On Tue, Dec 29, 2015 at 11:35 PM, Junio C Hamano wrote: > ... >> While the above is not wrong per-se, from the point of those who >> looked for these options (that is, those who wanted to do a one-shot >> enabling or

[PATCH V2] user-manual: add addition gitweb information

Rework the section on gitweb to add information about the cgi script and the instaweb command. Signed-off-by: Stephen P. Smith --- Notes: Removed wording duplication in the first paragraph. Added explicit gitweb reference with regard to instaweb. Fixed two

Re: [PATCH V2] user-manual: add addition gitweb information

"Stephen P. Smith" writes: > The gitweb cgi script provides users an easy way to browse your > -project's files and history without having to install Git; see the file > -gitweb/INSTALL in the Git source tree for instructions on setting it up. > +project's revisions, file

Re: [PATCH v4 08/10] dir: simplify untracked cache "ident" field

On Wed, Dec 30, 2015 at 12:47 PM, Torsten Bögershausen wrote: > On 2015-12-29 08.09, Christian Couder wrote: >> It is not a good idea to compare kernel versions and disable >> the untracked cache if it changes as people may upgrade and >> still want the untracked cache to work. So

Re: [PATCH] reflog-walk: don't segfault on non-commit sha1's in the reflog

Dennis Kaarsemaker writes: > diff --git a/reflog-walk.c b/reflog-walk.c > index 85b8a54..b85c8e8 100644 > --- a/reflog-walk.c > +++ b/reflog-walk.c > @@ -236,8 +236,8 @@ void fake_reflog_parent(struct reflog_walk_info *info, > struct commit *commit) > reflog =

Re: [bug] Graph log and orphan branches

Dennis Kaarsemaker writes: > On wo, 2015-12-30 at 11:54 -0800, Junio C Hamano wrote: >> Carlos Pita writes: >> >> > the graph output of log show orphan branches in a way that suggests >> > they have a parent. >> >> Reminds me of this ancient

Re: [PATCH v8] ls-files: Add eol diagnostics

Ramsay Jones writes: >> +Show line endings ("eolinfo") and the text/eol attributes >> ("texteolattr") of >> files. >> +"eolinfo" is the file content identification used by Git when >> +the "text" attribute is "auto", or core.autocrlf != false. >> ++ >>

Re: [PATCH v4 08/10] dir: simplify untracked cache "ident" field

On Tue, Dec 29, 2015 at 11:32 PM, Junio C Hamano wrote: > Christian Couder writes: > >> -static int ident_in_untracked(const struct untracked_cache *uc) >> +static int ident_current_location_in_untracked(const struct untracked_cache >> *uc) >> {

[PATCH v2] reflog-walk: don't segfault on non-commit sha1's in the reflog

Use lookup_commit instead of parse_object to look up commits mentioned in the reflog. This avoids a segfault in save_parents if somehow a sha1 for something other than a commit ends up in the reflog. Signed-off-by: Dennis Kaarsemaker Helped-by: Nguyễn Thái Ngọc Duy

Re: [PATCH] user-manual: add addition gitweb information

"Stephen P. Smith" writes: > The gitweb cgi script provides users an easy way to browse your > -project's files and history without having to install Git; see the file > -gitweb/INSTALL in the Git source tree for instructions on setting it up. > +project's files and history

[PATCH] user-manual: add addition gitweb information

Rework the section on gitweb to add information about the cgi script and the instaweb command. Signed-off-by: Stephen P. Smith --- Documentation/user-manual.txt | 16 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Documentation/user-manual.txt

Re: [PATCH] reflog-walk: don't segfault on non-commit sha1's in the reflog

On wo, 2015-12-30 at 13:20 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > diff --git a/reflog-walk.c b/reflog-walk.c > > index 85b8a54..b85c8e8 100644 > > --- a/reflog-walk.c > > +++ b/reflog-walk.c > > @@ -236,8 +236,8 @@ void fake_reflog_parent(struct

Re: [PATCH v4] git-svn: add support for prefixed globs in config

Victor Leschuk writes: > Introduce prefixed globs for branches and tags in git-svn. > Globs like 'release_*' allow users to avoid long lines in config like: > > branches = branches/{release_20,release_21,release_22,...} > > Signed-off-by: Victor Leschuk

Re: [PATCH] reflog-walk: don't segfault on non-commit sha1's in the reflog

Dennis Kaarsemaker writes: > On wo, 2015-12-30 at 13:20 -0800, Junio C Hamano wrote: >> Dennis Kaarsemaker writes: >> >> > diff --git a/reflog-walk.c b/reflog-walk.c >> > index 85b8a54..b85c8e8 100644 >> > --- a/reflog-walk.c >> > +++

Re: [PATCH v8] ls-files: Add eol diagnostics

Torsten Bögershausen writes: > Add test cases in t0027, thanks to Junio C Hamano for the optimized > grep-less sed expression. Please drop this part; it is embarrassing. You wouldn't thank all the mentors you have ever had from whom you learned programming in your log messages,

Re: [PATCH] reflog-walk: don't segfault on non-commit sha1's in the reflog

On wo, 2015-12-30 at 13:41 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > On wo, 2015-12-30 at 13:20 -0800, Junio C Hamano wrote: > > > Dennis Kaarsemaker writes: > > > > > > > diff --git a/reflog-walk.c b/reflog-walk.c > > > >

Re: [PATCH v2] reflog-walk: don't segfault on non-commit sha1's in the reflog

Dennis Kaarsemaker writes: > The really correct way of fixing this bug may actually be a level higher, and > making git reflog not rely on information about parent commits, whether they > are fake or not. I tend to agree. The only common thing between "git reflog" wants

Re: [PATCH 04/14] shortlog: use skip_prefix_icase to parse "Author" lines

On Tue, Dec 29, 2015 at 2:27 AM, Jeff King wrote: > Because we must match both "Author" and "author" here, we > could not use skip_prefix, and had to hand-code a partial > case-insensitive match. Now that we have skip_prefix_case, s/skip_prefix_case/skip_prefix_icase/ > we can

Re: [PATCH 02/14] log: refactor add_header to drop some magic numbers

On Tue, Dec 29, 2015 at 2:20 AM, Jeff King wrote: > We want to chomp newlines off the end of the "value" string. > But because it's const, we must track its length rather than > writing a NUL. This leads to us having to tweak that length > later, to account for moving the pointer

Re: [PATCH 03/14] strutil: add skip_prefix_icase

On Tue, Dec 29, 2015 at 2:22 AM, Jeff King wrote: > Some sites that otherwise would use skip_prefix cannot do > so, because it has no way to do case-insensitive > comparisons. Such sites usually get around this by using > strncasecmp, at the cost of having to use magic numbers. >

Re: [PATCH/RFC v2 0/2] add regex match flags to git describe

On Wed, Dec 30, 2015 at 1:27 AM, Junio C Hamano wrote: > It is more important to envision what we would do in the future when > a command that takes a pattern (or a set of patterns) to match the > refnames with _and_ another pattern (or a set of patterns) to match > something

Re: Segfault in git reflog

On Wed, Dec 30, 2015 at 6:17 PM, Dennis Kaarsemaker wrote: > On wo, 2015-12-30 at 10:24 +0100, Dennis Kaarsemaker wrote: >> spirit:~/code/git (master)$ cat .git/logs/HEAD >> 2635c2b8bfc9aec07b7f023d8e3b3d02df715344 >> 54bc41416c5d3ecb978acb0df80d57aa3e54494c Dennis

Re: Segfault in git reflog

On Wed, Dec 30, 2015 at 6:26 PM, Duy Nguyen wrote: > On Wed, Dec 30, 2015 at 6:17 PM, Dennis Kaarsemaker > wrote: >> On wo, 2015-12-30 at 10:24 +0100, Dennis Kaarsemaker wrote: >>> spirit:~/code/git (master)$ cat .git/logs/HEAD >>>

Re: Segfault in git reflog

On wo, 2015-12-30 at 10:24 +0100, Dennis Kaarsemaker wrote: > spirit:~/code/git (master)$ cat .git/logs/HEAD > 2635c2b8bfc9aec07b7f023d8e3b3d02df715344 > 54bc41416c5d3ecb978acb0df80d57aa3e54494c Dennis Kaarsemaker > 1446765642 +0100 >

Re: [PATCH v4 08/10] dir: simplify untracked cache "ident" field

On 2015-12-29 08.09, Christian Couder wrote: > It is not a good idea to compare kernel versions and disable > the untracked cache if it changes as people may upgrade and > still want the untracked cache to work. So let's just > compare work tree locations to decide if we should disable > it. OK

[PATCH v4] git-svn: add support for prefixed globs in config

Introduce prefixed globs for branches and tags in git-svn. Globs like 'release_*' allow users to avoid long lines in config like: branches = branches/{release_20,release_21,release_22,...} Signed-off-by: Victor Leschuk --- Changes from v3: * Wrapped all test

Feature request: git bisect merge to usable base

Hi- I'm currently bisecting a Linux bug on my laptop. The starting good commit is v4.4-rc3 and the starting bad commit is v4.4-rc7. Unfortunately, anything much older than v4.4-rc3 doesn't boot at all. I'd like to say: $ git bisect merge-to v4.4-rc3 or similar. The effect would be that,

Segfault in git reflog

I've hit a segfault in git reflog with latest git, reproducable in git.git: spirit:~/code/git (master)$ ./git describe v2.7.0-rc3 I've minimized the reflog to: spirit:~/code/git (master)$ cat .git/logs/HEAD 2635c2b8bfc9aec07b7f023d8e3b3d02df715344 54bc41416c5d3ecb978acb0df80d57aa3e54494c

Re: Segfault in git reflog

On Wed, Dec 30, 2015 at 4:24 PM, Dennis Kaarsemaker wrote: > I've hit a segfault in git reflog with latest git, reproducable in git.git: > > spirit:~/code/git (master)$ ./git describe > v2.7.0-rc3 > > I've minimized the reflog to: > > spirit:~/code/git (master)$ cat

Re: [PATCH v8] ls-files: Add eol diagnostics

On 30/12/15 12:57, Torsten Bögershausen wrote: > When working in a cross-platform environment, a user wants to > check if text files are stored normalized in the repository and if > .gitattributes are set appropriately. > > Make it possible to let Git show the line endings in the index and > in

Re: Segfault in git reflog

On wo, 2015-12-30 at 18:28 +0700, Duy Nguyen wrote: > On Wed, Dec 30, 2015 at 6:26 PM, Duy Nguyen > wrote: > > On Wed, Dec 30, 2015 at 6:17 PM, Dennis Kaarsemaker > > wrote: > >> On wo, 2015-12-30 at 10:24 +0100, Dennis Kaarsemaker wrote: > >>>

./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ?

I got 2 failures on pu under Mac OS, (Linux is OK) I did some very basic debugging, it seems as if grep doesn't find a needed string. Does anybody have an idea here ? Failure 1: Add some debug code: git diff - grep -q refs/notes/z merge_commit_msg && + echo >&2

[PATCH v8] ls-files: Add eol diagnostics

When working in a cross-platform environment, a user wants to check if text files are stored normalized in the repository and if .gitattributes are set appropriately. Make it possible to let Git show the line endings in the index and in the working tree and the effective text/eol attributes. The

Re: Segfault in git reflog

On Wed, Dec 30, 2015 at 01:28:06PM +0100, Dennis Kaarsemaker wrote: > On wo, 2015-12-30 at 18:28 +0700, Duy Nguyen wrote: > > On Wed, Dec 30, 2015 at 6:26 PM, Duy Nguyen > > wrote: > > > On Wed, Dec 30, 2015 at 6:17 PM, Dennis Kaarsemaker > > > wrote: >

Re: [PATCH] commit: ensure correct permissions of the commit message

Hi Torsten, On Sun, 20 Dec 2015, Torsten Bögershausen wrote: > On 2015-12-20 15.21, Johannes Schindelin wrote: > > > I have to point out that the adjust_shared_perm() call must come after > > the *fclose()* call, to avoid modifying files to which we currently > > have open file handles. > > I

[PATCH] reflog-walk: don't segfault on non-commit sha1's in the reflog

Use lookup_commit instead of parse_object to look up commits mentioned in the reflog. This avoids a segfault in save_parents if somehow a sha1 for something other than a commit ends up in the reflog. Signed-off-by: Dennis Kaarsemaker Helped-by: Nguyễn Thái Ngọc Duy

Re: [PATCH v8] ls-files: Add eol diagnostics

>> "binary" binary file >> "text-no-eol" text file without any EOL >> "text-lf" text file with LF >> "text-crlf"text file with CRLF >> "text-crlf-lf" text file with mixed line endings. > If you prefer to have 'text' in there somewhere, how about: > >binary, text-none,