Re: [PATCH v3] Makefile: replace perl/Makefile.PL with simple make rules

2017-12-15 Thread Michael J Gruber
Ævar Arnfjörð Bjarmason venit, vidit, dixit 12.12.2017 23:26: > > On Tue, Dec 12 2017, Randall S. Becker jotted: > >> -Original Message- >> On December 10, 2017 4:14 PM, Ævar Arnfjörð Bjarmason wrote: >> Subject: [PATCH v3] Makefile: replace perl/Makefile.PL with simple make rules >> >>>

Re: [PATCH 2/3] merge-base: return fork-point outside reflog

2017-11-08 Thread Michael J Gruber
Ekelhart Jakob venit, vidit, dixit 08.11.2017 09:52: > Thank you for all the effort to fix this issue. Unfortunately, we are still > suffering from this and our workaround just stopped being sufficient. > > We were wondering if there is any way to tell when this fix will be released? > > BR

Re: [PATCH 3/4] merge: --no-verify to bypass pre-merge hook

2017-09-25 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 24.09.2017 01:48: > Michael J Gruber <g...@grubix.eu> writes: > >> From: Michael J Gruber <g...@drmicha.warpmail.net> >> >> Analogous to commit, introduce a '--no-verify' option which bypasses the >> pre-merge hoo

[PATCH 4/4] t7503: add tests for pre-merge-hook

2017-09-22 Thread Michael J Gruber
From: Michael J Gruber <g...@drmicha.warpmail.net> Add tests which make sure that the pre-merge-hook is called when present, allows/disallows merge commits depending on its return value and is suppressed by "--no-verify". Signed-off-by: Michael J Gruber <g...@grubix.eu> -

[PATCH 0/4] pre-merge hook

2017-09-22 Thread Michael J Gruber
. I've been rebasing and using this series for years now, 2/4 is the new-comer which fixed the breakage from f8b863598c that I encountered because of the no-verify implementation. Michael J Gruber (4): git-merge: Honor pre-merge hook merge: do no-verify like commit merge: --no-verify to b

[PATCH 3/4] merge: --no-verify to bypass pre-merge hook

2017-09-22 Thread Michael J Gruber
From: Michael J Gruber <g...@drmicha.warpmail.net> Analogous to commit, introduce a '--no-verify' option which bypasses the pre-merge hook. The shorthand '-n' is taken by the (non-existing) '--no-stat' already. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- Documentation/g

[PATCH 1/4] git-merge: Honor pre-merge hook

2017-09-22 Thread Michael J Gruber
From: Michael J Gruber <g...@drmicha.warpmail.net> git-merge does not honor the pre-commit hook when doing automatic merge commits, and for compatibility reasons this is going to stay. Introduce a pre-merge hook which is called for an automatic merge commit just like pre-commit is

[PATCH 2/4] merge: do no-verify like commit

2017-09-22 Thread Michael J Gruber
o the same in the same way. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- builtin/merge.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index de254d466b..7ba094ee87 100644 --- a/builtin/merge.c +++ b/builtin/merge.

Re: [PATCH 2/3] merge-base: return fork-point outside reflog

2017-09-22 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 22.09.2017 03:49: > Michael J Gruber <g...@grubix.eu> writes: > >> Also, I'm undecided about about your reflog argument above - if we leave >> "--fork-point" to be the current behaviour including Jeff's fix then the >>

Re: [PATCH 2/3] merge-base: return fork-point outside reflog

2017-09-21 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 21.09.2017 08:27: > Junio C Hamano writes: > >> ... I agree that there is a value in what your patch 2/3 >> wants to do when the current one that is more strict would say >> "there is no known fork-point"---we would gain a way to say "...

Re: [PATCH 1/2] test-lib: group system specific FIFO tests by system

2017-09-15 Thread Michael J Gruber
Johannes Schindelin venit, vidit, dixit 15.09.2017 00:21: > Hi Michael, > > On Thu, 14 Sep 2017, Michael J Gruber wrote: > >> test-lib determines whether a file-system supports FIFOs and needs to do >> special casing for CYGWIN and MINGW. This separates those system &

Re: [PATCH 2/3] merge-base: return fork-point outside reflog

2017-09-15 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 15.09.2017 04:48: > Michael J Gruber <g...@grubix.eu> writes: > >> In fact, per documentation "--fork-point" looks at the reflog in >> addition to doing the usual walk from the tip. The original design >> description i

Re: [PATCH 1/3] t6010: test actual test output

