Re: `make profile-install` fails in 2.9.3

[+cc Edward Thomson, Ingo Brückl] Hi, On 09/01, Jan Keromnes wrote: [.. snip the parts others are more qualified to answer ..] > > Related problem: `t3700-add.sh` currently fails in 2.9.3. I can > provide more debug information if you don't already know this problem. I noticed this problem as

Re: git submodules implementation question

> The final version needs to be accompanied with tests to show the > effect of this change for callers. A test would set up a top-level > and submodule, deliberately break submodule/.git/ repository and > show what breaks and how without this change. Tests are really good at providing this

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

On Thu, Sep 1, 2016 at 1:27 AM, Johannes Schindelin wrote: > On Wed, 31 Aug 2016, Sverre Rabbelier wrote: >> On Wed, Aug 31, 2016 at 3:36 AM Johannes Schindelin >> wrote: >> > On Tue, 30 Aug 2016, Junio C Hamano wrote: >> > > Jeff King

Re: [PATCH 21/22] sequencer: left-trim the lines read from the script

Johannes Schindelin writes: >> > Interactive rebase's scripts may be indented; We need to handle this >> > case, too, now that we prepare the sequencer to process interactive >> > rebases. >> >> s/; We need/; we need/ > > Hrmpf. From

Re: git submodules implementation question

Junio C Hamano writes: > Stefan Beller writes: > >>> The final version needs to be accompanied with tests to show the >>> effect of this change for callers. A test would set up a top-level >>> and submodule, deliberately break submodule/.git/ repository

Re: [PATCH] make dist: allow using an installed version of git

Dennis Kaarsemaker writes: > b1de9de2 back in 2005 ensured that we could create a tarball with 'make > dist' even if git wasn't installed yet. These days however, chances are > higher that a git version is available. Add a config.mak knob to allow > people to choose to

Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

Johannes Schindelin writes: >> though). The "one sequencer to rule them all" may even have to say >> "now give name ':1' to the result of the previous operation" in one >> step and in another later step have an instruction "merge ':1'". >> When that happens, you

Re: git submodules implementation question

Uma Srinivasan writes: > Anyway, with the fix "git status" fails quickly both in my reproducer > (and original repo) with the following message. > fatal: Not a git repository: '.git' > fatal: 'git status --porcelain' failed in submodule commonlib Thanks, that is

Re: [PATCH v13 00/14] libify apply and use lib in am, part 3

Christian Couder writes: > Following Stefan's review, it looks like I will need to resend at > least 02/14, 10/14 and 14/14. > What do you prefer me to resend: > 1) all the last 40 or so patches > 2) the last 14 patches > 3) only the few patches that changed If this

Re: [PATCH] make dist: allow using an installed version of git

On do, 2016-09-01 at 10:43 -0700, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > b1de9de2 back in 2005 ensured that we could create a tarball with 'make > > dist' even if git wasn't installed yet. These days however, chances are > > higher that a git version is

Re: [PATCH v13 06/14] apply: make it possible to silently apply

On Thu, Sep 1, 2016 at 1:01 AM, Christian Couder wrote: > On Thu, Sep 1, 2016 at 12:07 AM, Stefan Beller wrote: >>> Printing on stdout, and calls to warning() or error() are not >>> taken care of in this patch, as that will be done in following >>>

Re: `make profile-install` fails in 2.9.3

On Thu, Sep 01, 2016 at 03:16:38PM -0700, Junio C Hamano wrote: > Which means that piggybacking this on the "run 'git diff' limited to > the pathspec to find the paths that needs updating" logic usually > done in "git add" can not be reused [*1*]. > > What was I thinking while reviewing the

Re: Are --first-parent and --ancestry-path compatible rev-list options?

"Philip Oakley" writes: > The user question was, given a commit 'J', and a future commit 'H' > (typically a branch tip such as 'master'), find those commits that are > : > A) merges > B) on the first parent DAG chain of the future commit 'H' > C) children of the given

Re: `make profile-install` fails in 2.9.3

Jeff King writes: > Yeah, I had a similar thought, but it just feels so hacky. Is there > anything wrong with making this completely separate from the content > update. I.e., just applying the pathspec to the index as a separate step > and adding "+x" to each entry? > > This

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

