On Tue, Nov 6, 2018 at 4:41 AM Junio C Hamano wrote:
> > static int fsck_error_func(struct fsck_options *o,
> > struct object *obj, int type, const char *message)
> > {
> > - objreport(obj, (type == FSCK_WARN) ? "warning" : "error", message);
> > - return (type == FSCK_WARN) ? 0 :
Signed-off-by: Nguyễn Thái Ngọc Duy
---
ref-filter.c | 2 +-
wt-status.c | 18 ++
wt-status.h | 4 +++-
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 0c45ed9d94..c4eaf30313 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -14
While at there, since we have access to struct repository now,
eliminate the only the_repository reference in this file.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
list-objects-filter.c | 10 +++---
list-objects-filter.h | 2 ++
list-objects.c| 9 ++---
3 files changed, 15 inserti
Signed-off-by: Nguyễn Thái Ngọc Duy
---
blame.c | 39 ++-
1 file changed, 22 insertions(+), 17 deletions(-)
diff --git a/blame.c b/blame.c
index d84c937780..43861437f7 100644
--- a/blame.c
+++ b/blame.c
@@ -116,35 +116,38 @@ static void verify_working_tree_pat
Signed-off-by: Nguyễn Thái Ngọc Duy
---
combine-diff.c | 2 +-
diff.c | 12 ++--
diff.h | 2 +-
diffcore-pickaxe.c | 4 ++--
grep.c | 2 +-
notes-cache.c | 12 +++-
notes-cache.h | 6 --
userdiff.c | 5 +++--
user
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/commit.c | 3 ++-
builtin/merge-ours.c | 2 +-
diff-lib.c | 7 ---
diff.h | 3 ++-
sequencer.c | 4 ++--
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
ind
note, there's still another hidden dependency related to this: even
though we pass a repo to transport_push() we still use
is_bare_repository() which pretty much assumes the_repository (and
some other global state).
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/push.c | 3 ++-
transport.c|
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/bundle.c | 7 ---
bundle.c | 26 ++
bundle.h | 9 +
transport.c | 2 +-
4 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/builtin/bundle.c b/builtin/bundle.c
index d0de59b94f
Signed-off-by: Nguyễn Thái Ngọc Duy
---
bisect.c | 48 +++-
bisect.h | 5 -
builtin/bisect--helper.c | 2 +-
3 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/bisect.c b/bisect.c
index 487675c672..4c1b80bff6
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/commit.c | 2 +-
builtin/pull.c | 3 +-
builtin/rebase.c | 7 +++--
sequencer.c | 8 ++---
wt-status.c | 76 +++-
wt-status.h | 17 +++
6 files changed, 66 insertions(+), 47 de
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/pack-objects.c | 2 +-
pack-bitmap-write.c| 6 +++---
pack-bitmap.c | 13 +++--
pack-bitmap.h | 3 ++-
pack-objects.c | 6 --
pack-objects.h | 5 -
6 files changed, 21 insertions(+), 14 dele
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/fsck.c | 3 ++-
pack-check.c | 9 +
pack.h | 4 +++-
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 06eb421720..8ea2823864 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -
Note that the_hash_algo stays, even if we can easily replace it with
repo->hash_algo. My reason is I still believe tying hash_algo to a
struct repository is a wrong move. But if I'm wrong, we can always go
for another round of conversion.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/rebase--i
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/notes.c | 2 +-
notes-merge.c | 12 +++-
notes-merge.h | 5 -
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/builtin/notes.c b/builtin/notes.c
index c05cd004ab..15a6c78855 100644
--- a/builtin/notes.c
+++ b/builtin
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/am.c | 2 +-
builtin/rebase--interactive.c | 2 +-
builtin/rebase.c | 4 ++--
builtin/rerere.c | 10 ++
rerere.c | 26 +-
rerere.h
Signed-off-by: Nguyễn Thái Ngọc Duy
---
branch.c | 21 +++--
branch.h | 8 ++--
builtin/am.c | 2 +-
builtin/branch.c | 6 --
builtin/checkout.c | 5 +++--
builtin/reset.c| 2 +-
builtin/revert.c | 2 +-
7 files changed, 27 insertion
(Please ignore v1 which contains unrelated patches)
I lied about part 5 being final. This series contains most of my WIP
series [2] except sha1-name.c, read-cache.c and merge-recursive.c
because there will be conflicts on 'pu' so they will be in part 6. At
least this only results in two small conf
Signed-off-by: Nguyễn Thái Ngọc Duy
---
notes-merge.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/notes-merge.c b/notes-merge.c
index 0c22f09b28..72688d301b 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -558,7 +558,7 @@ int notes_merge(struct notes_merge_options *o
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/pack-objects.c | 4 ++--
delta-islands.c| 24 ++--
delta-islands.h| 9 ++---
3 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index c99ee79c31.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
list-objects.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/list-objects.c b/list-objects.c
index 0cfd646026..cf7f25bed3 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -123,7 +123,7 @@ static void process_tree_contents(struct
Signed-off-by: Nguyễn Thái Ngọc Duy
---
line-log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/line-log.c b/line-log.c
index d1d429d738..24e21731c4 100644
--- a/line-log.c
+++ b/line-log.c
@@ -479,7 +479,7 @@ static struct commit *check_single_commit(struct rev_info
*revs
This case is more interesting than other boring "remove the_repo"
commits because while we need access to the object database, we cannot
simply use r->index because unpack-trees.c can operate on a temporary
index, not $GIT_DIR/index. Ideally we should be able to pass an object
database to lookup_tr
Since we're going to pass 'struct repository *' around most of the
time instead of 'struct index_state *' because most sequencer.c
operations need more than just the index, the_repository is replaced
as well in the functions that now take 'struct repository
*'. the_repository is still present in th
While at there add a forward declaration for struct strbuf.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/rebase--interactive.c | 2 +-
rebase-interactive.c | 6 +++---
rebase-interactive.h | 5 -
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/builtin/reba
One string "nothing to delete?" is rephrased to be more helpful.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/reflog.c | 34 +++---
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index b5941c1ff3..5a74ccf7ab 1006
On Tue, Nov 6, 2018 at 3:07 PM Ramsay Jones wrote:
> Also, this patch does not replace opterror() calls outside of
> the 'parse-options.c' file with optname(). This tickles my
> static-check.pl script, since optname() is an external function
> which is only called from 'parse-options.c'.
>
> So, a
Commit 43662b23ab (format-patch: keep cover-letter diffstat wrapped in
72 columns - 2018-01-24) uncondtionally sets stat width to 72 when
generating diffstat for the cover letter, ignoring --stat from command
line. But it should only do so when stat width is still default
(i.e. stat_width == 0).
I
While at there, since we have access to struct repository now,
eliminate the only the_repository reference in this file.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
list-objects-filter.c | 10 +++---
list-objects-filter.h | 2 ++
list-objects.c| 9 ++---
3 files changed, 15 inserti
I lied about part 5 being final. This series contains most of my WIP
series [2] except sha1-name.c, read-cache.c and merge-recursive.c
because there will be conflicts on 'pu' so they will be in part 6. At
least this only results in two small conflicts in sequencer.c.
I did start pushing the_reposi
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/commit.c | 2 +-
builtin/pull.c | 3 +-
builtin/rebase.c | 7 +++--
sequencer.c | 8 ++---
wt-status.c | 76 +++-
wt-status.h | 17 +++
6 files changed, 66 insertions(+), 47 de
These two strings are clearly not for the user to see. Reduce the
violence in one string while at there.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
parse-options.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parse-options.c b/parse-options.c
index 0bf817193d..3f5f985c1e
Signed-off-by: Nguyễn Thái Ngọc Duy
---
ref-filter.c | 2 +-
wt-status.c | 18 ++
wt-status.h | 4 +++-
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 0c45ed9d94..c4eaf30313 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -14
Two strings are slightly updated to be consistent with the rest: die()
starts with lowercase.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/repack.c | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/builtin/repack.c b/builtin/repack.c
index c6a794
These messages will be marked for translation later. Reduce word legos
and give translators almost full phrases. describe_object() is updated
so that it can be called from printf() twice.
While at there, remove \n from the strings to reduce a bit of work
from translators.
Signed-off-by: Nguyễn Th
The two strings are slightly modified to be consistent with the rest:
die() and error() start with a lowercase.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
remote.c | 43 ++-
1 file changed, 22 insertions(+), 21 deletions(-)
diff --git a/remote.c b/remote.c
i
Introduce optname() that does the early half of original opterror() to
come up with the name of the option reported back to the user, and use
it to kill opterror(). The callers of opterror() now directly call
error() using the string returned by opterror() instead.
There are a few issues with opt
Signed-off-by: Nguyễn Thái Ngọc Duy
---
read-cache.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index d57958233e..0c37f4885e 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -316,7 +316,7 @@ static int ce_match_stat_basic(const struct cach
The first error, "internal error", is clearly a BUG(). The second two
are meant to catch calls with invalid parameters and should never
happen outside the test suite.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
remote.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/remote
One string is slightly updated to keep consistency with the rest:
die() should begin with lowercase.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
git.c | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/git.c b/git.c
index adac132956..5fd30da093 10064
One error is updated to start with lowercase to be consistent with the
rest.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
parse-options.c | 14 +++---
t/t0040-parse-options.sh | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/parse-options.c b/parse-options.c
typechange_fmt and added_fmt should have a colon before "needs
update". Align the statements to make it easier to read and see. Also
drop the unnecessary ().
Signed-off-by: Nguyễn Thái Ngọc Duy
---
read-cache.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/read-c
Signed-off-by: Nguyễn Thái Ngọc Duy
---
attr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/attr.c b/attr.c
index 60d284796d..3770bc1a11 100644
--- a/attr.c
+++ b/attr.c
@@ -372,8 +372,8 @@ static struct match_attr *parse_attr_line(const char *line,
const char *src,
There are a couple other improvements on these strings as well:
- add missing colon (as separator)
- quote paths
- provide more information on error messages
- keep first word in lowercase
Signed-off-by: Nguyễn Thái Ngọc Duy
---
read-cache.c| 57 +
This function can be part of translated messages. To make sure we
don't have a sentence with mixed languages, mark the strings for
translation, but only use translated strings in places we know we will
output translated strings.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
alias.c | 4 ++--
b
Two messages also print extra information to be more useful
Signed-off-by: Nguyễn Thái Ngọc Duy
---
archive.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/archive.c b/archive.c
index 9d16b7fadf..d8f6e1ce30 100644
--- a/archive.c
+++ b/archive.c
@@ -385,12 +385,12 @
v3 is just small touchups here and there after the review comments
from v2.
Range-diff against v2:
1: e77c203313 ! 1: 936f84d4b3 git.c: mark more strings for translation
@@ -3,7 +3,7 @@
git.c: mark more strings for translation
One string is slightly updated to keep
Two die() are updated to start with lowercase to be consistent with
the rest.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/fsck.c | 106 -
t/t1410-reflog.sh | 6 +--
t/t1450-fsck.sh| 50 -
t/t6050-replace.
I have a deal for you, in your region.
From: SZEDER Gábor
Teach `make coccicheck` to avoid patches named "*.pending.cocci" and
handle them separately in a new `make coccicheck-pending` instead.
This means that we can separate "critical" patches from "FYI" patches.
The former target can continue causing Travis to fail its static
analys
--
Groet, groet aan jou,
GELD BESCHIKBAAR VOOR LENING. Krijg het geld / de lening die u nodig
hebt bij Funding Trusts Finance. Wij zijn particuliere
kredietverstrekkers / investeerders en bieden zowel persoonlijke
leningen, startleningen, educatieve / agrarische leningen, onroerend
goed /
On Thu, Nov 8, 2018 at 9:18 PM Junio C Hamano wrote:
>
> Stefan Beller writes:
>
> > From: SZEDER Gábor
> >
> > Add a description and place on how to use coccinelle for large refactorings
> > that happen only once.
> >
> > Based-on-work-by: SZEDER Gábor
> > Signed-off-by: Stefan Beller
> > ---
Dear friend,
I am Abel Brent, a NATO soldier serving in Afghanistan. I and my
Comrades, we are seeking your assistance to help us
receive/invest our funds in your country in any lucrative
business. Please if this proposal is acceptable by you, kindly
respond back to me for more details.
Thank
p3400 makes a copy of the current repository to test git-rebase
performance, and creates new branches in the copy with `git checkout
-b'. If the original repository has branches with the same name as the
script is trying to create, this operation will fail.
This replaces these calls by `git check
On Thu, Nov 8, 2018 at 8:56 PM Martin Ågren wrote:
> I haven't followed the original discussion too carefully, so I'll read
> this like someone new to the topic probably would.
Thanks!
> A nit, perhaps, but I was genuinely confused at first. The subject is
> "Makefile: add pending semantic patch
On Fri, Nov 09, 2018 at 06:21:41PM +0100, Johannes Schindelin wrote:
> Actually, you got me thinking about the desc.buffer. And I think there is
> one corner case where it could cause a problem: `struct tree_desc desc[2]`
> does not initialize the buffers to NULL. And what if
> fill_tree_descripto
On Fri, Nov 9, 2018 at 9:46 AM wrote:
> When printing variables which contains a size, today "unsigned long"
> is used at many places.
> In order to be able to change the type from "unsigned long" into size_t
> some day the future, we need to have a way to print 64 bit variables
s/day/& in/
> on
From: Torsten Bögershausen
When setting
DEVELOPER = 1
DEVOPTS = extra-all
"gcc (Raspbian 6.3.0-18+rpi1+deb9u1) 6.3.0 20170516" errors out with
"comparison is always false due to limited range of data type"
"[-Werror=type-limits]"
It turns out that the function xcurl_off_t() has 2 flavours:
- I
Hi Peff,
On Fri, 9 Nov 2018, Jeff King wrote:
> On Fri, Nov 09, 2018 at 01:34:19AM -0800, Johannes Schindelin via
> GitGitGadget wrote:
>
> > From: Johannes Schindelin
> >
> > When we converted a `git checkout -q $onto^0` call to use
> > `reset_head()`, we inadvertently incurred a change from
Hi Peff,
On Fri, 9 Nov 2018, Jeff King wrote:
> On Fri, Nov 09, 2018 at 01:34:17AM -0800, Johannes Schindelin via
> GitGitGadget wrote:
>
> > diff --git a/builtin/rebase.c b/builtin/rebase.c
> > index 0ee06aa363..6f6d7de156 100644
> > --- a/builtin/rebase.c
> > +++ b/builtin/rebase.c
> > @@ -56
Hi Ævar,
On Fri, 9 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> Addresses feedback on v3, especially Eric's suggestion to split out
> the behavior change (which I was not aware of) into a 3/3.
For the record, I am fine with this iteration, too.
Ciao,
Dscho
On Fri, Nov 9, 2018 at 11:19 AM Jeff King wrote:
> > The form `/abc/def` would not be confused with anything
> > that it is not, I would think. The only thing against this form (at least
> > that I can think of) is that some people use this way to talk about paths
> > that vary between different s
On Fri, Nov 9, 2018 at 2:46 PM Ævar Arnfjörð Bjarmason wrote:
> I'm planning to re-submit mine with some minor changes after the great
> Documentation/config* move lands.
>
> As noted in
> https://public-inbox.org/git/87bm7clf4o@evledraar.gmail.com/ and
> https://public-inbox.org/git/87h8gq5zm
From: Torsten Bögershausen
When printing variables which contains a size, today "unsigned long"
is used at many places.
In order to be able to change the type from "unsigned long" into size_t
some day the future, we need to have a way to print 64 bit variables
on a system that has "unsigned long"
On Wed, Nov 07 2018, Geert Jansen wrote:
> On Mon, Oct 29, 2018 at 07:27:39PM -0400, Jeff King wrote:
>
>> On Mon, Oct 29, 2018 at 08:36:07PM +0100, Ævar Arnfjörð Bjarmason wrote:
>> > * Re-roll my 4 patch series to include the patch you have in
>> ><20181027093300.ga23...@sigill.intra.peff
On Friday, November 9, 2018 3:18:03 AM MST Ævar Arnfjörð Bjarmason wrote:
>
> But we should behave consistently with "diff" in anticipation of such
> output being useful in the future, because it would make for confusing
> UI if two "diff" and "range-diff" behaved differently when it came to
's/
Hi,
On Tue, 2 Oct 2018, Ævar Arnfjörð Bjarmason wrote:
> On Tue, Oct 02 2018, Taylor Blau wrote:
>
> > Hi Stefan,
> >
> > On Sat, Sep 29, 2018 at 04:00:04PM -0700, Stefan Xenos wrote:
> >> Hello, List!
> >>
> >> I'm interested in porting something like Mercurial's evolve command to
> >> Git.
> >
Hi Jeff,
On Wed, 26 Sep 2018, Jeffrey Walton wrote:
> Several weeks ago I updated to the latest Git for Windows (when
> prompted by the version check). At the time I noticed:
>
> $ git commit -S -am "Fix unset MAKE variable in test scripts"
> gpg: signing failed: No pinentry
> gpg: signing faile
Hi Paul,
On Wed, 26 Sep 2018, Paul-Sebastian Ungureanu wrote:
> Sorry for the late reply. I had a lot on my plate for the last couple of
> weeks.
I understand. University can be busy times.
> > > +
> > > + git_config(git_diff_basic_config, NULL);
> >
> > Is this not called in as part of `git_c
Hi Paul,
On Wed, 26 Sep 2018, Paul-Sebastian Ungureanu wrote:
> Hi,
>
> > > @@ -1443,9 +1448,10 @@ static int push_stash(int argc, const char
> > > **argv, const char *prefix)
> > > OPT_END()
> > >};
> > > - argc = parse_options(argc, argv, prefix, options,
> > > -
Hi,
On Fri, 9 Nov 2018, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
> >> > I'm not sure about the last paragraph, because:
> >> >
> >> > - It talks about presumed benefits for a currently still
> >> > work-in-progress patch series of an other contributor, and I'm not
> >> > really
Hi Phillip,
On Thu, 8 Nov 2018, Phillip Wood wrote:
> On 07/11/2018 09:41, Junio C Hamano wrote:
> > Here are the topics that have been cooking. Commits prefixed with
> > '-' are only in 'pu' (proposed updates) while commits prefixed with
> > '+' are in 'next'. The ones marked with '.' do not a
I noticed that there were a couple of duplicate entries in git shortlog -nse
v2.19.1.., and then continued a bit to remove the duplicate entries even for
v2.10.0..
Changes relative to v1:
* Fixed the commit message (it talked about the opposite commit range than
intended).
* Added a formerly
From: Johannes Schindelin
This patch makes the output of `git shortlog -nse v2.10.0..master`
duplicate-free.
Signed-off-by: Johannes Schindelin
---
.mailmap | 13 +
1 file changed, 13 insertions(+)
diff --git a/.mailmap b/.mailmap
index bef3352b0d..eb7b5fc7b9 100644
--- a/.mailmap
Hi Junio,
On Fri, 9 Nov 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > This patch makes the output of `git shortlog -nse v2.10.0`
> > duplicate-free.
>
> Did you mean "v2.10.0..master" or did you really mean this covers
>
Dear friend,
I am very gald and happy that you answerred this message very fast, My
name is Veronica Ali. a France Nationality, I am a widow, currently
hospitalized due to cancer illness . Meanwhile, I have decided to
donate my fund to you as a reliable individual that will use this
money wisely,
On Fri, Nov 09, 2018 at 10:44:10AM +, Luca Milanesio wrote:
> > On 9 Nov 2018, at 10:42, Jeff King wrote:
> >
> > Git Merge 2019 is happening on February 1st. There will be a
> > Contributor's Summit the day before. Here are the details:
> >
> > When: Thursday, January 31, 2019. 10am-5pm.
> On 9 Nov 2018, at 10:42, Jeff King wrote:
>
> Git Merge 2019 is happening on February 1st. There will be a
> Contributor's Summit the day before. Here are the details:
>
> When: Thursday, January 31, 2019. 10am-5pm.
> Where: The Egg[1], Brussels, Belgium
> What: Round-table discussion ab
Git Merge 2019 is happening on February 1st. There will be a
Contributor's Summit the day before. Here are the details:
When: Thursday, January 31, 2019. 10am-5pm.
Where: The Egg[1], Brussels, Belgium
What: Round-table discussion about Git
Who: All contributors to Git or related projects i
On Fri, Nov 09, 2018 at 02:05:48AM +, Joseph Moisan wrote:
> Can someone please tell me how to unsubscribe from this email. I am
> no longer interested in receiving these emails, and cannot find how to
> unsubscribe.
Details are at http://vger.kernel.org/vger-lists.html#git.
-Peff
On Thu, Nov 08, 2018 at 04:45:16PM +0100, Johannes Schindelin wrote:
> > One thing I had in mind when proposing $VARIABLE is that it opens up a
> > namespace for us to expand more things (*) for example $GIT_DIR (from
> > ~/.gitconfig).
> >
> > (*) but in a controlled way, it may look like an env
Addresses feedback on v3, especially Eric's suggestion to split out
the behavior change (which I was not aware of) into a 3/3. Diff with
v3:
1: 23295d7806 ! 1: 5399e57513 range-diff doc: add a section about output
stability
@@ -29,11 +29,11 @@
+be machine-readable.
+
+This is
Make the behavior when diff options (e.g. "--stat") are passed
consistent with how "diff" behaves.
Before 73a834e9e2 ("range-diff: relieve callers of low-level
configuration burden", 2018-07-22) running range-diff with "--stat"
would produce stat output and the diff output, as opposed to how
"diff
The range-diff command is already advertised as porcelain, but let's
make it really clear that the output is completely subject to change,
particularly when it comes to diff options such as --stat. Right now
that option doesn't work, but fixing that is the subject of a later
change.
Signed-off-by:
In 73a834e9e2 ("range-diff: relieve callers of low-level configuration
burden", 2018-07-22) we broke passing down options like --no-patch,
--stat etc.
Fix that regression, and add a test asserting the pre-73a834e9e2
behavior for some of these diff options.
As noted in a change leading up to this
On Thu, Nov 08 2018, Ævar Arnfjörð Bjarmason wrote:
> On Thu, Nov 08 2018, Jeff King wrote:
>
>> On Wed, Nov 07, 2018 at 10:55:24PM +, Geert Jansen wrote:
>>
>>> On Mon, Oct 29, 2018 at 07:27:39PM -0400, Jeff King wrote:
>>>
>>> > On Mon, Oct 29, 2018 at 08:36:07PM +0100, Ævar Arnfjörð Bjarm
On Fri, Nov 09, 2018 at 01:34:19AM -0800, Johannes Schindelin via GitGitGadget
wrote:
> From: Johannes Schindelin
>
> When we converted a `git checkout -q $onto^0` call to use
> `reset_head()`, we inadvertently incurred a change from a twoway_merge
> to a oneway_merge, as if we wanted a `git re
On Fri, Nov 09, 2018 at 01:34:17AM -0800, Johannes Schindelin via GitGitGadget
wrote:
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 0ee06aa363..6f6d7de156 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -569,16 +569,13 @@ static int reset_head(struct object_id *oid, con
In our tests with large repositories, we noticed a serious regression of the
performance of git rebase when using the built-in vs the shell script
version. It boils down to an incorrect conversion of a git checkout -q:
instead of using a twoway_merge as git checkout does, we used a oneway_merge
as
From: Johannes Schindelin
When we converted a `git checkout -q $onto^0` call to use
`reset_head()`, we inadvertently incurred a change from a twoway_merge
to a oneway_merge, as if we wanted a `git reset --hard` instead.
This has performance ramifications under certain, though, as the
oneway_merg
From: Johannes Schindelin
The same clean-up code is repeated quite a few times; Let's DRY up the
code some.
Signed-off-by: Johannes Schindelin
---
builtin/rebase.c | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 0e
This makes the structures todo_list and todo_item, and the functions
todo_list_release() and parse_insn_buffer(), accessible outside of
sequencer.c.
Signed-off-by: Alban Gruin
---
sequencer.c | 67 +
sequencer.h | 49 +++
complete_action() used functions that read the todo-list file, made some
changes to it, and wrote it back to the disk.
The previous commits were dedicated to separate the part that deals with
the file from the actual logic of these functions. Now that this is
done, we can call directly the "logic
This clears the number of items of a todo_list before parsing it to
allow to parse the same list multiple times without issues. As its
items are not dynamically allocated, or don’t need to allocate memory,
no additionnal memory management is required here.
Furthermore, if a line is invalid, the t
edit_todo_list() is changed to work on a todo_list, and to handle the
initial edition of the todo list (ie. making a backup of the todo
list).
It does not check for dropped commits yet, as todo_list_check() does not
take the commits that have already been processed by the rebase (ie. the
todo list
This makes sequencer_make_script() write its script to a strbuf (ie. the
buffer of a todo_list) instead of a FILE. This reduce the amount of
read/write made by rebase interactive.
Signed-off-by: Alban Gruin
---
builtin/rebase--interactive.c | 13 +++-
sequencer.c | 38
This replaces a call to error() by a call to error_errno() after writing
the content of the todo list to the disk in transform_todo_file().
Signed-off-by: Alban Gruin
---
No changes since v2.
sequencer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer
As transform_todo_file() is only needed inside of rebase--interactive.c,
it is moved there from sequencer.c.
Signed-off-by: Alban Gruin
---
builtin/rebase--interactive.c | 20
sequencer.c | 20
sequencer.h | 1 -
3 fi
This refactors skip_unnecessary_picks() to work on a todo_list. The
file-handling logic is completely dropped here, as its only usage is
made by complete_action().
Instead of truncating the todo list’s buffer, the items are moved to
the beginning of the list, eliminating the need to reparse the l
This refactors sequencer_add_exec_commands() to work on a todo_list to
avoid redundant reads and writes to the disk.
Instead of just inserting the `exec' command between the other commands,
and re-parsing the buffer at the end the exec command is appended to the
buffer once, and a new list of item
This refactors check_todo_list() to work on a todo_list to avoid
redundant reads and writes to the disk. The function is renamed
todo_list_check(). The parsing of the two todo lists is left to the
caller.
As rebase -p still need to check the todo list from the disk, a new
function is introduced,
1 - 100 of 107 matches
Mail list logo