[PATCH] pretty: add format specifiers: %gr, %gt, %gI, gi

Add new format specifiers which allow the printing of reflog timestamp. This allows us to know when operations which change HEAD take place (e.g., guilt pop -a, which does the equivalent of a "git reset --hard commit"), since using %cr will display when the commit was originally made, instead of

Re: What's cooking in git.git (Jul 2016, #03; Fri, 8)

On Sun, Jul 10, 2016 at 03:47:36AM +, Eric Wong wrote: > > There was one minor improvement I suggested[1] (and which you seemed to > > like), which is to push the errno check into the function. That wasn't > > expressed in patch form, though, so I've included below a version of > > your patch

Re: [PATCH] git-gui: Do not reset author details on amend

It's been over 2 months. Can anyone please review and merge it? Thanks. - Orgad On Wed, May 18, 2016 at 9:12 AM, Orgad Shaneh wrote: > ping? > > On Thu, May 5, 2016 at 8:22 PM, Junio C Hamano wrote: >> Pat, we haven't heard from you for a long time. Are

Re: [ANNOUNCE] more archives of this list

Eric Wong wrote: > https://public-inbox.org/.temp/git.vger.kernel.org-6c38c917e55c.gz > (362M) > > git init --bare mirror.git > curl $FAST_EXPORT_GZ_URL | git --git-dir=mirror.git fast-import Oops, that is missing zcat: curl $FAST_EXPORT_GZ_URL |

Re: What's cooking in git.git (Jul 2016, #03; Fri, 8)

Jeff King wrote: > On Sat, Jul 09, 2016 at 11:45:18PM +, Eric Wong wrote: > > Junio C Hamano wrote: > > > * sb/submodule-parallel-fetch (2016-06-27) 2 commits > > > (merged to 'next' on 2016-07-06 at de5fd35) > > > + xwrite: poll on non-blocking FDs > > >

Re: What's cooking in git.git (Jul 2016, #03; Fri, 8)

On Sat, Jul 09, 2016 at 11:45:18PM +, Eric Wong wrote: > Junio C Hamano wrote: > > * sb/submodule-parallel-fetch (2016-06-27) 2 commits > > (merged to 'next' on 2016-07-06 at de5fd35) > > + xwrite: poll on non-blocking FDs > > + xread: retry after poll on

[ANNOUNCE] more archives of this list

Very much a work-in-progress, but NNTP and HTTP/HTTPS sorta work based on stuff that is on gmane and stuff I'm accumulating by being a subscriber. The first two Tor hidden service onions are actually on better hardware than the non-hidden public-inbox.org one:

Re: What's cooking in git.git (Jul 2016, #03; Fri, 8)

Junio C Hamano wrote: > * sb/submodule-parallel-fetch (2016-06-27) 2 commits > (merged to 'next' on 2016-07-06 at de5fd35) > + xwrite: poll on non-blocking FDs > + xread: retry after poll on EAGAIN/EWOULDBLOCK > > Fix a recently introduced codepaths that are involved in

Re: Over-/underquoting, was Re: [PATCH] revert: clarify seemingly bogus OPT_END repetition

Michael J Gruber wrote: > 2016-07-06 22:15 GMT+02:00 Jacob Keller : > > On Wed, Jul 6, 2016 at 6:16 AM, Johannes Schindelin > > wrote: > ... > >>> It is not unheard of that a MUA can collapse and expand properly

Re: What's cooking in git.git (Jul 2016, #03; Fri, 8)

Junio C Hamano wrote: > * ew/svn-bad-ref (2016-07-06) 1 commit > - git-svn: warn instead of dying when commit data is missing > I'm likely to discard this, favouring a direct pull request from > the subsystem maintainer directly going to 'master'. Pushed with your sign-off

[PATCH] guilt: fix portability problem with using find -perm +111

GNU find no longers accepts -perm +111, even though the rest of the world (MacOS, Solaris, BSD) still do. Workaround this problem by using -executable if the system find utility will accept it. Signed-off-by: Theodore Ts'o --- guilt | 13 +++-- 1 file changed, 11

[PATCH] guilt: update reflog with annotations of guilt-command being run

Many of the updates made by guilt use git update-ref, which means that the output of "git reflog" is extremely unedifying, e.g: ff0031d HEAD@{177}: reset: moving to ff0031d848a0cd7002606f9feef958de8d5edf19 90f4305 HEAD@{178}: a638d43 HEAD@{179}: ff0031d HEAD@{180}: 079788d HEAD@{181}: 87a6280