Sverre Rabbelier writes: >>> I can't really recall, but I think it may have been related to me >>> doing something like this: >>> 1. Make a change, and start running tests (this takes a long time) >>> 2. Notice a failure, start fixing it, leave tests running to find >>>

Re: implement a stable 'Last updated' in Documentation

On Thu, Sep 01, 2016 at 04:37:36PM +0200, Olaf Hering wrote: > Hey, asciidoc made a move, so this patch is good to go: > https://github.com/asciidoc/asciidoc/pull/9 Sine this thread is 18 months old, I needed some recap to remember what we were talking about. :) It's here:

Re: Should "git symbolic-ref -d HEAD" be forbidden?

On Thu, Sep 01, 2016 at 02:08:08PM -0700, Junio C Hamano wrote: > I think we should. > > t1401 expects to be able to, but if you really do it: > > $ cd /tmp > $ git init throwaway > $ cd throwaway > $ git symbolic-ref -d HEAD > > the setup machinery considers that

wall socket extender

Dear Sir/Madam, Hello,this is Bella from Newmany. If you need socket related products, please feel free to contact me. Looking forward to hear from you. Bella Zhang 杭州新万利电子有限公司 Hangzhou Newmany Electronics Co., Ltd. Tel: 86-571-64701616 Fax: 86-571-64701615 http://newmany.en.alibaba.com

Re: git submodules implementation question

>>> The final version needs to be accompanied with tests to show the >>> effect of this change for callers. A test would set up a top-level >>> and submodule, deliberately break submodule/.git/ repository and >>> show what breaks and how without this change. Agreed! The repo where the original

Re: `make profile-install` fails in 2.9.3

On Thu, Sep 01, 2016 at 09:07:00PM +0100, Thomas Gummerer wrote: > > Related problem: `t3700-add.sh` currently fails in 2.9.3. I can > > provide more debug information if you don't already know this problem. > > I noticed this problem as well, when I'm compiling with USE_NSEC = 1 > in my

Re: Should "git symbolic-ref -d HEAD" be forbidden?

Jeff King writes: > On Thu, Sep 01, 2016 at 02:08:08PM -0700, Junio C Hamano wrote: > >> I think we should. >> >> t1401 expects to be able to, but if you really do it: >> >> $ cd /tmp >> $ git init throwaway >> $ cd throwaway >> $ git symbolic-ref -d

Re: [PATCH 10/22] sequencer: avoid completely different messages for different actions

Hello Johannes W dniu 01.09.2016 o 09:52, Johannes Schindelin pisze: > On Wed, 31 Aug 2016, Jakub Narębski wrote: >> CC-ed to Jiang Xin, L10N coordinator. >> W dniu 29.08.2016 o 10:05, Johannes Schindelin pisze: [...] >>> - /* Different translation strings for cherry-pick and revert */ >>> -

Re: Are --first-parent and --ancestry-path compatible rev-list options?

Hi Junio, From: "Junio C Hamano" "Philip Oakley" writes: From: "Junio C Hamano" "Philip Oakley" writes: The commit graph. We are looking for F based on knowing J. . A - B - C - D -- E -- F -- G - H

Re: [PATCH 07/34] sequencer (rebase -i): add support for the 'fixup' and 'squash' commands

Dennis Kaarsemaker writes: >> +static const char *nth_for_number(int n) >> +{ >> +int n1 = n % 10, n10 = n % 100; >> + >> +if (n1 == 1 && n10 != 11) >> +return "st"; >> +if (n1 == 2 && n10 != 12) >> +return "nd"; >> +if (n1 == 3 &&

Re: [PATCH 09/22] sequencer: completely revamp the "todo" script parsing

Hello Johannes, W dniu 01.09.2016 o 09:49, Johannes Schindelin pisze: > On Wed, 31 Aug 2016, Jakub Narębski wrote: >> W dniu 29.08.2016 o 10:05, Johannes Schindelin pisze: [...] >> Hmmm... commit_list is, as defined in commit.h, a linked list. > > That is the most prominent reason why the rest

Re: [PATCH 08/22] sequencer: remove overzealous assumption

Hello Johannes, W dniu 01.09.2016 o 10:01, Johannes Schindelin pisze: > On Wed, 31 Aug 2016, Jakub Narębski wrote: >> W dniu 31.08.2016 o 20:36, Johannes Schindelin pisze: >> >> I wonder: would 'git cherry-pick --continue' be able to finish >> 'git revert', and vice versa, then? Or 'git

Re: `make profile-install` fails in 2.9.3

Jeff King writes: > Yeah, I think we should _always_ act on the --chmod, no matter if the > file is racy or not, or whether it has a content change or not. I.e., > the race is not the problem, but rather the behavior of 4e55ed32. Your > second proposal there sounds more like the

Re: [PATCH 09/22] sequencer: completely revamp the "todo" script parsing

Johannes Schindelin writes: >> git continue as a shorthand for `git --continue` sounds great. > > Before we get ahead of ourselves: > > 1) this has nothing to do with the patch series at hand, and > > 2) if we were to introduce `git continue`, we would need to think

