Re: git alias for options

hIpPy venit, vidit, dixit 17.02.2017 09:23: > Git has aliases for git commands. Is there a (an inbuilt) way to alias > options? If not, what is the reason? > > Thanks, > hippy > You can setup an alias for "command with options", for example: git help s `git s' is aliased to `status -s -b -uno

Re: Bug with fixup and autosquash

Junio C Hamano venit, vidit, dixit 08.02.2017 23:55: > Ashutosh Bapat writes: > >> I have been using git rebase heavily these days and seem to have found a bug. >> >> If there are two commit messages which have same prefix e.g. >> yy This is prefix >> xx

Re: [RFC PATCH 0/5] Localise error headers

Jeff King venit, vidit, dixit 04.01.2017 08:05: > On Mon, Jan 02, 2017 at 12:14:49PM +0100, Michael J Gruber wrote: > >> Currently, the headers "error: ", "warning: " etc. - generated by die(), >> warning() etc. - are not localized, but

[RFC PATCH 1/5] error/warning framework: prepare for l10n

Currently, errors, warnings etc. are output with a fixed prefix "error: " etc. that is not subject to l10n. Change the call signatures of error_routine() etc. so that they receive the prefix as first argument. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net&

[RFC PATCH 0/5] Localise error headers

occinelli patches 5/5 is not to be applied to the main tree, but helps you try out the feature: it has changes to de.po and git.pot so that e.g. "git branch" has fully localised error messages (see the recipe in the commit message). Michael J Gruber (5): error/warn framework: prepare

[RFC PATCH 3/5] error/warning framework framework: coccinelli rules

Provide coccinelli rules which check for error(), warning() etc. with localised argument and create a patch to replace them with error_(), warning_() etc. in order to fully localize them. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- contrib/coccinelle/errorl10n.cocc

[RFC PATCH 2/5] error/warn framework: provide localized variants

Provide localized variants of error(), warning(), die() etc. to go along with localized messages. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- git-compat-util.h | 8 ++ usage.c | 74 +++ 2 files chang

Re: [RFC/PATCH 0/2] git diff <(command1) <(command2)

Junio C Hamano venit, vidit, dixit 14.11.2016 19:01: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> *My* idea of --no-index was for it to behave as similar to the >> --index-version as possible, regarding formatting etc., and to be a good >> substitute f

Re: [RFC/PATCH 0/2] git diff <(command1) <(command2)

Johannes Schindelin venit, vidit, dixit 12.11.2016 11:08: > Hi, > > On Fri, 11 Nov 2016, Jacob Keller wrote: > >> On Fri, Nov 11, 2016 at 1:27 PM, Junio C Hamano wrote: >>> Dennis Kaarsemaker writes: >>> No tests or documentation updates yet, and

Re: [PATCH] Documentation/git-diff: document git diff with 3+ commits

Junio C Hamano venit, vidit, dixit 26.10.2016 20:11: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> That one is difficult to discover but super useful, so document it: >> Specifying 3 or more commits makes git diff switch to combined diff. >> >>

[PATCH] Documentation/git-diff: document git diff with 3+ commits

That one is difficult to discover but super useful, so document it: Specifying 3 or more commits makes git diff switch to combined diff. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Notes: Note that we have the following now: 'git diff A B' displays 'B

[PATCH v3] gpg-interface: use more status letters

additional status codes E, X, Y, R for ERRSIG, EXPSIG, EXPKEYSIG, and REVKEYSIG so that a user of %G? gets more information about the absence of a 'G' on first glance. Requested-by: Alex <agram...@gmail.com> Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- v3 incorp

Re: [PATCH v2] gpg-interface: use more status letters

Junio C Hamano venit, vidit, dixit 06.10.2016 23:43: > Junio C Hamano <gits...@pobox.com> writes: > >> Michael J Gruber <g...@drmicha.warpmail.net> writes: >> >>> Also, I'm open to using another letter for EXPKEYSIG but couldn't decide >>&