2017-09-15 Thread Michael J Gruber
Jeff King venit, vidit, dixit 14.09.2017 16:34: > On Thu, Sep 14, 2017 at 03:15:18PM +0200, Michael J Gruber wrote: > >> 4f21454b55 ("merge-base: handle --fork-point without reflog", >> 2016-10-12) introduced a fix for merge-base --fork-point without reflog >> a

Re: [PATCH v3] commit-template: change a message to be more intuitive

2017-09-15 Thread Michael J Gruber
Kaartic Sivaraam venit, vidit, dixit 15.09.2017 06:50: > It's not good to use the phrase 'do not touch' to convey the information > that the cut-line should not be modified or removed as it could possibly > be mis-interpreted by a person who doesn't know that the word 'touch' has > the meaning of

[PATCH 2/2] test-lib: ulimit does not limit on CYGWIN and MINGW

2017-09-14 Thread Michael J Gruber
Jones <ram...@ramsayjones.plus.com> Reported-by: Adam Dinwoodie <a...@dinwoodie.org> Reported-by: Johannes Schindelin <johannes.schinde...@gmx.de> Signed-off-by: Michael J Gruber <g...@grubix.eu> --- This is independent of my series, but should best go before so that no

[PATCH 1/2] test-lib: group system specific FIFO tests by system

2017-09-14 Thread Michael J Gruber
-off-by: Michael J Gruber <g...@grubix.eu> --- t/test-lib.sh | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 5fbd8d4a90..b8a0b05102 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -994,6 +994,10 @@ case $u

[PATCH 0/3] merge-base --fork-point fixes

2017-09-14 Thread Michael J Gruber
merge-base --fork-point does not quite work as advertised when the reflog is empty or partial. This series brings it in line with the documentation and, hopefully, with the original intent. Michael J Gruber (3): t6010: test actual test output merge-base: return fork-point outside reflog

[PATCH 1/3] t6010: test actual test output

2017-09-14 Thread Michael J Gruber
merge-base output, not just its return code. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- t/t6010-merge-base.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh index 31db7b5f91..17fffd7998 100755 --- a/t/t6010-mer

[PATCH 3/3] merge-base: find fork-point outside partial reflog

2017-09-14 Thread Michael J Gruber
of refname is found in any case, independent of the state of the reflog. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- builtin/merge-base.c | 2 +- t/t6010-merge-base.sh | 8 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/builtin/merge-base.c b/builtin/merge-

[PATCH 2/3] merge-base: return fork-point outside reflog

2017-09-14 Thread Michael J Gruber
Jakob <jakob.ekelh...@fsw.at> Signed-off-by: Michael J Gruber <g...@grubix.eu> --- builtin/merge-base.c | 18 +++--- t/t6010-merge-base.sh | 8 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/builtin/merge-base.c b/builtin/merge-base.c index 6dbd167d3b

Re: [PATCH] test-lib: don't use ulimit in test prerequisites on cygwin

2017-09-14 Thread Michael J Gruber
Jonathan Nieder venit, vidit, dixit 13.09.2017 21:20: > Ramsay Jones wrote: > >> On cygwin (and MinGW), the 'ulimit' built-in bash command does not have >> the desired effect of limiting the resources of new processes, at least >> for the stack and file descriptors. However, it always returns

Re: merge-base not working as expected when base is ahead

2017-09-14 Thread Michael J Gruber
Ekelhart Jakob venit, vidit, dixit 13.09.2017 17:07: > Dear Git, > > git merge-base --fork-point "master" not working if master is already newer > then my current branch. > Very oddly it seems to work whenever you had the expected commit checked out > previously - what made it very tricky to

Re: [PATCH v2] commit-template: change a message to be more intuitive

2017-09-14 Thread Michael J Gruber
Kaartic Sivaraam venit, vidit, dixit 13.09.2017 15:05: > It's not good to use the phrase 'do not touch' to convey the information > that the cut-line should not be modified or removed as it could possibly > be mis-interpreted by a person who doesn't know that the word 'touch' has > the meaning of

Re: Unexpected pass for t6120-describe.sh on cygwin

2017-09-13 Thread Michael J Gruber
Johannes Schindelin venit, vidit, dixit 12.09.2017 15:39: > Hi Ramsay, > > On Sat, 9 Sep 2017, Ramsay Jones wrote: > >> I ran the test-suite on the 'pu' branch last night (simply because that >> was what I had built at the time!), which resulted in a PASS, but t6120 >> was showing a 'TODO

