RE: .gitignore alleged bug

2019-02-24 Thread Celestino, Federico
Dear Mr Carlson, Yes, you are right. Thanks for the support. Freundliche Grüße / Kind regards i.A. Federico Celestino Entwicklungsingenieur Fon +49 2151 7830 324 Fax +49 2151 7830 499 www.xcmg-erc.com celest...@xcmg-erc.com --

Re: [GSoC] Introduction

2019-02-24 Thread Christian Couder
Hi Rohit, On Sun, Feb 24, 2019 at 11:08 AM Rohit Ashiwal wrote: > If you disregard that contribution, here is my approach to solving > this microproject: search for `test -f` in `t/**` and replace all > occurrences with `test_path_is_file` and similarly for other mentioned > commands. Is it corr

Re: `git status -u no` suppresses modified files too.

2019-02-24 Thread Rusty Russell
Jeff King writes: > On Fri, Feb 08, 2019 at 12:18:57PM +1030, Rusty Russell wrote: > >> This broke my "is this clean?" sanity check and very much violates >> the man page description. > > Wow, this one had me scratching my head for a minute. What you're > describing here: > >> $ git status

Re: [GSoC][PATCH 3/3] clone: use dir-iterator to avoid explicit dir traversal

2019-02-24 Thread Matheus Tavares Bernardino
Hi, Christian and Ævar First of all, thanks for the fast and attentive reviews. I am a little confused about what I should do next. How should I proceed with this series? By what was said, I understood that the series: 1) Is indeed an improvement under --local, because it won't deference symlink

Git for Windows v2.21.0 due Tuesday, was Re: [ANNOUNCE] Git v2.21.0