Re: [PATCH v2] gpg-interface: use more status letters

Ramsay Jones venit, vidit, dixit 28.09.2016 23:09: > > > On 28/09/16 20:59, Junio C Hamano wrote: >> Michael J Gruber <g...@drmicha.warpmail.net> writes: > >>> + "X" for a good expired signature, or good signature made by an expired >>> ke

Re: [PATCH v2] gpg-interface: use more status letters

Junio C Hamano venit, vidit, dixit 28.09.2016 21:59: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> - Use GNUPGHOME="$HOME/gnupg-home-not-used" just like in other tests (lib). > > If you are not using /dev/null, I expected you to do > >

[PATCH v2] gpg-interface: use more status letters

ce additional status codes E, X, R for ERRSIG, EXP*SIG, REVKEYSIG so that a user of %G? gets more information about the absence of a 'G' on first glance. Requested-by: Alex <agram...@gmail.com> Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Changes in v2: - Use GNUPGHOME=

[PATCH] gpg-interface: use more status letters

ce additional status codes E, X, R for ERRSIG, EXP*SIG, REVKEYSIG so that a user of %G? gets more information about the absence of a 'G' on first glance. Reported-by: Alex <agram...@gmail.com> Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- I'd be happy to learn are more p

Re: Request: Extra case for %G? format

Alex venit, vidit, dixit 25.09.2016 08:05: > Hello all, > > Could the %G? format differentiate between an unsigned commit and a > signed commit that you're missing a public key for? > > If `git show --format=%GG --no-patch ' produces an output like > the following: > > gpg: Signature made

Re: v2.10.0: ls-tree exit status is always 0, this differs from ls(1)

Steffen Nurpmeso venit, vidit, dixit 22.09.2016 00:46: > Junio C Hamano wrote: > |Steffen Nurpmeso writes: > ... > |Sorry, but I did not notice that there was an attached patch when I > |was reading your response for the first time. Risk of using an >

Re: 2.10.0: git log --oneline prints gpg signatures in 4 lines

Leandro Lucarella venit, vidit, dixit 21.09.2016 15:53: > On Tue, 20 Sep 2016 19:15:33 -0400 > Jeff King wrote: > >> On Tue, Sep 20, 2016 at 05:09:54PM +0200, Leandro Lucarella wrote: >> >>> Hi, starting from 2.10.0 I noticed that when using git log >>> --oneline, if commits are

Re: clarification of `rev-list --no-walk ^`?

Junio C Hamano venit, vidit, dixit 19.09.2016 18:12: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >>> It can be read that >>> >>> $ git cherry-pick maint next >>> >>> would pick two single commits, while >>> >>

Re: clarification of `rev-list --no-walk ^`?

[So many typos, sorry] Michael J Gruber venit, vidit, dixit 21.09.2016 16:46: > Junio C Hamano venit, vidit, dixit 19.09.2016 18:12: >> Michael J Gruber <g...@drmicha.warpmail.net> writes: >> >>>> It can be read that >>>> >>>> $ git cherr

Re: clarification of `rev-list --no-walk ^`?

Philip Oakley venit, vidit, dixit 19.09.2016 12:56: > A question came up on the Git user list regarding cherry-pick that got me > reading the manual (again), in this case regarding --no-walk ranges. > > Essentially my question is: If --no-walk is given to rev-list (e.g. via > charry-pick), and

Re: [PATCH] gpg-interface: reflect stderr to stderr

Junio C Hamano venit, vidit, dixit 08.09.2016 23:36: > Jeff King writes: > >>> Even though this patch is fixing only one of the two issues, I am >>> tempted to say that we should queue it for now, as it does so >>> without breaking a bigger gain made by the original, i.e. we learn

Re: [PATCH] gpg-interface: reflect stderr to stderr