Re: [PATCH v6 13/13] read-cache: make sure file handles are not inherited by child processes

Torsten Bögershausen writes: >> >> diff --git a/sha1_file.c b/sha1_file.c >> index d5e1121..759991e 100644 >> --- a/sha1_file.c >> +++ b/sha1_file.c >> @@ -1485,7 +1485,7 @@ int check_sha1_signature(const unsigned char *sha1, >> void *map, >> >> int git_open_noatime(const

Re: git submodules implementation question

Stefan Beller writes: >> The final version needs to be accompanied with tests to show the >> effect of this change for callers. A test would set up a top-level >> and submodule, deliberately break submodule/.git/ repository and >> show what breaks and how without this

Re: git submodules implementation question

Junio C Hamano writes: If we add # "git diff" should terminate with an error. # NOTE: without fix this will recurse forever! test_must_fail git -C dst diff && after breaking the repository, we can also see "git diff" recurse forever, because it wants

Re: git submodules implementation question

Stefan Beller writes: >> +test_expect_success 'fetching submodule into a broken repository' ' >> + # Prepare src and src/sub nested in it >> + git init src && >> + ( >> + cd src && >> + git init sub && >> + git -C

Should "git symbolic-ref -d HEAD" be forbidden?

I think we should. t1401 expects to be able to, but if you really do it: $ cd /tmp $ git init throwaway $ cd throwaway $ git symbolic-ref -d HEAD the setup machinery considers that you are no longer in a working tree that is controlled by a repository at .git/

Re: git submodules implementation question

On Thu, Sep 1, 2016 at 1:21 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Stefan Beller writes: >> The final version needs to be accompanied with tests to show the effect of this change for callers. A test would set

Re: git submodules implementation question

Uma Srinivasan writes: > Yes, this one line fix addresses my problem. > > So, what is the next step? Will someone submit a patch or should I? > Please note that I've never submitted a patch before, but I don't mind > learning how to. The final version needs to be

Re: Are --first-parent and --ancestry-path compatible rev-list options?

"Philip Oakley" writes: > From: "Junio C Hamano" >> "Philip Oakley" writes: >> >>> The commit graph. We are looking for F based on knowing J. >>> >>> . A - B - C - D -- E -- F -- G - H<-first parent, --merges (C,F,H) >>> . \

Re: [PATCH 0/2] squelch some "gcc -O3 -Wmaybe-uninitialized" warnings

On Wed, Aug 31, 2016 at 12:55:01PM -0700, Junio C Hamano wrote: > Interesting. Here is for "gcc -Os" on top to appease gcc 4.8.4 that > I probably am NOT going to apply. These are all false positives. > > The ones on config.c is the most curious as these two "ret" needs a > false

Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

W dniu 01.09.2016 o 11:37, Johannes Schindelin pisze: > On Wed, 31 Aug 2016, Junio C Hamano wrote: >> Jakub Narębski writes: >> diff --git a/sequencer.c b/sequencer.c index 06759d4..3398774 100644 --- a/sequencer.c +++ b/sequencer.c @@ -709,6 +709,8 @@

Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

Hello, W dniu 01.09.2016 o 15:12, Johannes Schindelin pisze: > On Wed, 31 Aug 2016, Jakub Narębski wrote: >> W dniu 31.08.2016 o 21:10, Junio C Hamano pisze: >>> So I am not sure if we want a parsed commit there (I would not >>> object if we kept the texual object name read from the file, >>>

Re: [PATCH v13 03/14] Move libified code from builtin/apply.c to apply.{c,h}

On Wed, Aug 31, 2016 at 11:57 PM, Stefan Beller wrote: > On Sat, Aug 27, 2016 at 11:45 AM, Christian Couder > wrote: >> As most of the apply code in builtin/apply.c has been libified by a number of >> previous commits, it can now be moved to

Re: [PATCH v13 10/14] apply: change error_routine when silent

On Thu, Sep 1, 2016 at 12:20 AM, Stefan Beller wrote: > On Sat, Aug 27, 2016 at 11:45 AM, Christian Couder > wrote: >> To avoid printing anything when applying with >> `state->apply_verbosity == verbosity_silent`, let's save the >> existing warn

Re: [PATCH 09/22] sequencer: completely revamp the "todo" script parsing

Hi Kuba, On Wed, 31 Aug 2016, Jakub Narębski wrote: > W dniu 29.08.2016 o 10:05, Johannes Schindelin pisze: > > > When we came up with the "sequencer" idea, we really wanted to have > > kind of a plumbing equivalent of the interactive rebase. Hence the > > choice of words: the "todo" script, a

Re: [PATCH 20/34] sequencer (rebase -i): copy commit notes at end

On wo, 2016-08-31 at 10:55 +0200, Johannes Schindelin wrote: > +   if (!stat(rebase_path_rewritten_list(), ) && > +   st.st_size > 0) { > +   struct child_process child = CHILD_PROCESS_INIT; > + > +   child.in =

Re: [PATCH v13 14/14] builtin/am: use apply API in run_apply()

On Thu, Sep 1, 2016 at 12:33 AM, Stefan Beller wrote: > On Sat, Aug 27, 2016 at 11:45 AM, Christian Couder > wrote: >> + >> + if (opts_left != 0) >> + die("unknown option passed thru to git apply"); > > Through and thru are

Re: [PATCH v13 00/14] libify apply and use lib in am, part 3

On Thu, Sep 1, 2016 at 12:15 AM, Junio C Hamano wrote: > Christian Couder writes: > >> On Mon, Aug 29, 2016 at 9:04 PM, Junio C Hamano wrote: >>> Christian Couder writes: >>> Highlevel view of

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

Hi Sverre, On Wed, 31 Aug 2016, Sverre Rabbelier wrote: > On Wed, Aug 31, 2016 at 3:36 AM Johannes Schindelin > wrote: > > On Tue, 30 Aug 2016, Junio C Hamano wrote: > > > Jeff King writes: > > > > Hmm, interesting. Your approach seems reasonable, but

Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

Hi Kuba, On Wed, 31 Aug 2016, Jakub Narębski wrote: > W dniu 29.08.2016 o 10:05, Johannes Schindelin pisze: > > > The `git-rebase-todo` file contains a list of commands. Most of those > > commands have the form > > > > > > > > The is displayed primarily for the user's convenience, as

Re: [PATCH 09/22] sequencer: completely revamp the "todo" script parsing

Hi Kuba and Stefan, On Wed, 31 Aug 2016, Stefan Beller wrote: > On Wed, Aug 31, 2016 at 10:29 AM, Jakub Narębski wrote: > > > > > BTW. perhaps we would be able to continue with 'git continue', regardless > > of what we have started with, I wonder... > > > > git continue as a

Re: [PATCH 10/22] sequencer: avoid completely different messages for different actions

Hi Kuba, On Wed, 31 Aug 2016, Jakub Narębski wrote: > CC-ed to Jiang Xin, L10N coordinator. > > W dniu 29.08.2016 o 10:05, Johannes Schindelin pisze: > > > Signed-off-by: Johannes Schindelin > > --- > > sequencer.c | 7 ++- > > 1 file changed, 2 insertions(+),

Re: [PATCH 32/34] sequencer (rebase -i): show the progress

On wo, 2016-08-31 at 10:56 +0200, Johannes Schindelin wrote: > The interactive rebase keeps the user informed about its progress. > If the sequencer wants to do the grunt work of the interactive > rebase, it also needs to show that progress. > > Signed-off-by: Johannes Schindelin

Re: [PATCH 27/34] sequencer (rebase -i): differentiate between comments and 'noop'

On wo, 2016-08-31 at 10:56 +0200, Johannes Schindelin wrote: > diff --git a/sequencer.c b/sequencer.c > index 51c2f76..4c902e5 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -763,7 +763,8 @@ enum todo_command { > TODO_SQUASH, > TODO_EXEC, > TODO_NOOP, > -   

Re: [PATCH 07/34] sequencer (rebase -i): add support for the 'fixup' and 'squash' commands

On wo, 2016-08-31 at 10:54 +0200, Johannes Schindelin wrote: > +static int is_fixup(enum todo_command command) > +{ > + return command == TODO_FIXUP || command == TODO_SQUASH; > +} It sounds wrong to have a function named is_fixup return true when the command isn't a fixup but a squash.

Re: [PATCH v13 06/14] apply: make it possible to silently apply

On Thu, Sep 1, 2016 at 12:07 AM, Stefan Beller wrote: >> Printing on stdout, and calls to warning() or error() are not >> taken care of in this patch, as that will be done in following >> patches. > >> - if (state->apply_verbosely) >> + if

Re: [PATCH 08/22] sequencer: remove overzealous assumption

Hi Kuba, On Wed, 31 Aug 2016, Jakub Narębski wrote: > W dniu 31.08.2016 o 20:36, Johannes Schindelin pisze: > > I wonder: would 'git cherry-pick --continue' be able to finish > 'git revert', and vice versa, then? Or 'git sequencer --continue'? I just tested this, via diff --git

Re: [PATCH 11/22] sequencer: get rid of the subcommand field

Hi Kuba, On Wed, 31 Aug 2016, Jakub Narębski wrote: > W dniu 29.08.2016 o 10:05, Johannes Schindelin pisze: > > > While at it, ensure that the subcommands return an error code so that > > they do not have to die() all over the place (bad practice for library > > functions...). > > This perhaps

Re: [PATCH 08/22] sequencer: remove overzealous assumption

Hi Junio, On Wed, 31 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > So if you must have a patch that disagrees with this overzealous > > check, the "revamp todo parsing" one is probably the first. But it is > > better to think of this at a

Re: [PATCH v13 02/14] apply: rename and move opt constants to apply.h

On Wed, Aug 31, 2016 at 11:46 PM, Stefan Beller wrote: > On Sat, Aug 27, 2016 at 11:45 AM, Christian Couder > wrote: >> extern int check_apply_state(struct apply_state *state, int force_apply); >> > > With greater scope comes greater

Re: [PATCH 21/22] sequencer: left-trim the lines read from the script

Hello Johannes, W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: Subject: [PATCH 21/22] sequencer: left-trim the lines read from the script In the subject, it should probably be without "the", as "lines" are plural. s/left-trim the lines/left-trim lines/ > Interactive rebase's scripts

Re: [PATCH 06/34] sequencer (rebase -i): write the 'done' file

Hi Dennis, On Wed, 31 Aug 2016, Dennis Kaarsemaker wrote: > On wo, 2016-08-31 at 10:54 +0200, Johannes Schindelin wrote: > > In the interactive rebase, commands that were successfully processed are > > not simply discarded, but appended to the 'done' file instead. This is > > used e.g. to

Re: [PATCH 19/22] sequencer: support cleaning up commit messages

Hello Johannes, W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: > The sequencer_commit() function already knows how to amend commits, and > with this new option, it can also clean up commit messages (i.e. strip > out commented lines). This is needed to implement rebase -i's 'fixup' > and

Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

Hi Junio, On Wed, 31 Aug 2016, Junio C Hamano wrote: > Jakub Narębski writes: > > >> diff --git a/sequencer.c b/sequencer.c > >> index 06759d4..3398774 100644 > >> --- a/sequencer.c > >> +++ b/sequencer.c > >> @@ -709,6 +709,8 @@ static int read_and_refresh_cache(struct

Re: [PATCH 22/22] sequencer: refactor write_message()

Hello Johannes, W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: > The write_message() function safely writes an strbuf to a file. > Sometimes this is inconvenient, though: the text to be written may not > be stored in a strbuf, or the strbuf should not be released after > writing. By

Re: Feature Request: Branch-Aware Submodules

Since I don’t want to change any history in the subproject, to me the most expected behavior would be: git submodule update —-recursive with submodule.*.update set to the command: ``` #!/bin/bash branches=`git branch --points-at "$1"` if [ ! $branches ] ; then git checkout "$1" echo

Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

Jakub Narębski writes: > I wonder how probable is situation where we save instruction sheet > for interactive rebase, with shortened SHA-1, and during rebase > shortened SHA-1 stops being unambiguous... It is my understanding that the shortened ones are only for end-user

Re: [PATCH 19/22] sequencer: support cleaning up commit messages

Hello Johannes, W dniu 01.09.2016 o 15:56, Johannes Schindelin pisze: > On Thu, 1 Sep 2016, Jakub Narębski wrote: >> It's a pity that emulation of named parameters in C requires >> relying on designated inits from C99 >> >> typedef struct { >> double pressure, moles, temp; >> }

bitmap creation failed

Hi Git Experts, We have been exploring various ways to improve git cloning time, one among them is using bitmap which is suppose to save time "counting objects". but i have problem creating bitmap since the repository contains 100's of pack files. the bitmap file is not created when i use "git

Re: [PATCH 16/22] sequencer: prepare for rebase -i's GPG settings

Hello Johannes, W dniu 01.09.2016 o 15:33, Johannes Schindelin pisze: > On Wed, 31 Aug 2016, Jakub Narębski wrote: >> W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: >>> @@ -471,17 +487,20 @@ int sequencer_commit(const char *defmsg, struct >>> replay_opts *opts, >>> >>> if

Re: bitmap creation failed

On Thu, Sep 01, 2016 at 11:16:49AM -0700, gjarms wrote: > Hi Git Experts, > > We have been exploring various ways to improve git cloning time, one among > them is using bitmap which is suppose to save time "counting objects". but > i have problem creating bitmap since the repository contains

Re: [PATCH 21/22] sequencer: left-trim the lines read from the script

Hello Johannes, W dniu 01.09.2016 o 16:13, Johannes Schindelin pisze: > On Thu, 1 Sep 2016, Jakub Narębski wrote: >> 'bol' is beginning-of-line, isn't it (a complement to eol)? > > Yep. How did you guess? :-) Wouldn't 'beg' and 'end' instead of 'bol' and 'eol' be easier to understand, thus

Re: Should "git symbolic-ref -d HEAD" be forbidden?

On Thu, Sep 01, 2016 at 03:31:28PM -0700, Junio C Hamano wrote: > -- >8 -- > Subject: symbolic-ref -d: do not allow removal of HEAD > > If you delete the symbolic-ref HEAD from a repository, Git no longer > considers it valid, and even "git symbolic-ref HEAD refs/heads/master" > would not be

Re: bitmap creation failed

On Thu, Sep 1, 2016 at 11:16 AM, gjarms wrote: > Hi Git Experts, > > We have been exploring various ways to improve git cloning time, one among > them is using bitmap which is suppose to save time "counting objects". but > i have problem creating bitmap since the repository

Re: [PATCH 22/22] sequencer: refactor write_message()

Hello Johannes, W dniu 01.09.2016 o 16:20, Johannes Schindelin pisze: > On Thu, 1 Sep 2016, Jakub Narębski wrote: >> W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: >>> if (commit_lock_file(_file) < 0) >>> return error(_("Error wrapping up %s."), filename); >> >> Another

Re: [PATCH 00/34] Teach the sequencer to act as rebase -i's backend

Hi Dennis, On Wed, 31 Aug 2016, Dennis Kaarsemaker wrote: > On wo, 2016-08-31 at 10:53 +0200, Johannes Schindelin wrote: > > This marks the count down to '3': two more patch series after this > > (really tiny ones) and we have a faster rebase -i. > > I got to 16/34 (and skipped 07/34), will

Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

Hi Junio, On Wed, 31 Aug 2016, Junio C Hamano wrote: > Jakub Narębski writes: > > @@ -709,6 +709,8 @@ static int read_and_refresh_cache(struct replay_opts > *opts) > struct todo_item { > enum todo_command command; > struct commit

Re: [PATCH 15/34] sequencer (rebase -i): leave a patch upon error

Hi Dennis, On Wed, 31 Aug 2016, Dennis Kaarsemaker wrote: > On wo, 2016-08-31 at 10:55 +0200, Johannes Schindelin wrote: > > Just like the interactive rebase, we want to leave a 'patch' file for > > further inspection by the user (even if we never tried to actually apply > > that patch, since

Re: [PATCH 16/22] sequencer: prepare for rebase -i's GPG settings

Hi Kuba, On Wed, 31 Aug 2016, Jakub Narębski wrote: > Note that if the last line was > > + sequencer_entrust(opts, strbuf_detach(, > NULL)); > > we can make it not leak. A bit tricksy, though. Heh... I made it that tricksy, then. Ciao, Dscho

Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

Hi Kuba & Junio, On Wed, 31 Aug 2016, Jakub Narębski wrote: > W dniu 31.08.2016 o 21:10, Junio C Hamano pisze: > > Jakub Narębski writes: > > > >>> diff --git a/sequencer.c b/sequencer.c > >>> index 06759d4..3398774 100644 > >>> --- a/sequencer.c > >>> +++ b/sequencer.c > >>>

Re: [PATCH 16/22] sequencer: prepare for rebase -i's GPG settings

Hi Kuba, On Wed, 31 Aug 2016, Jakub Narębski wrote: > W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: > > > The rebase command sports a `--gpg-sign` option that is heeded by the > > interactive rebase. > > Should it be "sports" or "supports"? Funny. I got a PR last week that wanted to

Re: [PATCH 17/22] sequencer: allow editing the commit message on a case-by-case basis

Hi Kuba, On Wed, 31 Aug 2016, Jakub Narębski wrote: > W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: > > > In the upcoming commits, we will implement more and more of rebase > > -i's functionality. One particular feature of the commands to come is > > that some of them allow editing the

Re: [PATCH 16/22] sequencer: prepare for rebase -i's GPG settings

Hi Junio, On Wed, 31 Aug 2016, Junio C Hamano wrote: > Jakub Narębski writes: > > >> + else { > >> + opts->gpg_sign = buf.buf + 2; > >> + strbuf_detach(, NULL); > > > > Wouldn't we leak 2 characters that got

Re: [PATCH 18/22] sequencer: support amending commits

Hi Kuba, On Wed, 31 Aug 2016, Jakub Narębski wrote: > W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: > > > diff --git a/sequencer.c b/sequencer.c > > index 7e17d14..20f7590 100644 > > --- a/sequencer.c > > +++ b/sequencer.c > > @@ -478,7 +478,7 @@ static char **read_author_script(void) >

Re: [PATCH 19/22] sequencer: support cleaning up commit messages

Hi Kuba, On Thu, 1 Sep 2016, Jakub Narębski wrote: > W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: > > > @@ -781,7 +785,7 @@ static int do_pick_commit(enum todo_command command, > > struct commit *commit, > > } > > if (!opts->no_commit) > > res =

Re: Notation for current branch?

> Jacob Keller writes: > "git symbolic-ref" seems like the right thing if you need to obtain > the current branch name, and there's no reason to not just use HEAD > there. Really? Any reason why `git rev-parse --abbrev-ref '@{-1}'` works, but not `git symbolic-ref

Re: git submodules implementation question

Yes, this one line fix addresses my problem. So, what is the next step? Will someone submit a patch or should I? Please note that I've never submitted a patch before, but I don't mind learning how to. Thanks, Uma > --- a/submodule.c > +++ b/submodule.c > @@ -1160,4 +1160,5 @@ void

`make profile-install` fails in 2.9.3

Hello, I'm trying to `profile-install` Git from source on Ubuntu 16.04, to have the latest stable Git optimized for my machine. However, this fails (and has failed in previous versions), because it runs the whole test-suite to get the profile, but bails out if there were test failures (which

Re: [PATCH 27/34] sequencer (rebase -i): differentiate between comments and 'noop'

On do, 2016-09-01 at 17:32 +0200, Johannes Schindelin wrote: > Hi Dennis, > > On Thu, 1 Sep 2016, Dennis Kaarsemaker wrote: > > > > > On wo, 2016-08-31 at 10:56 +0200, Johannes Schindelin wrote: > > > > > > diff --git a/sequencer.c b/sequencer.c > > > index 51c2f76..4c902e5 100644 > > > ---

Re: [PATCH 21/22] sequencer: left-trim the lines read from the script

Hi Kuba, On Thu, 1 Sep 2016, Jakub Narębski wrote: > W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: > > Subject: [PATCH 21/22] sequencer: left-trim the lines read from the script > > In the subject, it should probably be without "the", as "lines" > are plural. > > s/left-trim the

Re: [PATCH 22/22] sequencer: refactor write_message()

Hi Kuba, On Thu, 1 Sep 2016, Jakub Narębski wrote: > W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: > > > The write_message() function safely writes an strbuf to a file. > > Sometimes this is inconvenient, though: the text to be written may not > > be stored in a strbuf, or the strbuf

Re: implement a stable 'Last updated' in Documentation

Hey, asciidoc made a move, so this patch is good to go: https://github.com/asciidoc/asciidoc/pull/9 Thanks. Olaf On Tue, Feb 10, Jeff King wrote: > On Tue, Feb 10, 2015 at 04:17:47PM +0100, Olaf Hering wrote: > > > On Fri, Jan 30, Jeff King wrote: > > > > > I have 8.6.9-3 installed (it is

Re: [PATCH 20/34] sequencer (rebase -i): copy commit notes at end

Hi Dennis, On Thu, 1 Sep 2016, Dennis Kaarsemaker wrote: > On wo, 2016-08-31 at 10:55 +0200, Johannes Schindelin wrote: > > +   if (!stat(rebase_path_rewritten_list(), ) && > > +   st.st_size > 0) { > > +   struct child_process child =

Re: [PATCH 07/34] sequencer (rebase -i): add support for the 'fixup' and 'squash' commands

On do, 2016-09-01 at 17:17 +0200, Johannes Schindelin wrote: > Hi Dennis, > > On Thu, 1 Sep 2016, Dennis Kaarsemaker wrote: > > > > > On wo, 2016-08-31 at 10:54 +0200, Johannes Schindelin wrote: > > > > > > > > +static int is_fixup(enum todo_command command) > > > +{ > > > + return command ==

Re: `make profile-install` fails in 2.9.3

On do, 2016-09-01 at 18:08 +0200, Jan Keromnes wrote: > However, this fails (and has failed in previous versions), because it > runs the whole test-suite to get the profile, but bails out if there > were test failures (which happens often). Working around failing tests is fixing a symptom, not

Re: [PATCH 07/34] sequencer (rebase -i): add support for the 'fixup' and 'squash' commands

Hi Dennis, On Thu, 1 Sep 2016, Dennis Kaarsemaker wrote: > On wo, 2016-08-31 at 10:54 +0200, Johannes Schindelin wrote: > > > +static int is_fixup(enum todo_command command) > > +{ > > + return command == TODO_FIXUP || command == TODO_SQUASH; > > +} > > It sounds wrong to have a function

format-patch base-commit: moving to above the patch?

Currently, format-patch puts base-commit and prerequisite-patch-id information below the patch, and below the email signature. Most mail clients automatically trim everything below the signature marker as unimportant when quoting a mail for a reply, which would make it difficult for someone to

Re: [PATCH 27/34] sequencer (rebase -i): differentiate between comments and 'noop'

Hi Dennis, On Thu, 1 Sep 2016, Dennis Kaarsemaker wrote: > On wo, 2016-08-31 at 10:56 +0200, Johannes Schindelin wrote: > > diff --git a/sequencer.c b/sequencer.c > > index 51c2f76..4c902e5 100644 > > --- a/sequencer.c > > +++ b/sequencer.c > > @@ -763,7 +763,8 @@ enum todo_command { > >

Re: [PATCH 32/34] sequencer (rebase -i): show the progress

Hi Dennis, On Thu, 1 Sep 2016, Dennis Kaarsemaker wrote: > On wo, 2016-08-31 at 10:56 +0200, Johannes Schindelin wrote: > > The interactive rebase keeps the user informed about its progress. > > If the sequencer wants to do the grunt work of the interactive > > rebase, it also needs to show that