On Fri, Sep 02, 2016 at 12:04:54PM +0530, Arumuga wrote:
> So I understand now, the following.
>
> 1. reducing the pack file size will increase the clone time
> 2. Single pack file is expected to better use bitmap feature.
>
> Am i correct ?
Yes, on both.
-Peff
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 100
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 able
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 contains 100's of pack
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(&msg_file) < 0)
>>> return error(_("Error wrapping up %s."), filename);
>>
>> Anothe
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 mo
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;
>> } ideal_str
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 (IS_REBASE
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 gc
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
consumption. The insn s
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,
>>> tho
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
>>> further failures
>>> 3. Fi
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 @@ static int read_and_
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 really is just a more
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 */
>>> -
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 HEAD
>>
>> the se
"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 commit 'J'
The answer then
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 patch
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 right approach.
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
>>> patches.
>>
>>> - if (state->apply
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 writes:
>> > > > Hmm, interesting. Your approach seems reaso
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
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 config.m
>>> 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 p
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 available. Add a config.m
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:
http://public-inbox
> 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 contex
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 yo
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
Wha
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 initialization
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 up a top-level
and submodule, deliberately break submo
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 accompanied with tests to show t
"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)
>>> . \ | /\//
>>> . Z | //
>>> .
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/ bec
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 sub commit --allow-empt
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 cannot even pre-populate the comm
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 to know if "sub" sub
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 exactly what I wanted to see
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 reroll is to be the candidate
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 and
>>> show what breaks and how without
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 use the installed version o
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 change.
>
> Tests are reall
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 long and
>hard about the
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 char *name)
>
> Hm,
[+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
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 sequencer
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<-first parent, --merges (C,F,H)
. \ | /\//
. Z |
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 && n10 != 13)
>> +
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 http://grammar.ccc.commnet.edu/grammar/marks/colon.htm:
>
>
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 th
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 ==
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
> > > --- a/s
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 happ
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 prepare_submod
> 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 '@{-1}'`, or even `git symbolic-
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 {
> >
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 rep
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
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 name
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.st_size > 0) {
> > + struct child_process child
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 par
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 lines/
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 sho
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 = sequencer_commit(opt
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)
>
Hi Junio,
On Wed, 31 Aug 2016, Junio C Hamano wrote:
> Jakub Narębski writes:
>
> >> + else {
> >> + opts->gpg_sign = buf.buf + 2;
> >> + strbuf_detach(&buf, NULL);
> >
> > Wouldn't we leak 2 characters that got skipped? Maybe
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 c
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 fi
Hi Kuba,
On Wed, 31 Aug 2016, Jakub Narębski wrote:
> Note that if the last line was
>
> + sequencer_entrust(opts, strbuf_detach(&buf,
> NULL));
>
> we can make it not leak. A bit tricksy, though.
Heh... I made it that tricksy, then.
Ciao,
Dscho
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 *commit;
> +
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
> >>> @@ -709,6 +709,8 @
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 cont
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 we'
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 "
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 "this
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 may
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 's
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 replay_opts
> >> *opts)
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 display
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
>
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,
> - TODO_DRO
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
> ---
> sequenc
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. Maybe
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 the patches in the series
~~~
This is "par
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 I have to wonder
> > > > if writing the pid
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 and error routines before applying, and let's
>> re
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 higher level than just patches: it
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 responsibility. Nit of the day:
> In case a reroll is necessar
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 a/t/t3
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 (state->apply_verbosity > verb
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
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(+), 5 deletions(-)
> >
> > diff
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 "
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 apply.{c,h}, so that more code can
>> use it.
>>
>> Hel
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 different spellings of the same word.
> Thru is the l
On wo, 2016-08-31 at 10:55 +0200, Johannes Schindelin wrote:
> + if (!stat(rebase_path_rewritten_list(), &st) &&
> + st.st_size > 0) {
> + struct child_process child = CHILD_PROCESS_INIT;
> +
> + child.in = open
96 matches
Mail list logo