Jeff King venit, vidit, dixit 07.09.2016 10:39: > On Wed, Sep 07, 2016 at 10:27:34AM +0200, Michael J Gruber wrote: > >> Now, I can't reproduce C on Linux[*], so there is more involved. It >> could be that my patch just exposes a problem in our start_command() >> etc.

Re: How to simulate a real checkout to test a new smudge filter?

john smith venit, vidit, dixit 06.09.2016 23:01: > On 9/6/16, Torsten Bögershausen wrote: >> On 06.09.16 19:47, john smith wrote: >>> I am looking for a way to force smudge filter to run by simulating a >>> real life checkout. Let's say I just created a new branch and did not >>>

Re: [PATCH] gpg-interface: reflect stderr to stderr

Johannes Schindelin venit, vidit, dixit 06.09.2016 18:43: > Hi Michael, > > okay, final mail on this issue today: > > On Tue, 6 Sep 2016, Johannes Schindelin wrote: > >> Your original issue seemed to be that the gpg command could succeed, but >> still no signature be seen. There *must* be a way

[PATCH] gpg-interface: reflect stderr to stderr

to stderr. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- A full blown approach would use --status-fd=4 or such rather than hijacking stderr. This would require an extension of pipe_command() etc. to handle yet another fd. gpg-interface.c | 7 +-- 1 file changed, 5

Re: [PATCH] Unbreak interactive GPG prompt upon signing

e Linux-specific, if you prefer. > This fixes https://github.com/git-for-windows/git/issues/871 > > Cc: Michael J Gruber <g...@drmicha.warpmail.net> > Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> > --- > Published-As: https://github.com/dscho/git/rele

Re: how to showing a merge graph?

Duy Nguyen venit, vidit, dixit 30.08.2016 15:10: > I want to see a "git log --oneline --graph" with all non-merge commits > removed, but history is rewritten so that the merge commits represent > the entire topics and are shown to have all the parents of the base > commits. e.g. if the full graph

Re: [PATCH] Documentation/SubmittingPatches: add quotes to advised commit reference

Junio C Hamano venit, vidit, dixit 27.08.2016 00:42: > Stefan Beller writes: > >> Junio finds it is easier to read text when the commit subject is quoted. >> >> Signed-off-by: Stefan Beller >> --- >> Documentation/SubmittingPatches | 2 +- >> 1 file

Re: diff using 3-dot behavior

Robert Dailey venit, vidit, dixit 24.08.2016 16:28: > I want to view the complete diff of my branch (topic) relative to its > parent branch (master). This should include cached/staged files and > unstaged working tree changes. > > If I do this: > > $ git diff master > > This will include

[PATCH] Documentation/git-patch-id: give working code example

As it stands, the documentation gives the impression that git diff-tree | git patch-id would be a working invocation of git patch-id, leaving the novice user in the dark. Make it explicit that 'git diff-tree -p' would be the command to use. Signed-off-by: Michael J Gruber &l

Re: Bug with git worktrees and git init

Max Nordlund venit, vidit, dixit 23.08.2016 14:35: > Hi, > > I've been using multiple worktrees for months without issue (it's a > great feature, thanks), until recently when I wanted to add hooks to > them. So, when I added a template for the hooks, everything was fine > until I did a git reset

Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.9.3

Johannes Schindelin venit, vidit, dixit 23.08.2016 15:54: > Hi Duy, > > On Mon, 22 Aug 2016, Duy Nguyen wrote: > >> On Thu, Aug 18, 2016 at 3:37 PM, Johannes Schindelin >> wrote: >>> Hi Junio, >>> >>> On Wed, 17 Aug 2016, Junio C Hamano wrote: >>> Johannes

Re: Thunderbird woes, was: Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

Jakub Narębski venit, vidit, dixit 09.08.2016 10:24: > On 9 August 2016 at 10:11, Michael J Gruber <g...@drmicha.warpmail.net> wrote: > >> My own setup >> >> >> My usual MUA is Thunderbird because of its integration with calendars >>

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