2019-02-24 Thread Johannes Schindelin
Team, the corresponding Git for Windows v2.21.0 will probably be published on Tuesday, as we are waiting for a Git LFS version that fixes a known regression that is considered critical. In the meantime, feel free to grab the current snapshot (which differs from the final v2.21.0 probably only in

[PATCH 0/1] jt/fetch-cdn-offload: fix build with clang

2019-02-24 Thread Johannes Schindelin via GitGitGadget
I think this is actually legitimate a build error (see e.g. https://dev.azure.com/gitgitgadget/git/_build/results?buildId=2394), and I am quite surprised that GCC accepts this. Note: after thinking about this for a while, I guess an empty string would work, too (i.e. "" instead of " 0"), but I al

[PATCH 1/1] fixup! upload-pack: refactor reading of pack-objects out

2019-02-24 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This fixes an issue pointed out by clang. Signed-off-by: Johannes Schindelin --- upload-pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload-pack.c b/upload-pack.c index 2365b707bc..534e8951a2 100644 --- a/upload-pack.c +++ b/upload-pack.c

Re: [GSoC][PATCH 0/3] clone: convert explicit dir traversal to dir-iterator

2019-02-24 Thread Thomas Gummerer
On 02/24, Matheus Tavares Bernardino wrote: > I am part of a FLOSS group here at USP called FLUSP > (https://flusp.ime.usp.br/), and I plan to write some posts on our > website about what I am learning in the git community so that other > people in the group can have as a base if they decide to sta

Re: [GSoC][PATCH 1/3] dir-iterator: add pedantic option to dir_iterator_begin

2019-02-24 Thread Thomas Gummerer
On 02/24, Matheus Tavares Bernardino wrote: > On Sun, Feb 24, 2019 at 5:35 AM Christian Couder > wrote: > > On Sat, Feb 23, 2019 at 10:37 PM Thomas Gummerer > > wrote: > > > > int dir_iterator_advance(struct dir_iterator *dir_iterator) > > > > @@ -71,6 +78,8 @@ int dir_iterator_advance(struct d

Re: [GSoC][PATCH 3/3] clone: use dir-iterator to avoid explicit dir traversal

2019-02-24 Thread Matheus Tavares Bernardino
On Sat, Feb 23, 2019 at 6:48 PM Thomas Gummerer wrote: > > On 02/23, Matheus Tavares wrote: > > --- > > Changes in v2: > > - Improved patch message > > - Removed a now unused variable > > s/variable/parameter/ I believe? Yes, you are right! > > + while ((iter_status = dir_iterator_advance(

What's cooking in git.git (Feb 2019, #04; Sun, 24)

2019-02-24 Thread Junio C Hamano
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 appear in any of the integration branches, but I am still holding onto them. Git 2.21 has been tagged and pushe

[ANNOUNCE] Git v2.21.0

2019-02-24 Thread Junio C Hamano
The latest feature release Git v2.21.0 is now available at the usual places. It is comprised of 500 non-merge commits since v2.20.0, contributed by 74 people, 20 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories

Re: [GSoC][PATCH 1/3] dir-iterator: add pedantic option to dir_iterator_begin

2019-02-24 Thread Matheus Tavares Bernardino
On Sun, Feb 24, 2019 at 5:35 AM Christian Couder wrote: > > On Sat, Feb 23, 2019 at 10:37 PM Thomas Gummerer wrote: > > > > On 02/23, Matheus Tavares wrote: > > > Add the pedantic option to dir-iterator's initialization function, > > > dir_iterator_begin. When this option is set to true, > > > di

Re: [GSoC][PATCH 0/3] clone: convert explicit dir traversal to dir-iterator

2019-02-24 Thread Matheus Tavares Bernardino
On Sat, Feb 23, 2019 at 6:59 PM Thomas Gummerer wrote: > > On 02/23, Matheus Tavares wrote: > > Add pedantic option to dir_iterator_begin at dir-iterator.c and convert > > explicit recursive directory traversal at copy_or_link_directory > > (builtin/clone.c) to the dir-iterator API. > > Thanks for

Re: [WIP 7/7] upload-pack: send part of packfile response as uri

2019-02-24 Thread Junio C Hamano
Jonathan Tan writes: > diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh > index db4ae09f2f..6dbe2e9584 100755 > --- a/t/t5702-protocol-v2.sh > +++ b/t/t5702-protocol-v2.sh > @@ -656,6 +656,60 @@ test_expect_success 'when server does not send "ready", > expect FLUSH' ' > test_i1

Re: [PATCH] diff: reuse diff setup for --no-index case

2019-02-24 Thread Junio C Hamano
Jeff King writes: >> Here's an attempt at that. I did drop a few comments that seemed >> pointless to me, as they're just re-stating the lines they describe. > > It looks like the original got merged to next. I think we at least need > to deal with the "Otherwise..." comment, but I think the lay

Re: [GIT PULL] l10n updates for 2.21 round 2

2019-02-24 Thread Junio C Hamano
Jiang Xin writes: > Hi Junio, > > Please pull the following l10n updates for Git 2.21. These updates come > from nine l10n teams (Bulgarian, Catalan, German, Greek, Spanish, French, > Italian, Swedish and Simplified Chinese). Jimmy contributed the essential > translation for Greek and formed a

Re: [GSoC] Introduction

2019-02-24 Thread Johannes Schindelin
Hi Rohit, On Sun, 24 Feb 2019, Rohit Ashiwal wrote: > Hello Hi there! > I am Rohit Ashiwal, a computer science and engineering student from > IIT Roorkee. I am a git user for 2 years now and want to contribute > towards its development. Great! > I have read the microproject list available [he

Re: [GSoC][PATCH 3/3] clone: use dir-iterator to avoid explicit dir traversal

2019-02-24 Thread Ævar Arnfjörð Bjarmason
On Sun, Feb 24 2019, Christian Couder wrote: > On Sat, Feb 23, 2019 at 11:48 PM Ævar Arnfjörð Bjarmason > wrote: >> >> >> On Sat, Feb 23 2019, Matheus Tavares wrote: >> >> > Replace usage of opendir/readdir/closedir API to traverse directories >> > recursively, at copy_or_link_directory functio

Re: [PATCH 1/1] README: adjust for final Azure Pipeline ID

2019-02-24 Thread Johannes Schindelin
Hi Junio, On Sat, 23 Feb 2019, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > From: Johannes Schindelin > > > > During the six months of development of the Azure Pipelines support, the > > patches went through quite a few iterations of changes, and to test > > t

Re: does "git clean" deliberately ignore "core.excludesFile"?

2019-02-24 Thread Johannes Schindelin
Hi, On Sat, 23 Feb 2019, Junio C Hamano wrote: > "Robert P. J. Day" writes: > > > On Sat, 23 Feb 2019, Johannes Schindelin wrote: > > > >> Robert, care to come up with an example demonstrating where it does not? > > > > sorry i wasn't clear, all i was pointing out was that "man > > git-clean"

[PATCH 15/26] bisect--helper: `bisect_autostart` shell function in C

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva Reimplement the `bisect_autostart()` shell function in C and add the C implementation from `bisect_next()` which was previously left uncovered. Also add a subcommand `--bisect-autostart` to `git bisect--helper` be called from `bisect_state()` from git-bisect.sh . Using `--bise

[PATCH 13/26] bisect--helper: retire `--bisect-clean-state` subcommand

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva The `bisect-clean-state` subcommand is no longer used in the shell script while the C code uses `bisect_clean_state()` thus remove the subcommand. Mentored-by: Lars Schneider Mentored-by: Christian Couder Signed-off-by: Pranit Bauva Signed-off-by: Tanushree Tumane --- bui

[PATCH 20/26] bisect--helper: `bisect_replay` shell function in C

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva Reimplement the `bisect_replay` shell function in C and also add `--bisect-replay` subcommand to `git bisect--helper` to call it from git-bisect.sh Using `--bisect-replay` subcommand is a temporary measure to port shell function to C so as to use the existing test suite. As mo

[PATCH 18/26] bisect--helper: retire `--write-terms` subcommand

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva The `--write-terms` subcommand is no longer used in the shell script and the function `write_terms()` is called from the C implementation of `set_terms()` and `bisect_start()`. Mentored-by: Lars Schneider Mentored-by: Christian Couder Mentored-by: Johannes Schindelin Signed

[PATCH 24/26] bisect--helper: remove the dequote in bisect_start()

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva Dequoting the arguments was introduced in 25b48b5c to port the function `bisect_next()` but after the `bisect_replay()` porting, the dequoting is carried out itself when it passes the arguments to `bisect_start()` in a simpler way thus dequoting again isn't required. So remove

[PATCH 03/26] bisect--helper: `decide_next()` helper function.

2019-02-24 Thread Tanushree Tumane via GitGitGadget
From: Tanushree Tumane introduce `decide_next()` helper function from `bisect_next_check()` for better and clear understanding. convert `*...warning` char pointers to `...warning[]`char arrays, as char [] only creates char array while char * creates both char array and a pointer to that char arr

[PATCH 25/26] bisect--helper: `bisect_skip` shell function in C

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva Reimplement the `bisect_skip()` shell function in C and also add `bisect-skip` subcommand to `git bisect--helper` to call it from git-bisect.sh Using `--bisect-skip` subcommand is a temporary measure to port shell function to C so as to use the existing test suite. As more fun

[PATCH 26/26] bisect--helper: retire `--check-and-set-terms` subcommand

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva The `--check-and-set-terms` subcommand is no longer used in the shell script and the function `check_and_set_terms()` is called from the C implementation. Mentored-by: Lars Schneider Mentored-by: Christian Couder Mentored-by: Johannes Schindelin Signed-off-by: Pranit Bauva

[PATCH 16/26] bisect--helper: `bisect_state` & `bisect_head` shell function in C

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva Reimplement the `bisect_state()` shell function in C and also add a subcommand `--bisect-state` to `git-bisect--helper` to call it from git-bisect.sh . Using `--bisect-state` subcommand is a temporary measure to port shell function to C so as to use the existing test suite. As

[PATCH 14/26] bisect--helper: retire `--next-all` subcommand

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva The `--next-all` subcommand is no longer used in the shell script and the function `bisect_next_all()` is called from the C implementation of `bisect_next()`. Mentored-by: Lars Schneider Mentored-by: Christian Couder Signed-off-by: Pranit Bauva Signed-off-by: Tanushree Tuma

[PATCH 22/26] bisect--helper: retire `--bisect-autostart` subcommand

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva The `--bisect-autostart` subcommand is no longer used in the shell script and the function `bisect_autostart()` is called from the C implementation. Mentored-by: Lars Schneider Mentored-by: Christian Couder Mentored-by: Johannes Schindelin Signed-off-by: Pranit Bauva Signe

[PATCH 23/26] bisect--helper: retire `--bisect-auto-next` subcommand

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva The `--bisect-auto-next` subcommand is no longer used in the shell script and the function `bisect_auto_next()` is called from the C implementation. Mentored-by: Lars Schneider Mentored-by: Christian Couder Mentored-by: Johannes Schindelin Signed-off-by: Pranit Bauva Signe

[PATCH 19/26] bisect--helper: `bisect_log` shell function in C

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva Reimplement the `bisect_log()` shell function in C and also add `--bisect-log` subcommand to `git bisect--helper` to call it from git-bisect.sh . Using `--bisect-log` subcommand is a temporary measure to port shell function to C so as to use the existing test suite. As more fu

[PATCH 17/26] bisect--helper: retire `--check-expected-revs` subcommand

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva The `--check-expected-revs` subcommand is no longer used in the shell script and the function `check_expected_revs()` is called from the C implementation of `bisect_next()`. Mentored-by: Lars Schneider Mentored-by: Christian Couder Mentored-by: Johannes Schindelin Signed-of

[PATCH 21/26] bisect--helper: retire `--bisect-write` subcommand

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva The `--bisect-write` subcommand is no longer used in the shell script and the function `bisect_write()` is called from the C implementation. Mentored-by: Lars Schneider Mentored-by: Christian Couder Mentored-by: Johannes Schindelin Signed-off-by: Pranit Bauva Signed-off-by

[PATCH 02/26] bisect--helper: change `retval` to `res`

2019-02-24 Thread Tanushree Tumane via GitGitGadget
From: Tanushree Tumane Conversion of variable `retval` to `res` to have a uniformity of a single variable all over the patch series, which makes the patch series unvaried. Mentored-by: Christian Couder Signed-off-by: Tanushree Tumane --- builtin/bisect--helper.c | 50 -

[PATCH 00/26] Git bisect part3

2019-02-24 Thread Tanushree Tumane via GitGitGadget
Changes since pranit’s v15 patch series === bisect--helper: refer branch.buf before strbuf_release(...) === bisect--helper: change retval to res bisect--helper: decide

[PATCH 10/26] bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva Reimplement the `bisect_next()` and the `bisect_auto_next()` shell function in C and add the subcommands to `git bisect--helper` to call it from git-bisect.sh . Using `--bisect-next` and `--bisect-auto-start` subcommands is a temporary measure to port shell function to C so as

[PATCH 12/26] bisect--helper: dequote arguments in `bisect-start`

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva As more and more calls are happening to the subcommands in `git bisect--helper`, more specifically when `bisect_start $rev` is converted to `git bisect--helper --bisect-start $rev` it is necessary to dequote the arguments because of shell to C conversion. Mentored-by: Christia

[PATCH 09/26] bisect.c: libify `bisect_next_all` and its dependants

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva Since we want to get rid of git-bisect.sh it would be necessary to convert those exit() calls to return statements so that errors can be reported. Emulate try catch in C by converting `exit()` to `return `. Follow POSIX conventions to return to indicate error. Turn `exit()`

[PATCH 07/26] bisect.c: libify `check_good_are_ancestors_of_bad` and its dependents

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva Since we want to get rid of git-bisect.sh it would be necessary to convert those exit() calls to return statements so that errors can be reported. Emulate try catch in C by converting `exit()` to `return `. Follow POSIX conventions to return to indicate error. Turn `exit()`

[PATCH 08/26] bisect.c: libify `handle_bad_merge_base` and its dependants

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva Since we want to get rid of git-bisect.sh it would be necessary to convert those exit() calls to return statements so that errors can be reported. Emulate try catch in C by converting `exit()` to `return `. Follow POSIX conventions to return to indicate error. Turn `exit()`

[PATCH 06/26] bisect.c: libify `check_merge_bases` and its dependents.

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva Since we want to get rid of git-bisect.sh it would be necessary to convert those exit() calls to return statements so that errors can be reported. Emulate try catch in C by converting `exit()` to `return `. Follow POSIX conventions to return to indicate error. Turn `exit()`

[PATCH 05/26] bisect.c: libify `bisect_checkout` and its dependants

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva Since we want to get rid of git-bisect.sh it would be necessary to convert those exit() calls to return statements so that errors can be reported. Emulate try catch in C by converting `exit()` to `return `. Follow POSIX conventions to return to indicate error. Turn `exit()`

[PATCH 11/26] bisect--helper: Finish `bisect_start()` conversion

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva With the conversion of `bisect_auto_next()` in previous commit, `bisect_start()` has been successfully ported to C. Add the subcommands to `git bisect--helper` and call it from git-bisect.sh. Remove `bisect_start()` shell method and call `git bisect--helper --bisect-start` s

[PATCH 04/26] bisect.c: libify `exit_if_skipped_commits` to `error_if_skipped...`

2019-02-24 Thread Pranit Bauva via GitGitGadget
From: Pranit Bauva Since we want to get rid of git-bisect.sh it would be necessary to convert those exit() calls to return statements so that errors can be reported. Emulate try catch in C by converting `exit()` to `return `. Follow POSIX conventions to return to indicate error. Modify `cmd_bis

[PATCH 01/26] bisect--helper: refer branch.buf before strbuf_release(...)

2019-02-24 Thread Tanushree Tumane via GitGitGadget
From: Tanushree Tumane move `error("...%s...", branch.buf);` before `strbuf_release(&branch);`. add ' ' before "reset.." in error message. Mentored-by: Johannes Schindelin Mentored-by: Christian Couder Signed-off-by: Tanushree Tumane --- builtin/bisect--helper.c | 7 --- 1 file changed,

Re: [PATCH 2/2] rebase: don't rebase linear topology with --fork-point

2019-02-24 Thread Jeff King
On Fri, Feb 22, 2019 at 05:49:57PM +0100, Ævar Arnfjörð Bjarmason wrote: > Yes. I didn't dig far enough into this and will re-word & re-submit, > also with the feedback you had on 1/2. > > So here's my current understanding of this. > > It's b6266dc88b ("rebase--am: use --cherry-pick instead of

[GSoC] Introduction

2019-02-24 Thread Rohit Ashiwal
Hello I am Rohit Ashiwal, a computer science and engineering student from IIT Roorkee. I am a git user for 2 years now and want to contribute towards its development. I have read the microproject list available [here](1) and project titled `Use test_path_is_* functions in test scripts` caught my e

Re: [PATCH] diff: reuse diff setup for --no-index case

2019-02-24 Thread Jeff King
On Sat, Feb 16, 2019 at 01:57:56AM -0500, Jeff King wrote: > On Thu, Feb 14, 2019 at 11:47:02AM -0800, Junio C Hamano wrote: > > > > + if (no_index) > > > + /* If this is a no-index diff, just run it and exit there. */ > > > + diff_no_index(&rev, argc, argv); > > > + > > > if (n

Re: [GSoC][PATCH 3/3] clone: use dir-iterator to avoid explicit dir traversal

2019-02-24 Thread Christian Couder
On Sat, Feb 23, 2019 at 11:48 PM Ævar Arnfjörð Bjarmason wrote: > > > On Sat, Feb 23 2019, Matheus Tavares wrote: > > > Replace usage of opendir/readdir/closedir API to traverse directories > > recursively, at copy_or_link_directory function, by the dir-iterator > > API. This simplifies the code a

Re: [GSoC][PATCH 2/3] clone: extract function from copy_or_link_directory

2019-02-24 Thread Christian Couder
On Sat, Feb 23, 2019 at 8:06 PM Matheus Tavares wrote: > > Extract dir creation code snippet from copy_or_link_directory to its own > function named mkdir_if_missing. This change will help removing > copy_or_link_directory's explicit recursion, which will be done in a > following patch. Also makes

Re: [GSoC][PATCH 1/3] dir-iterator: add pedantic option to dir_iterator_begin

2019-02-24 Thread Christian Couder
On Sat, Feb 23, 2019 at 10:37 PM Thomas Gummerer wrote: > > On 02/23, Matheus Tavares wrote: > > Add the pedantic option to dir-iterator's initialization function, > > dir_iterator_begin. When this option is set to true, > > dir_iterator_advance will immediately return ITER_ERROR when failing to >