Re: gc and repack ignore .git/*HEAD when checking reachability

On Sat, Jul 9, 2016 at 4:09 PM, Josh Triplett wrote: > On Sat, Jul 09, 2016 at 09:35:24AM +0200, Johannes Schindelin wrote: >> On Fri, 8 Jul 2016, Junio C Hamano wrote: >> > Josh Triplett writes: >> > >> > > That sounds reasonable. And if they *do*

[PATCH] worktree: use strbuf_add_absolute_path() directly

absolute_path() is a wrapper for strbuf_add_absolute_path(). Call the latter directly for adding absolute paths to a strbuf. That's shorter and avoids an extra string copy. Signed-off-by: Rene Scharfe --- worktree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

Re: Over-/underquoting, was Re: [PATCH] revert: clarify seemingly bogus OPT_END repetition

2016-07-06 22:15 GMT+02:00 Jacob Keller : > On Wed, Jul 6, 2016 at 6:16 AM, Johannes Schindelin > wrote: ... >>> It is not unheard of that a MUA can collapse and expand properly quoted >>> parts on request... >> >> Sure. Show me some kick-ass,

[PATCH] rm: reuse strbuf for all remove_dir_recursively() calls

Don't throw the memory allocated for remove_dir_recursively() away after a single call, use it for the other entries as well instead. Signed-off-by: Rene Scharfe --- builtin/rm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/builtin/rm.c b/builtin/rm.c

Re: reflogs and worktrees?

Hi Duy, On Tue, 5 Jul 2016, Duy Nguyen wrote: > On Tue, Jul 5, 2016 at 5:07 PM, Johannes Schindelin > wrote: > > Hi Duy, > > > > ever since I started working extensively with worktrees, I end up with > > these funny gc problems, like broken links and stale reflogs. >

Re: [PATCH] am: ignore return value of write_file()

Hi Peff, On Fri, 8 Jul 2016, Jeff King wrote: > I think we can clean that up, though. I'll hopefully have a series in a > few minutes. You caught me at busy times... I'll review it tomorrow, promise! Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

Re: gc and repack ignore .git/*HEAD when checking reachability

On Sat, Jul 09, 2016 at 09:35:24AM +0200, Johannes Schindelin wrote: > On Fri, 8 Jul 2016, Junio C Hamano wrote: > > Josh Triplett writes: > > > > > That sounds reasonable. And if they *do* end up taking any time to > > > traverse, it's because they weren't reachable from

[PATCH v2] log: decorate HEAD -> branch with the same color for arrow and HEAD

Commit 76c61fb (log: decorate HEAD with branch name under --decorate=full, too - 2015-05-13) adds "HEAD -> branch" decoration to show current branch vs detached HEAD. The sign of whether HEAD is detached or not is "->" (vs ",") because the branch is always colored by type. Color the arrow the same

Re: gc and repack ignore .git/*HEAD when checking reachability

Hi Junio, On Fri, 8 Jul 2016, Junio C Hamano wrote: > Josh Triplett writes: > > > That sounds reasonable. And if they *do* end up taking any time to > > traverse, it's because they weren't reachable from other anchoring > > points, so taking the extra time to traverse

Re: [PATCH 2/2] diff: fix a double off-by-one with --ignore-space-at-eol

Thanks, you sure are efficient in bug fixing... good day to you Naja Melan -- 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: Git 2.8.1 - bug in patience diff algorithm when used with --ignore-space-at-eol?

Hi, On Sat, 9 Jul 2016, Johannes Schindelin wrote: > On Fri, 8 Jul 2016, Naja Melan wrote: > > > When diffing with --patience and --ignore-space-at-eol, a change that > > adds or removes just one character a the end of a line isn't picked up. > > Confirmed with the current 'master'. I am on it

[PATCH 1/2] diff: demonstrate a bug with --patience and --ignore-space-at-eol

When a single character is added to a line, the combination of these two options results in an empty diff. This bug was noticed and reported by Naja Melan. Signed-off-by: Johannes Schindelin --- t/t4033-diff-patience.sh | 8 1 file changed, 8 insertions(+)

[PATCH 2/2] diff: fix a double off-by-one with --ignore-space-at-eol

When comparing two lines, ignoring any whitespace at the end, we first try to match as many bytes as possible and break out of the loop only upon mismatch, to let the remainder be handled by the code shared with the other whitespace-ignoring code paths. When comparing the bytes, however, we

[PATCH 0/2] Fix xdiff's --ignore-space-at-eol handling

It turns out that I am not the only Git developer capable of producing an off-by-one bug ;-) This patch series fixes a bug where we ignored single-character changes at the end of the lines when trying to ignore white space at the end of the lines. I split the changes into two patches because the

Re: Git GUI Guesses Incorrect Language

Seems like a file command issue then. Here's the 'file' command output: $ file src/models/pathPlan.jsx src/services/ai.jsx src/models/pathPlan.jsx: C++ source, ASCII text src/services/ai.jsx: ASCII text Sunjay On Sat, Jul 9, 2016 at 2:57 AM, Johannes Sixt wrote: > Am

Re: Git GUI Guesses Incorrect Language

Am 09.07.2016 um 06:57 schrieb Sunjay Varma: Just before the first line of my code, it says "C++ source, ASCII text". That file is a JavaScript/ES6 file. The ".jsx" file extension signifies that it may also contain Facebook's special JSX syntax (HTML-like syntax in JavaScript). Git-gui just

Re: Git 2.8.1 - bug in patience diff algorithm when used with --ignore-space-at-eol?

Hi Naja, On Fri, 8 Jul 2016, Naja Melan wrote: > When diffing with --patience and --ignore-space-at-eol, a change that > adds or removes just one character a the end of a line isn't picked up. Confirmed with the current 'master'. I am on it, building on top of this diff: -- snipsnap -- diff