Michael Haggerty venit, vidit, dixit 09.08.2016 01:20: > Given that I work for GitHub, I'm uncomfortable doing any more advocacy > here. If people have concrete questions, I'd be happy to answer them, on > the list or in private. You're doing a great job differentiating between your roles as a

Re: storing cover letter of a patch series?

Junio C Hamano venit, vidit, dixit 08.08.2016 19:42: > Duy Nguyen writes: > >> git-notes was mentioned in this thread back in 2015, but I think it's >> discarded because of the argument that's part of the cover letter was >> not meant to be kept permanently. > > I do not

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,

Re: [PATCH] revert: clarify seemingly bogus OPT_END repetition

Johannes Schindelin venit, vidit, dixit 06.07.2016 09:01: > Hi Peff & Jacob, > > On Tue, 5 Jul 2016, Jacob Keller wrote: > >> On Tue, Jul 5, 2016 at 1:44 PM, Jeff King wrote: >>> On Tue, Jul 05, 2016 at 04:28:20PM -0400, Jeff King wrote: >>> >>> Something like the patch below.

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

Jeff King venit, vidit, dixit 01.07.2016 08:31: > On Thu, Jun 30, 2016 at 06:39:42PM +0200, Nguyễn Thái Ngọc Duy wrote: > >> 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.

Re: How to find commits unique to a branch

Nikolaus Rath venit, vidit, dixit 21.06.2016 01:21: > On Jun 20 2016, Junio C Hamano wrote: >> Nikolaus Rath writes: >> >>> What's the best way to find all commits in a branch A that have not been >>> cherry-picked from (or to) another branch B? >>> >>> I

Re: [PATCH 2/4] add smudge-to-file and clean-from-file filter configuration

Joey Hess venit, vidit, dixit 16.06.2016 22:32: > This adds new smudge-to-file and clean-from-file filter commands, > which are similar to smudge and clean but allow direct access to files on > disk. > > In smudge-to-file and clean-from-file, "%p" is expanded to the path to the > file that should

Re: [PATCH 0/7] gpg-interface cleanups

Junio C Hamano venit, vidit, dixit 16.06.2016 20:20: > Jeff King writes: > >> This started off with Michael's patch to sign_buffer, which is at the >> tip, and then me trying to address the possible deadlocks there and in >> verify_signed_buffer. While I was in the area, I took

[PATCHv2] Documentation/technical: push certificate format

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- This is the version describing the current state, not assuming any new verify command for blobs. Documentation/technical/signature-format.txt | 51 1 file changed, 51 insertions(+) diff

Re: I lost my commit signature

Junio C Hamano venit, vidit, dixit 16.06.2016 19:06: > Jeff King writes: > >> But why does somebody run "commit -S" for a single commit, but not all >> the time? Is it because that commit is special? Or is that particular >> moment special? One implies that it's important for the

[PATCH 5/5] Documentation/technical: push certificate format

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Documentation/technical/signature-format.txt | 56 1 file changed, 56 insertions(+) diff --git a/Documentation/technical/signature-format.txt b/Documentation/technical/signature-format.txt index 7

[PATCH 1/5] Documentation/technical: describe signature formats

We use different types of signature formats in different places. Set up the infrastructure and overview to describe them systematically in our technical documentation. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Documentation/Makefile

[PATCH 2/5] Documentation/technical: signed tag format

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Documentation/technical/signature-format.txt | 47 1 file changed, 47 insertions(+) diff --git a/Documentation/technical/signature-format.txt b/Documentation/technical/signature-format.txt index f

[PATCH 4/5] Documentation/technical: signed merge tag format

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Documentation/technical/signature-format.txt | 74 1 file changed, 74 insertions(+) diff --git a/Documentation/technical/signature-format.txt b/Documentation/technical/signature-format.txt index 8

[PATCH 3/5] Documentation/technical: signed commit format

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Documentation/technical/signature-format.txt | 48 1 file changed, 48 insertions(+) diff --git a/Documentation/technical/signature-format.txt b/Documentation/technical/signature-format.txt index 8