Re: Unexpected pass for t6120-describe.sh on cygwin

2017-09-10 Thread Michael J Gruber
Ramsay Jones venit, vidit, dixit 09.09.2017 15:13: > Hi Adam, > > I ran the test-suite on the 'pu' branch last night (simply because > that was what I had built at the time!), which resulted in a PASS, > but t6120 was showing a 'TODO passed' for #52. > > This is a test introduced by Michael's

Re: git diff doesn't quite work as documented?

2017-09-08 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 08.09.2017 03:26: > Olaf Klischat writes: > >> `git diff --help' says: >> >> git diff [--options] [--] [...] >>This form is to view the changes you have in your >>working tree relative to the named . > > That

Re: [PATCH 0/4] Test name-rev with small stack

2017-09-08 Thread Michael J Gruber
Jeff King venit, vidit, dixit 07.09.2017 16:54: > On Thu, Sep 07, 2017 at 04:02:19PM +0200, Michael J Gruber wrote: > >> name-rev segfaults for me in emacs.git with the typical 8102 stack size. >> The reason is the recursive walk that name-rev uses. >> >> T

[PATCH 0/4] Test name-rev with small stack

2017-09-07 Thread Michael J Gruber
name-rev segfaults for me in emacs.git with the typical 8102 stack size. The reason is the recursive walk that name-rev uses. This series adds a test to mark this as known failure, after some clean-ups. Michael J Gruber (4): t7004: move limited stack prereq to test-lib t6120: test name-rev

[PATCH 1/4] t7004: move limited stack prereq to test-lib

2017-09-07 Thread Michael J Gruber
The lazy prerequisite ULIMIT_STACK_SIZE is used only in t7004 so far. Move it to test-lib.sh so that it can be used in other tests (which it will be in a follow-up commit). Signed-off-by: Michael J Gruber <g...@grubix.eu> --- t/t7004-tag.sh | 6 -- t/test-lib.sh | 6 ++ 2

[PATCH 2/4] t6120: test name-rev --all and --stdin

2017-09-07 Thread Michael J Gruber
name-rev is used in a few tests, but tested only in t6120 along with describe so far. Add tests for name-rev with --all and --stdin. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- t/t6120-describe.sh | 25 + 1 file changed, 25 insertions(+) diff --git a/t

[PATCH 4/4] t6120: test describe and name-rev with deep repos

2017-09-07 Thread Michael J Gruber
of other subtests the same. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- t/t6120-describe.sh | 31 +++ 1 file changed, 31 insertions(+) diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index 1997ccde56..dd6dd9df9b 100755 --- a/t/t6120-describe.sh +++ b/t

[PATCH 3/4] t6120: clean up state after breaking repo

2017-09-07 Thread Michael J Gruber
t6120 breaks the repo state intentionally in the last tests. Clean up the breakage afterwards (and before adding more tests). Signed-off-by: Michael J Gruber <g...@grubix.eu> --- t/t6120-describe.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t6120-describe.sh b/t/t6120-descr

Re: [PATCH] name-rev: change ULONG_MAX to TIME_MAX

2017-09-07 Thread Michael J Gruber
Jeff King venit, vidit, dixit 06.09.2017 15:35: > On Wed, Sep 06, 2017 at 01:59:31PM +0200, Michael J Gruber wrote: > >> BTW, there's more fallout from those name-rev changes: In connection >> with that other thread about surprising describe results for emacs.git I >> n

Re: [PATCH] name-rev: change ULONG_MAX to TIME_MAX

2017-09-06 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 06.09.2017 05:35: > Michael J Gruber <g...@grubix.eu> writes: > >> Earlier, dddbad728c ("timestamp_t: a new data type for timestamps", >> 2017-04-26) changed several types to timestamp_t. >> >> 5589e87fd8 (&quo

Re: signing commits using gpg2

2017-09-05 Thread Michael J Gruber
shawn wilson venit, vidit, dixit 02.09.2017 23:11: > tl;dr - how do I get git to use gpg2 to sign things? > > I'm using gpg2 (so no agent options are configured but an agent is > running) which is configured w/ a Nitrokey (Pro if it matters): > > % git commit -m "Initial." > >

[PATCH] name-rev: change ULONG_MAX to TIME_MAX

2017-08-30 Thread Michael J Gruber
Change the remaining constant to the one appropriate for the current type Signed-off-by: Michael J Gruber <g...@grubix.eu> --- builtin/name-rev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/name-rev.c b/builtin/name-rev.c index c41ea7c2a6..598da6c8bc 100644 --- a/b

Re: git describe and "the smallest number of commits possible"

2017-08-29 Thread Michael J Gruber
Stefan Beller venit, vidit, dixit 28.08.2017 20:24: > On Sat, Aug 26, 2017 at 7:47 AM, Kévin Le Gouguec > wrote: >> Hi, >> >> I've asked this question on the git-users Google Groups list[1], and >> while the answers there were interesting, I still cannot figure >>

Re: [PATCH v4 00/16] Fix git-gc losing objects in multi worktree

2017-08-25 Thread Michael J Gruber
Nguyễn Thái Ngọc Duy venit, vidit, dixit 23.08.2017 14:36: > "git gc" when used in multiple worktrees ignore some per-worktree > references: object references in the index, HEAD and reflog. This > series fixes it by making the revision walker include these from all > worktrees by default (and the

[PATCH v3 0/4] Keep merge during kills

2017-08-23 Thread Michael J Gruber
Compared to the 3-item v2: 1/4 == 1/3 2/4 is new as per Junio's suggestion: clarify the call-chain leading up to prepare_to_commit() 3/4 == 2/3 with amended subject 4/4 is 3/3 rebased, squash-if removed Michael J Gruber (4): Documentation/git-merge: explain --continue merge: clarify call

[PATCH v3 4/4] merge: save merge state earlier

2017-08-23 Thread Michael J Gruber
crafted after the in t7502. The test requires EXECKEEPSPID (thus does not run under MINGW). Save the merge state earlier (in the non-squash case) so that it does not get lost. This makes the test pass. Reported-by: hIpPy <hippy2...@gmail.com> Signed-off-by: Michael J Gruber <g...@

[PATCH v3 2/4] merge: clarify call chain

2017-08-23 Thread Michael J Gruber
the tree, which also avoids setting automerge_was_ok (just as in the proper ret==1 case), so that finish_automerge() is not called. To ensure that no code change breaks that assumption, safe-guard prepare_to_commit() by a BUG() statement. Suggested-by: junio Signed-off-by: Michael J Gruber &l

[PATCH v3 3/4] merge: split write_merge_state in two

2017-08-23 Thread Michael J Gruber
are interrupted: we write heads-mode-msg now when we used to write heads-msg-mode. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- builtin/merge.c | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index dafec80fa9..db33

[PATCH v3 1/4] Documentation/git-merge: explain --continue

2017-08-23 Thread Michael J Gruber
Currently, 'git merge --continue' is mentioned but not explained. Explain it. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- Documentation/git-merge.txt | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt

Re: [PATCH v2 3/3] merge: save merge state earlier

2017-08-22 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 22.08.2017 02:38: > Michael J Gruber <g...@grubix.eu> writes: > >> static void prepare_to_commit(struct commit_list *remoteheads) >> { >> struct strbuf msg = STRBUF_INIT; >> @@ -767,6 +768,8 @@ static void

Re: [PATCH v2 1/3] Documentation/git-merge: explain --continue

2017-08-22 Thread Michael J Gruber
Martin Ågren venit, vidit, dixit 21.08.2017 18:43: > On 21 August 2017 at 14:53, Michael J Gruber <g...@grubix.eu> wrote: >> Currently, 'git merge --continue' is mentioned but not explained. >> >> Explain it. >> >> Signed-off-by: Michael J Gruber <g.

[PATCH v2 2/3] merge: split write_merge_state in two

2017-08-21 Thread Michael J Gruber
write_merge_state() writes out the merge heads, mode, and msg. But we may want to write out heads, mode without the msg. So, split out heads (+mode) into a separate function write_merge_heads() that is called by write_merge_state(). No funtional change so far. Signed-off-by: Michael J Gruber &l

[PATCH v2 0/3] Keep merge during kills

2017-08-21 Thread Michael J Gruber
of people that I'd like to make angry - at least not without a good reason. Michael J Gruber (3): Documentation/git-merge: explain --continue merge: split write_merge_state in two merge: save merge state earlier Documentation/git-merge.txt | 5 - builtin/merge.c | 14

[PATCH v2 3/3] merge: save merge state earlier

2017-08-21 Thread Michael J Gruber
(in the non-squash case) so that it does not get lost. Reported-by: hIpPy <hippy2...@gmail.com> Signed-off-by: Michael J Gruber <g...@grubix.eu> --- builtin/merge.c | 3 +++ t/t7600-merge.sh | 15 +++ 2 files changed, 18 insertions(+) diff --git a/builtin/merge.c b/builtin/m

[PATCH v2 1/3] Documentation/git-merge: explain --continue

2017-08-21 Thread Michael J Gruber
Currently, 'git merge --continue' is mentioned but not explained. Explain it. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- Documentation/git-merge.txt | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt

[PATCH] merge: save merge state earlier

2017-08-21 Thread Michael J Gruber
(in the non-squash case) so that it does not get lost. Reported-by: hIpPy <hippy2...@gmail.com> Signed-off-by: Michael J Gruber <g...@grubix.eu> --- builtin/merge.c | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c inde

Re: Git makes a merge commit but as a normal (non-merge) commit

2017-08-21 Thread Michael J Gruber
hIpPy venit, vidit, dixit 19.08.2017 00:35: > While merging if I do certain actions then the merge commit is made > with the merge message but as a normal (non-merge) commit. > > Repro steps: > - Set GIT_MERGE_AUTOEDIT=yes (set other than "no") in .bashrc > - Make a merge commit with no

[PATCH 2/2] Documentation/git-for-each-ref: clarify peeling of tags for --format

2017-08-18 Thread Michael J Gruber
to be classical english. Try and straighten that explanation out a bit. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- Documentation/git-for-each-ref.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-fo

[PATCH 1/2] Documentation: use proper wording for ref format strings

2017-08-18 Thread Michael J Gruber
to an object but not vice versa, so the object cannot possible know %(refname), for example. Thus, this is wrong independent of refs being objects (one day, maybe) or not. Change the wording to make this clearer (and distinguish it from formats for the log family). Signed-off-by: Michael J Gruber

Re: Weirdness with git change detection

2017-08-18 Thread Michael J Gruber
Jeff King venit, vidit, dixit 11.07.2017 10:24: > On Tue, Jul 11, 2017 at 10:20:43AM +0200, Torsten Bögershausen wrote: > >>> No problem. I actually think it would be interesting if Git could >>> somehow detect and warn about this situation. But the obvious way to do >>> that would be to re-run

Re: [PATCH] t5534: fix misleading grep invocation

2017-07-06 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 05.07.2017 18:26: > Johannes Schindelin writes: > >> It seems to be a little-known feature of `grep` (and it certainly came >> as a surprise to this here developer who believed to know the Unix tools >> pretty well) that multiple

Re: [PATCH] tests: remove the GETTEXT_POISON compile-time option to test i18n marking

2017-04-26 Thread Michael J Gruber
[Turns out I still can't operate gmail's web interface. Sorry for the dupe.] 2017-04-24 13:04 GMT+02:00 Ævar Arnfjörð Bjarmason : > Remove the GETTEXT_POISON=YesPlease compile-time which turns all of > git's LC_*=C output into strings like "# GETTEXT POISON #" instead of >

Re: [BUG] test suite broken with GETTEXT_POISON=YesPlease

2017-04-21 Thread Michael J Gruber
Ævar Arnfjörð Bjarmason venit, vidit, dixit 20.04.2017 23:58: > As a refresh of everyone's memory (because mine needed it). This is a > feature I added back in 2011 when the i18n support was initially > added. > > There was concern at the time that we would inadvertently mark > plumbing messages

Re: Draft of Git Rev News edition 26

2017-04-19 Thread Michael J Gruber
Christian Couder venit, vidit, dixit 17.04.2017 16:33: > Hi, > > A draft of a new Git Rev News edition is available here: > > > https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-26.md > > Everyone is welcome to contribute in any section either by editing the > above

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-12 Thread Michael J Gruber
Ævar Arnfjörð Bjarmason venit, vidit, dixit 12.04.2017 14:18: > On Wed, Apr 12, 2017 at 7:43 AM, Michael J Gruber <g...@grubix.eu> wrote: >> Am 11. April 2017 22:40:14 MESZ schrieb "Ævar Arnfjörð Bjarmason" >> <ava...@gmail.com>: >>> On Tue, Apr

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-12 Thread Michael J Gruber
Enis Bayramoğlu venit, vidit, dixit 12.04.2017 08:15: > On Wed, Apr 12, 2017 at 8:43 AM, Michael J Gruber <g...@grubix.eu> wrote: >> Am 11. April 2017 22:40:14 MESZ schrieb "Ævar Arnfjörð Bjarmason" >> <ava...@gmail.com>: >>> On Tue, A

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-11 Thread Michael J Gruber
} else { >branch_name = ""; > on_what = _("Not currently on any branch."); > > > No way. That would reduce the information that we give. Note that the difference between from and at is also: are th

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-11 Thread Michael J Gruber
Enis Bayramoğlu venit, vidit, dixit 11.04.2017 10:57: > I've encountered a very misleading output from `git status`. Here's a > sequence of events that demonstrates the issue: > > $ git --version > git version 2.12.0 > > $ git checkout origin/master > > $ git status > HEAD detached from

Re: [PATCH] status: show in-progress info for short status

2017-04-07 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 31.03.2017 20:14: > Michael J Gruber <g...@grubix.eu> writes: > >> Ordinary (long) status shows information about bisect, revert, am, >> rebase, cherry-pick in progress, and so does git-prompt.sh. status >> --short currently

Re: [PATCH] status: show in-progress info for short status

2017-04-07 Thread Michael J Gruber
SZEDER Gábor venit, vidit, dixit 06.04.2017 16:33: >> @@ -1779,6 +1780,31 @@ static void wt_shortstatus_print_tracking(struct >> wt_status *s) >> } >> >> color_fprintf(s->fp, header_color, "]"); >> + >> + inprogress: >> +if (!s->show_inprogress) >> +goto conclude; >> +

Re: [PATCH] Documentation/git-worktree: use working tree for trees on the file system

2017-04-07 Thread Michael J Gruber
Duy Nguyen venit, vidit, dixit 25.03.2017 13:07: > On Fri, Mar 24, 2017 at 12:55 AM, Junio C Hamano <gits...@pobox.com> wrote: >> Michael J Gruber <g...@drmicha.warpmail.net> writes: >> >>> Are we at a point where we can still rename the new feature at least

Re: [PATCH v3 3/4] name-rev: provide debug output

2017-04-03 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 31.03.2017 20:33: > Junio C Hamano <gits...@pobox.com> writes: > >> Michael J Gruber <g...@grubix.eu> writes: >> >>>> The only case that this change may make a difference I can think of >>>> is when y

Re: [PATCH v3 3/4] name-rev: provide debug output

2017-03-31 Thread Michael J Gruber
Am 31. März 2017 18:52:16 MESZ schrieb Junio C Hamano <gits...@pobox.com>: >Michael J Gruber <g...@grubix.eu> writes: > >> Currently, `git describe --contains --debug` does not create any >debug >> output because it does not pass the flag down to `git name-rev`,

[PATCH] status: show in-progress info for short status

2017-03-31 Thread Michael J Gruber
information is shown next to the branch information. Just like `--branch`, this comes with a config option. The wording for the in-progress information is taken over from git-prompt.sh. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- When used with --porcelain, this gives an easy way to

[PATCH v3 3/4] name-rev: provide debug output

2017-03-31 Thread Michael J Gruber
cribe" header). The date cut-off for name-rev kicks in way more often than the candidate number cut-off of describe, so we do not clutter the output with the cut-off. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- Documentation/git-name-rev.txt | 5 builtin/name-rev.c

[PATCH v3 4/4] describe: pass --debug down to name-rev

2017-03-31 Thread Michael J Gruber
Now that name-rev knows --debug, pass that flag down to name-rev when we call it for doing describe --contains. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- builtin/describe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/describe.c b/builtin/describe.c index a5cd

[PATCH v3 2/4] name-rev: favor describing with tags and use committer date to tiebreak

2017-03-31 Thread Michael J Gruber
I do not mind people disagreeing with the logic that this patch happens to implement. This is done primarily to illustrate the value of using a separate helper function is_better_name() instead of open-coding the selection logic in name_rev() function. Signed-off-by: Michael J Gru

[PATCH v3 0/4] name-rev sanity

2017-03-31 Thread Michael J Gruber
describing with tags and use committer date to tiebreak Michael J Gruber (2): name-rev: provide debug output describe: pass --debug down to name-rev Documentation/git-name-rev.txt | 5 ++ builtin/describe.c | 2 + builtin/name-rev.c | 117

[PATCH v3 1/4] name-rev: refactor logic to see if a new candidate is a better name

2017-03-31 Thread Michael J Gruber
while keeping the current logic the same (i.e. a name that is based on an older tag is better, and if two tags of the same age can reach the commit, the one with fewer number of hops to reach the commit is better). Signed-off-by: Junio C Hamano <gits...@pobox.com> Signed-off-by: Michael

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

2017-03-30 Thread Michael J Gruber
Jeff King venit, vidit, dixit 21.01.2017 15:20: > On Wed, Jan 11, 2017 at 10:08:46AM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >>> Yes, I would think die_errno() is a no-brainer for translation, since >>> the strerror() will be translated. >>> apply.c:

Re: [PATCH v2 0/3] name-rev sanity

2017-03-30 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 29.03.2017 19:43: > Junio C Hamano writes: > >> The first two applies cleanly to the same base as jc/name-rev that >> the first two of these patches are meant to replace, but the third >> one doesn't apply on top. Are you depending on

[PATCH v2 0/3] name-rev sanity

2017-03-29 Thread Michael J Gruber
, but still mostly Junio's Michael J Gruber (1): name-rev: provide debug output This replaces the patch which documented that --debug does not work with --contains :) builtin/describe.c | 2 + builtin/name-rev.c | 117 + t/t4202-log.sh

[PATCH v2 2/3] name-rev: favor describing with tags and use committer date to tiebreak

2017-03-29 Thread Michael J Gruber
I do not mind people disagreeing with the logic that this patch happens to implement. This is done primarily to illustrate the value of using a separate helper function is_better_name() instead of open-coding the selection logic in name_rev() function. Signed-off-by: Michael J Gru

[PATCH v2 3/3] name-rev: provide debug output

2017-03-29 Thread Michael J Gruber
te cut-off for name-rev kicks in way more often than the candidate number cut-off of describe, so we do not clutter the output with the cut-off. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- builtin/describe.c | 2 ++ builtin/name-rev.c | 64 +++

[PATCH v2 1/3] name-rev: refactor logic to see if a new candidate is a better name

2017-03-29 Thread Michael J Gruber
while keeping the current logic the same (i.e. a name that is based on an older tag is better, and if two tags of the same age can reach the commit, the one with fewer number of hops to reach the commit is better). Signed-off-by: Junio C Hamano <gits...@pobox.com> Signed-off-by: Michael

[PATCH v2 0/2] describe: localize debug output

2017-03-27 Thread Michael J Gruber
v2 computes the width for the localized output dynamically. In fact, it might overcalculated a bit depending on the encoding, but this does not do any harm. Michael J Gruber (2): describe: localize debug output fully l10n: de: translate describe debug terms builtin/describe.c | 15

[PATCH v2 2/2] l10n: de: translate describe debug terms

2017-03-27 Thread Michael J Gruber
Signed-off-by: Michael J Gruber <g...@grubix.eu> --- po/de.po | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index e9c86f5488..913db393dc 100644 --- a/po/de.po +++ b/po/de.po @@ -7530,7 +7530,19 @@ msgstr "git describe [] [...]&q

[PATCH v2 1/2] describe: localize debug output fully

2017-03-27 Thread Michael J Gruber
git describe --debug localizes all debug messages but not the terms head, lightweight, annotated that it outputs for the candidates. Localize them, too. Signed-off-by: Michael J Gruber <g...@grubix.eu> --- builtin/describe.c | 15 --- 1 file changed, 12 insertions(+), 3 del

Re: report on a possible bug: git commit -p myfile.py unexpected output

2017-03-24 Thread Michael J Gruber
Joan Aguilar venit, vidit, dixit 24.03.2017 11:27: > Hello there > > this is the first bug report of my life and I am not a native English > speaker so, first of all, I would like to apologize for my English > skills and the report itself (if it is not precise enough). > > I have already read

Re: [PATCH v3 2/2] l10n: Add git-add.txt to localized man pages

2017-03-24 Thread Michael J Gruber
Stefan Beller venit, vidit, dixit 22.03.2017 19:59: > On Wed, Mar 22, 2017 at 11:56 AM, Junio C Hamano wrote: >>> So we'd want to be able to say: >>> "get a tarball including all submodules except the superproject" >>> (This would produce the "optional language pack

[PATCH] mailmap: use Michael J Gruber's new address

2017-03-24 Thread Michael J Gruber
Map both old addresses to the new, hopefully more permanent one. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> Signed-off-by: Michael J Gruber <g...@grubix.eu> --- .mailmap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap inde

Re: [PATCH] Documentation/git-worktree: use working tree for trees on the file system

2017-03-23 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 21.03.2017 16:48: > Duy Nguyen writes: > >> On Tue, Mar 21, 2017 at 1:50 AM, Jonathan Nieder wrote: >>> Junio C Hamano wrote: Stefan Beller writes: >>> > While it may be true that you can

[PATCH 1/2] describe: localize debug output fully

2017-03-17 Thread Michael J Gruber
git describe --debug localizes all debug messages but not the terms head, lightweight, annotated that it outputs for the candidates. Localize them, too. Also, increase the width of that field to create room for the translated terms. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.

[PATCH 2/2] l10n: de: translate describe debug terms

2017-03-17 Thread Michael J Gruber
Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Junio: this is just a l10n-followup to the previous code patch ;) po/de.po | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index e9c86f5488..913db393dc 100644 --- a/po

[PATCH] l10n: de: lower case after semi-colon

2017-03-17 Thread Michael J Gruber
Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Just a minor thing. I'm wondering about lower/upper case at the beginning of the line, though. Do we have a rule for de.po? po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po

Re: [PATCH 2/2] name-rev: favor describing with tags and use committer date to tiebreak

2017-03-17 Thread Michael J Gruber
> hops, without taking the "taggerdate" into account. As we are > taking over the "taggerdate" field to store the committer date for > tips with commits: > > (1) keep the original logic when comparing names based on two refs > both of which are from refs/tags/; > > (2) favoring a name

Re: [PATCH 1/3] describe: debug is incompatible with contains

2017-03-17 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 15.03.2017 20:21: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> `git describe --contains` calls into `git name-rev` which does not have >> any searching to do and thus does not display any debug information. >>

Re: [PATCH 2/3] git-prompt: add a describe style for any tags

2017-03-17 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 15.03.2017 20:25: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> git-prompt has various describe styles, among them "describe" (by >> annotated tags) and "default" (by exact match with any tag). >

[PATCH 2/3] git-prompt: add a describe style for any tags

2017-03-15 Thread Michael J Gruber
git-prompt has various describe styles, among them "describe" (by annotated tags) and "default" (by exact match with any tag). Add a mode "tag" that describes by any tag, annotated or not. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> ---

[RFD PATCH 3/3] name-rev: Allow lightweight tags and branch refs

2017-03-15 Thread Michael J Gruber
name (e.g. foo~5) coming from an annotated tag. Instead, assign the commit date to lightweight tags or branch refs so that they get their fair chance of being picked up. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Originally, I didn't even think of submitting this as is

[PATCH 0/3] describe --contains sanity

2017-03-15 Thread Michael J Gruber
2 patches and 1 RFD around describe (--contains). They are technically independent, but happened along the same stroll in that area when I tried to match documentation, my expectations, and reality. 1 and 2 should be no-brainers. 3 is something to ponder for a while. Michael J Gruber (3

[PATCH 1/3] describe: debug is incompatible with contains

2017-03-15 Thread Michael J Gruber
`git describe --contains` calls into `git name-rev` which does not have any searching to do and thus does not display any debug information. Say so in the documentation and catch the incompatible arguments. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Documentati

[PATCH] git-status: make porcelain more robust

2017-03-14 Thread Michael J Gruber
Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- wt-status.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wt-status.c b/wt-status.c index d47012048f..234e77a6d6 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1730,12 +1730,1

Re: Stable GnuPG interface, git should use GPGME

2017-03-14 Thread Michael J Gruber
Bernhard E. Reiter venit, vidit, dixit 13.03.2017 13:49: > Am Montag 13 März 2017 11:14:57 schrieb Michael J Gruber: >> Ævar Arnfjörð Bjarmason venit, vidit, dixit 10.03.2017 15:23: >>> On Fri, Mar 10, 2017 at 11:00 AM, Bernhard E. Reiter > >>>> please consider us

Re: Stable GnuPG interface, git should use GPGME

2017-03-13 Thread Michael J Gruber
Ævar Arnfjörð Bjarmason venit, vidit, dixit 10.03.2017 15:23: > On Fri, Mar 10, 2017 at 11:00 AM, Bernhard E. Reiter > wrote: >> Dear Git-Devs, > > I haven't contributed to Git's GPG code, but I'm taking the liberty of > CC-ing some people who have. > >> git uses

Re: show all merge conflicts

2017-02-27 Thread Michael J Gruber
G. Sylvie Davies venit, vidit, dixit 29.01.2017 07:45: > On Sat, Jan 28, 2017 at 6:28 AM, Jeff King wrote: >> On Fri, Jan 27, 2017 at 09:42:41PM -0800, G. Sylvie Davies wrote: >> >>> Aside from the usual "git log -cc", I think this should work (replace >>> HEAD with whichever

  1   2   3   4   5   6   7   8   >