[PATCH 0/5] Documentation/technical: describe signature formats

the trustworthiness of signatures, the same way we export information to receive hooks in the presence of push certificates. (Give information, don't decide.) Michael J Gruber (5): Documentation/technical: describe signature formats Documentation/technical: signed tag format Documentation/technical

Re: [PATCHv3] gpg-interface: check gpg signature creation status

Jeff King venit, vidit, dixit 16.06.2016 11:25: > On Wed, Jun 15, 2016 at 09:17:54AM +0200, Michael J Gruber wrote: > >> As for the flexibility: >> We do code specifically for gpg, which happens to work for gpg2 also. >> The patch doesn't add any gpg ui requiremen

Re: [PATCH] verify-tag: allow to verify signed blob objects

Junio C Hamano venit, vidit, dixit 15.06.2016 20:39: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> diff --git a/tag.c b/tag.c >> index d1dcd18..d5f090b 100644 >> --- a/tag.c >> +++ b/tag.c >> @@ -39,7 +39,7 @@ int gpg_verify

[PATCH] verify-tag: allow to verify signed blob objects

erify tags and blobs. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- The first outcome of my long announced project to describe our signature formats in Documentation/technical (progress underway) In fact, that whole area is in need of refactoring: gpg related bits are al

Re: [PATCHv3] gpg-interface: check gpg signature creation status

Jeff King venit, vidit, dixit 15.06.2016 02:56: > On Tue, Jun 14, 2016 at 04:47:35PM -0700, Junio C Hamano wrote: > >> Jeff King writes: >> >>> I'm still undecided on whether it is a better approach than making >>> sure the stdout we got looks sane. In particular I'd worry that it

Re: I lost my commit signature

Jeff King venit, vidit, dixit 15.06.2016 06:34: > On Wed, Jun 15, 2016 at 12:27:15PM +0800, ZhenTian wrote: > >> I got two more lines from gpg -v during commit with -S: >> ``` >> gpg: writing to stdout >> gpg: RSA/SHA1 signature from: "2EF2AD6E Tian Zhen " >> ``` >> >>

[PATCHv3] gpg-interface: check gpg signature creation status

o the same for verify already. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- That must be the real real thing now... gpg-interface.c | 22 +++--- t/t7004-tag.sh | 10 +- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/gpg-interface.c b

[PATCHv2] gpg-interface: check gpg signature for correct header

localised there. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- So, this is the real thing. Between you and me: parse_signature in fact is more lenient, but hey - it's exactly as lenient as we are otherwise, bar running gpg --verify. gpg-interface.c | 2 +- t/t7

Re: [PATCH] gpg-interface: check gpg signature for correct header

Michael J Gruber venit, vidit, dixit 14.06.2016 13:34: > Jeff King venit, vidit, dixit 14.06.2016 13:20: >> On Tue, Jun 14, 2016 at 01:11:19PM +0200, Michael J Gruber wrote: >> >>> When we create a signature, it may happen that gpg returns with >>> "su

Re: [PATCH] gpg-interface: check gpg signature for correct header

Jeff King venit, vidit, dixit 14.06.2016 13:20: > On Tue, Jun 14, 2016 at 01:11:19PM +0200, Michael J Gruber wrote: > >> When we create a signature, it may happen that gpg returns with >> "success" but not with an actual detached signature on stdout. >> >&g

[PATCH] gpg-interface: check gpg signature for correct header

When we create a signature, it may happen that gpg returns with "success" but not with an actual detached signature on stdout. Check for the correct header to catch these cases better. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- This catches at least my e

[TIG PATCH] test: make diff/log work with git 2.9

git 2.9.0 switches the default for diff.renames to true. Set this to false in config so that the test suite runs unmodified for old and new git. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- test/tools/libgit.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test

Re: [RFC/PATCH] verify-tag: add --check-name flag

Junio C Hamano venit, vidit, dixit 08.06.2016 20:43: > Santiago Torres writes: > >> Sorry I'm trying to follow this. Would it be best to then have >> >> verify-tag [--check-name=tagname] (tag-ref|tag-name|sha1)? >> >> and >> >> tag -v [--check-name] (tag-name) >> >> Or

Re: `man 1 git`: Invalid link to online documentation

Jeff King venit, vidit, dixit 07.06.2016 01:25: > On Mon, Jun 06, 2016 at 07:19:36PM -0400, Jeff King wrote: > >> 2. Make git-htmldocs a real site on GitHub. I think this should be as >> simple as pushing to the `gh-pages` branch of the repository, which >> would make it available as

Re: [PATCH] cherry-pick: allow to pick to unborn branches

Junio C Hamano venit, vidit, dixit 06.06.2016 22:06: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> Currently, cherry-pick allows tp pick single commits to an empty HEAD >> but not multiple commits. >> >> Allow the multiple commit case, to

[PATCH] cherry-pick: allow to pick to unborn branches

Currently, cherry-pick allows tp pick single commits to an empty HEAD but not multiple commits. Allow the multiple commit case, too. Reported-by: Fabrizio Cucci <fabrizio.cu...@gmail.com> Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- sequencer.c | 11 ++-

Re: error: Can't cherry-pick into empty head

Fabrizio Cucci venit, vidit, dixit 28.05.2016 19:54: > Hello everyone, > > I'm trying to understand why I'm getting the error as per subject. > > The scenario is the following: I'm on the master branch (which > contains several commits) and I would like to create a new empty > branch (let's call

[BUG?] trailer command with multiple keys

The command printf "body\n\ntest: foo\ntest: froz\n" | git -c trailer.test.key=tested -c trailer.test.command="echo by \$ARG" interpret-trailers gives: body tested: foo tested: froz tested: by froz I expected the command to be run on each "test" key, resulting in the output: body: tested:

Re: [RFD/BUG?] git show with tree/commit

Michael J Gruber venit, vidit, dixit 13.04.2016 10:02: > Junio C Hamano venit, vidit, dixit 12.04.2016 18:26: >> Michael J Gruber <g...@drmicha.warpmail.net> writes: >> >>> $ git show cab2cdadfda8e8e8631026443b11d3ed6e7ba517: >>> tree c

Re: [RFD/BUG?] git show with tree/commit

Junio C Hamano venit, vidit, dixit 12.04.2016 18:26: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> $ git show cab2cdadfda8e8e8631026443b11d3ed6e7ba517: >> tree cab2cdadfda8e8e8631026443b11d3ed6e7ba517: >> >> .gitattributes >> .gitignore

[RFD/BUG?] git show with tree/commit

With current next, using any commit sha1: $ git cat-file -p cab2cdadfda8e8e8631026443b11d3ed6e7ba517 tree 04050d37b1676ba8da277be1902513049b45413a parent b673b5e7d121021f77768c736cd9f98d7b3b3967 parent 7b0d47b3b6b5b64e02a5aa06b0452cadcdb18355 ... $ git show

Re: [RFC/PATCH 00/18] Add --index-only option to git merge

Elijah Newren venit, vidit, dixit 08.04.2016 08:58: > This patch series adds an --index-only flag to git merge, the idea > being to allow a merge to be performed entirely in the index without > touching (or even needing) a working tree. > > The core fix, to merge-recursive, was actually quite

Re: git diff --exit-code does not honour textconv setting

Junio C Hamano venit, vidit, dixit 06.04.2016 01:16: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >>> The "test" command is used as it does not generate any output on stdout. >> >> "test" is a bit of a red herring here since it

Re: git diff --exit-code does not honour textconv setting

Georg Pichler venit, vidit, dixit 20.03.2016 13:43: > Hi, > > I realized that "git diff --exit-code" does not honour textconv settings. > Maybe this behaviour is desired. It can be partially circumvented by using > the "-b" flag if one does not care about whitespace changes. > To reproduce this,

Re: [RFC/PATCH] git.spec: fix changelog dates

Remi Galan Alfonso venit, vidit, dixit 05.04.2016 14:28: > Michael J Gruber <g...@drmicha.warpmail.net> wrote: >> A few changelog entries have inconsistent dates, which rpmlint reports >> as errors. >> >> Fix them based on these assumptions: >> - It's ea

[RFC/PATCH] git.spec: fix changelog dates

J Gruber <g...@drmicha.warpmail.net> --- I dunno if this is worthwhile, but rpmlint is the first thing we tell packagers and reviewers to check. git.spec.in | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git.spec.in b/git.spec.in index bfd1cfb..eb581a3

[PATCH] completion: complete --cherry-mark for git log

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index e3918c8..d87cf4d 100644 --- a/contrib/completi

Re: [ANNOUNCE] Git v2.8.1 (and call-for-help to "make rpmbuild" users)

Junio C Hamano venit, vidit, dixit 03.04.2016 21:21: > If you do not build RPM binary packages from our pristine source, > you can safely ignore this release and stop reading this message. > > Now that the audience of this message has been limited to a narrow > target, before I make an

Re: [ANNOUNCE] Git v2.8.0-rc2

Junio C Hamano venit, vidit, dixit 21.03.2016 21:01: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> I think this is a general question about how to track build >> products. The proper place may be in a tree that is referenced >> from a note or so. &g

Re: [ANNOUNCE] Git v2.8.0-rc2

2016-03-20 10:45 GMT+01:00 Jiang Xin <worldhello@gmail.com>: > 2016-03-16 21:33 GMT+08:00 Michael J Gruber <g...@drmicha.warpmail.net>: >> Junio C Hamano venit, vidit, dixit 14.03.2016 18:47: >>> Junio C Hamano <gits...@pobox.com> writes: >>> &g

Re: [ANNOUNCE] Git v2.8.0-rc2

Junio C Hamano venit, vidit, dixit 16.03.2016 17:30: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> echo '*.po diff=po' >>.gitattributes >> echo '*.pot diff=po' >>.gitattributes >> git config diff.po.textconv "msgcat --indent

Re: [ANNOUNCE] Git v2.8.0-rc2

Duy Nguyen venit, vidit, dixit 16.03.2016 14:40: > On Wed, Mar 16, 2016 at 8:33 PM, Michael J Gruber > <g...@drmicha.warpmail.net> wrote: >> In hindsight, what happened must have been like this: >> >> "ahead " was marked properly for l10n and translated in

Re: [ANNOUNCE] Git v2.8.0-rc2

Junio C Hamano venit, vidit, dixit 14.03.2016 18:47: > Junio C Hamano writes: > >> But if it makes it easier for translations teams and the i18n >> coordinator to work together if I also pulled the git.pot update >> myself, I'll do so. I just didn't know (and still don't

[RFC/PATCH] Makefile: allow po generation through po target

The main Makefile has a "pot" target that recreates the git.pot file of strings which are marked for translation. Add a "po" target that recreates the $(LANGUAGE).po files which contain the translations (or stubs). Signed-off-by: Michael J Gruber <g...@drmicha.w

[PATCH] wt-status: allow "ahead " to be picked up by l10n

The extra pair of parentheses keeps the l10n engine from picking up the string. Remove them so that "ahead " ends up in git.pot. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- wt-status.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/

Re: [PATCH] diff: handle "-" as abbreviation of '@{-1}'

Please bottom post - see below. Javier Domingo Cansino venit, vidit, dixit 12.03.2016 03:48: > dash is usually used for representing stdin / stdout as a file. I > think this could drive to error... but I would agree with transforming > -h1 to @{-1} or -h2 to @{-2} (-h representing head). > > I

Re: [PATCH] rebase -p: avoid grep on potentailly non-ASCII data

Torsten Bögershausen venit, vidit, dixit 08.03.2016 13:25: > On 03/08/2016 08:59 AM, Anders Kaseorg wrote: >> The included test case, which uses rebase -p with non-ASCII commit >> messages, was failing as follows: >> >>Warning: the command isn't recognized in the following line: >> -

Re: Adding RFC 3161 timestamps to git tags

Anton Wuerfel venit, vidit, dixit 07.03.2016 15:15: > Hello, > > as part of an university project we plan to implement time stamp > signatures according to RFC 3161. This enables users to create and verify > cryptographic time stamp signatures to prove that a commit existed at a > certain point

Re: [PATCH 2/2] t5510: do not leave changed cwd

Jeff King venit, vidit, dixit 04.03.2016 12:52: > On Fri, Mar 04, 2016 at 11:53:50AM +0100, Michael J Gruber wrote: > >> t5510 carefully keeps the cwd at the test root by using either subshells >> or explicit cd'ing back to the root. Use a subshell for the last >> su

Re: [PATCH 1/2] test-lib: quote TRASH_DIRECTORY

Jeff King venit, vidit, dixit 04.03.2016 12:51: > On Fri, Mar 04, 2016 at 11:53:49AM +0100, Michael J Gruber wrote: > >> We always quote $TRASH_DIRECTORY to guard against funky path names. Do >> so in one more spot >> >> Signed-off-by: Michael J Gruber <g...@d

[PATCH/RFC 0/2] Test trash dir sanitizing

I encountered a Heisenbug[*] where t5510 would leave its trash directory without cleanup, though not reproducibly so. This mini series cleans up two spots which may or may not be related, but should be goog cleanup anyways. [*] Running tests with prove -j4. Michael J Gruber (2): test-lib

[PATCH 1/2] test-lib: quote TRASH_DIRECTORY

We always quote $TRASH_DIRECTORY to guard against funky path names. Do so in one more spot Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 0b47eb6..8957916

[PATCH 2/2] t5510: do not leave changed cwd

t5510 carefully keeps the cwd at the test root by using either subshells or explicit cd'ing back to the root. Use a subshell for the last subtest, too. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- t/t5510-fetch.sh | 10 ++ 1 file changed, 6 insertions(+), 4 del

[PATCH 1/6] Documentation/git-worktree: spell --detach correctly

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Documentation/git-worktree.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 62c76c1..51a2ea0 100644 --- a/Documentation/git-worktr

[PATCH/WIP 0/6] Detached HEADs in new worktrees considered harmful

n the context of per-worktree refs such as HEAD. 3/6 is a possible fix (making "--all" mean "all refs in all worktrees") but may be too intrusive. 4/6, 5/6, 6/6 are some WIP patches about making 3/6 less intrusive and fixing some cases where do_head_ref_worktrees() has problems tha

[PATCH 5/6] WIP: fix unborn branch case

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- refs/files-backend.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/refs/files-backend.c b/refs/files-backend.c index f020c52..1614854 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -1780,6 +1780,8 @@

[PATCH 2/6] t6014: test prune with detached HEADs in separate worktrees

tly broken, possibly resulting in data loss. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- t/t6014-rev-list-all.sh | 25 + 1 file changed, 25 insertions(+) diff --git a/t/t6014-rev-list-all.sh b/t/t6014-rev-list-all.sh index c9bedd2..99bf8ae 100755 ---

[PATCH/RFD 3/6] rev-list: list all heads with --all

d the HEADs from all worktrees. This results in a non-worktree-specific ref list and solves the pruning problem. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Notes: This patch solves the pruning problem with worktrees, but I feel quite uneasy about substituting the ref

[PATCH 4/6] WIP: mess only with mark_reachable

This still messes up gc/prune on an empty repo where the worktree code can't parse HEAD properly. Bummer. That code sucks for the non-worktree case. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- reachable.c | 2 +- refs.h | 1 + refs/files-bac

<    1   2   3   4   5   6   7   8   >