Re: [PATCH v16 Part II 6/8] bisect--helper: `get_terms` & `bisect_terms` shell function in C

Hey Martin, On Sat, Oct 28, 2017 at 1:34 AM, Martin Ågren <martin.ag...@gmail.com> wrote: > On 27 October 2017 at 17:06, Pranit Bauva <pranit.ba...@gmail.com> wrote: >> + for (i = 0; i < argc; i++) { >> + if (!strcmp(argv[i], "--term-good&q

Re: [PATCH v16 Part II 5/8] bisect--helper: `bisect_next_check` shell function in C

Hey Martin, On Fri, Oct 27, 2017 at 11:05 PM, Martin Ågren <martin.ag...@gmail.com> wrote: > On 27 October 2017 at 17:06, Pranit Bauva <pranit.ba...@gmail.com> wrote: >> + /* >> +* have bad (or new) but not goo

Re: [PATCH v16 Part II 2/8] bisect--helper: `bisect_write` shell function in C

Hey Junio, On Fri, Oct 27, 2017 at 11:49 PM, Junio C Hamano <gits...@pobox.com> wrote: > Pranit Bauva <pranit.ba...@gmail.com> writes: > >> - bisect_write "$state" "$rev" >> + git bisect--helper --bisect-write "$state

Re: [PATCH v16 Part II 2/8] bisect--helper: `bisect_write` shell function in C

Hey Martin, On Fri, Oct 27, 2017 at 10:58 PM, Martin Ågren <martin.ag...@gmail.com> wrote: > On 27 October 2017 at 17:06, Pranit Bauva <pranit.ba...@gmail.com> wrote: >> +static void free_terms(struct bisect_terms *terms) >> +{ >> + if (!terms->term

Re: [PATCH v16 Part II 6/8] bisect--helper: `get_terms` & `bisect_terms` shell function in C

Hey Stephan, On Mon, Oct 30, 2017 at 10:04 PM, Stephan Beyer <s-be...@gmx.net> wrote: > On 10/27/2017 05:06 PM, Pranit Bauva wrote: >> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c >> index 0f9c3e63821b8..ab0580ce0089a 100644 >> --- a/builtin/bisect

Re: [PATCH v16 Part II 7/8] bisect--helper: `bisect_start` shell function partially in C

changed from > "unrecognised option: '$arg'" > to > "unrecognised option: '%s'" > anyway, it does not result in further work for the translators to > correct it to > "unrecognized option: '%s'" Yeah Sure! Regards, Pranit Bauva

Re: [PATCH v16 Part II 1/8] bisect--helper: `bisect_reset` shell function in C

s meant as a > shortcut for > > printf(_("We are not bisecting.\n")); > return 0; > > but please also express it with these two lines. (Or what is the point > of returning a non-zero value only in the case when nothing could be > printed?) I was just being a little lazy I suppose. I will stick to doing it in two lines and avoiding fancy things. Regards, Pranit Bauva

Re: [PATCH v16 Part II 1/8] bisect--helper: `bisect_reset` shell function in C

Hey Junio, On Fri, Oct 27, 2017 at 11:10 PM, Junio C Hamano <gits...@pobox.com> wrote: > Pranit Bauva <pranit.ba...@gmail.com> writes: > >> +static int bisect_reset(const char *commit) >> +{ >> + struct strbuf branch = ST

Re: [PATCH v16 Part II 1/8] bisect--helper: `bisect_reset` shell function in C

Hey, I forgot to mention. One can find the travis build here[1] which is passing. [1]: https://travis-ci.org/git/git/builds/293725346 Regards, Pranit Bauva

[PATCH v16 Part II 1/8] bisect--helper: `bisect_reset` shell function in C

com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- Hey, This is the part 2 of the initial series[1] on bisect re-write. When I submitted my patches of the part 1 of the bisect series, Ramsay informed that he has been work

[PATCH v16 Part II 7/8] bisect--helper: `bisect_start` shell function partially in C

`bisect_append_log_quoted` to keep things short and crisp. Helped-by: Ramsay Jones <ram...@ramsayjones.plus.com> Helped-by: Stephan Beyer <s-be...@gmx.net> Mentored-by: Lars Schneider <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva

[PATCH v16 Part II 6/8] bisect--helper: `get_terms` & `bisect_terms` shell function in C

n Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- builtin/bisect--helper.c| 69 +++-- git-bisect.sh | 35 ++- t/t6030-bisect-porcelain.sh | 2 +- 3 files changed, 70 insertio

[PATCH v16 Part II 5/8] bisect--helper: `bisect_next_check` shell function in C

ars Schneider <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- builtin/bisect--helper.c | 91 +++- git-bisect.sh| 60 +++-

[PATCH v16 Part II 4/8] bisect--helper: `check_and_set_terms` shell function in C

ntored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- builtin/bisect--helper.c | 41 - git-bisect.sh| 36 2 files changed, 44 insertions(+), 33

[PATCH v16 Part II 3/8] wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()

is_empty_file() can help to refactor a lot of code. This will be very helpful in porting "git bisect" to C. Suggested-by: Torsten Bögershausen <tbo...@web.de> Mentored-by: Lars Schneider <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org>

[PATCH v16 Part II 2/8] bisect--helper: `bisect_write` shell function in C

() to set the values of members in `struct bisect_terms`. Helped-by: Ramsay Jones <ram...@ramsayjones.plus.com> Mentored-by: Lars Schneider <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com

[PATCH v16 Part II 8/8] t6030: make various test to pass GETTEXT_POISON tests

Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- t/t6030-bisect-porcelain.sh | 120 ++-- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 55835ee4a4715..f9e61c6

Re: [PATCH v16 1/6] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

Hey Junio, On Tue, Oct 3, 2017 at 9:21 AM, Junio C Hamano <gits...@pobox.com> wrote: > Ramsay Jones <ram...@ramsayjones.plus.com> writes: > >> On 02/10/17 14:44, Pranit Bauva wrote: >> [snip] >>>... >> Yes, I also meant to tidy that up by removing

Re: [PATCH v16 1/6] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

quot;), CHECK_EXPECTED_REVS), > OPT_BOOL(0, "no-checkout", _checkout, > N_("update BISECT_HEAD instead of checking out the > current commit")), > OPT_END() > @@ -140,17 +111,14 @@ int cmd_bisect__helper(int argc, const char **argv, > const char *prefix) > return bisect_next_all(prefix, no_checkout); > case WRITE_TERMS: > if (argc != 2) > - return error(_("--write-terms requires two > arguments")); > + die(_("--write-terms requires two arguments")); > return write_terms(argv[0], argv[1]); > case BISECT_CLEAN_STATE: > if (argc != 0) > - return error(_("--bisect-clean-state requires no > arguments")); > + die(_("--bisect-clean-state requires no arguments")); > return bisect_clean_state(); > - case CHECK_EXPECTED_REVS: > - check_expected_revs(argv, argc); > - return 0; > default: > - return error("BUG: unknown subcommand '%d'", cmdmode); > + die("BUG: unknown subcommand '%d'", cmdmode); I will keep the return rather than die since Christian and I had a few conversations long back. Regards, Pranit Bauva www.bauva.com

Re: [PATCH v16 1/6] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

Hey Stephan, On Sat, Sep 30, 2017 at 12:24 AM, Stephan Beyer <s-be...@gmx.net> wrote: > > Hi Pranit, > > On 09/29/2017 08:49 AM, Pranit Bauva wrote: > > It has been a long time since this series appeared on the mailing list. > > The previous version v15[1] is now

[PATCH v16 5/6] t6030: explicitly test for bisection cleanup

Add test to explicitly check that 'git bisect reset' is working as expected. This is already covered implicitly by the test suite. Mentored-by: Lars Schneider <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.

[PATCH v16 3/6] bisect--helper: `write_terms` shell function in C

implementation will be called by some other method. Mentored-by: Lars Schneider <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- builtin/bisect--helper.c | 36 +

[PATCH v16 4/6] bisect--helper: `bisect_clean_state` shell function in C

ntored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- bisect.c | 42 ++ bisect.h | 2 ++ builtin/bisect--helper.c | 10 +- git-bisect.

[PATCH v16 6/6] bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

sc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- builtin/bisect--helper.c | 34 +- git-bisect.sh| 20 ++-- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/builtin/bisect--helper.c b/bu

[PATCH v16 1/6] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

annes.schinde...@gmx.de> Mentored-by: Lars Schneider <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- Hey, It has been a long time since this series appeared on the mailing list. The pr

[PATCH v16 2/6] bisect--helper: rewrite `check_term_format` shell function in C

will be introduced for write_terms(). Helped-by: Johannes Schindelein <johannes.schindel...@gmx.de> Mentored-by: Lars Schneider <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- built

Re: What's cooking in git.git (Mar 2017, #02; Fri, 3)

iting until > pb/bisect found its way into "next". (There were also recent discussions > on other bisect strategies [3] and it's probably only a matter of time > until a new big patchset on bisect--helper comes up...) I am sorry I haven't found much time on it. I actually came across a bug and haven't been able to fix that so I had just not worked on it then. I almost forgot that you too had a patch series and this series is important for you. I will start working on this and send a re-roll soon. Regards, Pranit Bauva

Re: feature request: user email config per domain

e the repo will get the first preference and then the global ~/.gitconfig. This will work for you assuming that you have different repos for your company and for your open source work. Will this solve your problem? Regards, Pranit Bauva

Re: [PATCH 3/3] show-branch: use skip_prefix to drop magic numbers

me); > } > } > Did you purposely miss the one in line number 278 of builtin/show-branch.c because I think you only touched up the parts which were related to "refs/" but didn't explicitly mention it in the commit message? if (starts_with(pretty_str, "[PATC

Re: [PATCH] fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C

free(bad_ref); > - if (!good_glob) > - free(good_glob); > - if (!bad_syn) > - free(bad_syn); > - if (!good_syn) > - free(good_syn); > + free(bad_ref); > + free(good_glob); > + free(bad_syn); > + free(good_syn); > return retval; > } This helps a lot ;) Thanks! Regards, Pranit Bauva

Re: [PATCH] fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C

r > put: if you send another iteration of the patch series), please squash > this fix in. > > Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> Thanks for making this fix! :) I will squash it in. Regards, Pranit Bauva

Re: GSoC 2017: application open, deadline = February 9, 2017

sure whether I would be able to help with actual project ideas but I will try. I will do it within a week or so. Regards, Pranit Bauva

Re: git-scm.com status report

ut now I think it would be more appropriate to use git-scm.org domain. We can forward all .com requests to .org and try to move all reference we know about, to .org. What do you all think? Regards, Pranit Bauva

Re: [PATCH/RFC] WIP: log: allow "-" as a short-hand for "previous branch"

y recommended to follow the pre existing style of code and commits. In the micro project list, I think it is mentioned that this similar thing is implemented in git-merge so you should try and dig the commit history of that file to find the similar change. If you do this, then you will find out that there is a very short and sweet way to do it. I won't directly point out the commit. strbuf API should be used when you need to modify the contents of the string. I think you have a little confusion. If you declare the string as, const char *str = "foo"; then, you can also do, str = "bar"; But you can't do, str[1] = 'z'; I hope you get what I am saying, if not, search for it. Regards, Pranit Bauva

Re: feature request: add -q to "git branch"

Hey Kevin, Sorry for the previous message. On Sun, Feb 5, 2017 at 2:47 AM, Pranit Bauva <pranit.ba...@gmail.com> wrote: > Hey Kevin, > > On Fri, Feb 3, 2017 at 11:59 PM, Kevin Layer <la...@known.net> wrote: >> It should be possible to quietly create a branch. I th

Re: feature request: add -q to "git branch"

Hey Kevin, On Fri, Feb 3, 2017 at 11:59 PM, Kevin Layer wrote: > It should be possible to quietly create a branch. > > Thanks. > > Kevin

Re: [PATCH v3] parse-remote: remove reference to unused op_prep

09), but as of 045fac5845 > ("i18n: git-parse-remote.sh: mark strings for translation", > 2016-04-19), the argument is no longer used. Remove it. > > Signed-off-by: Siddharth Kannan <kannan.siddhart...@gmail.com> This looks good to me! Thanks :) Regards, Pranit Bauva

Re: [PATCH v2] parse-remote: Remove reference to unused op_prep

Hey SIddharth, > Subject: parse-remote: Remove reference to unused op_prep ^ Minor nit: after the colon, we generally don't use the word starting with an uppercase letter which I think can be figured out when you run `git log -p git-parse-remote.sh` On

Re: [PATCH] git-parse-remote.sh: Remove op_prep argument

Hey Siddharth, On Fri, Feb 3, 2017 at 11:58 PM, Siddharth Kannan wrote: > - Remove the third argument of error_on_missing_default_upstream that is no > longer required > - FIXME to remove this argument was added in commit 045fac5845 This is not exactly correct.

SoC Microprojects 2017

blocked by institute proxy) but I have included it as a link[1]. And here is the PR[2]. [1]: https://patch-diff.githubusercontent.com/raw/git/git.github.io/pull/219.patch [2]: https://github.com/git/git.github.io/pull/219 Regards, Pranit Bauva

Re: [PATCH] tag: add tag.createReflog option

Hey Cornelius, On Wed, Jan 25, 2017 at 5:49 AM, wrote: > From: Cornelius Weig > > Git does not create a history for tags, in contrast to common > expectation to simply version everything. This can be changed by using > the

Re: [PATCH] blame: add option to print tips (--tips)

Hey Junio, On Tue, Jan 24, 2017 at 12:06 AM, Junio C Hamano <gits...@pobox.com> wrote: > Pranit Bauva <pranit.ba...@gmail.com> writes: > >> We can probably make it useful with some extended efforts. I use >> git-blame and I sometimes find that I don't need things

Re: [PATCH] blame: add option to print tips (--tips)

r this is worth the effort. I personally find this `format` feature useful. Regards, Pranit Bauva

[PATCH v4 1/2] don't use test_must_fail with grep

test_must_fail should only be used for testing git commands. To test the failure of other commands use `!`. Reported-by: Stefan Beller <sbel...@google.com> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- t/t3510-cherry-pick-sequence.sh | 6 +++--- t/t5504-fetch-receive-str

[PATCH v4 2/2] t9813: avoid using pipes

The exit code of the upstream in a pipe is ignored thus we should avoid using it. By writing out the output of the git command to a file, we can test the exit codes of both the commands. Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- t/t9813-git-p4-preserve-users.sh | 8 -

Re: [PATCH] don't use test_must_fail with grep

k it out from v3 while > queuing, or I may forget about it after looking at other topics ;-) > in which case you may want to send v4 with the fix? Yeah sure! No problem! :) Regards, Pranit Bauva

Re: [PATCH v3 2/2] t9813: avoid using pipes

Hey Luke, On Wed, Jan 4, 2017 at 2:41 PM, Luke Diamand <l...@diamand.org> wrote: > On 3 January 2017 at 19:57, Pranit Bauva <pranit.ba...@gmail.com> wrote: >> The exit code of the upstream in a pipe is ignored thus we should avoid >> using it. By writing out th

[PATCH v3 1/2] don't use test_must_fail with grep

test_must_fail should only be used for testing git commands. To test the failure of other commands use `!`. Reported-by: Stefan Beller <sbel...@google.com> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- t/t3510-cherry-pick-sequence.sh | 6 +++--- t/t5504-fetch-receive-str

[PATCH v3 2/2] t9813: avoid using pipes

The exit code of the upstream in a pipe is ignored thus we should avoid using it. By writing out the output of the git command to a file, we can test the exit codes of both the commands. Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- t/t9813-git-p4-preserve-users.sh | 8 -

Re: [PATCH v2 2/2] t9813: avoid using pipes

Hey Stefan, On Tue, Jan 3, 2017 at 11:28 PM, Stefan Beller <sbel...@google.com> wrote: > On Mon, Jan 2, 2017 at 10:45 AM, Pranit Bauva <pranit.ba...@gmail.com> wrote: >> The exit code of the upstream in a pipe is ignored thus we should avoid >> using it. > >

Re: [PATCH] diff: add interhunk context config option

lt; > options->context = diff_context_default; > + options->interhunkcontext = diff_interhunk_context_default; > options->ws_error_highlight = ws_error_highlight_default; > DIFF_OPT_SET(options, RENAME_EMPTY); On a first look, it seems that we can overwrite the default config values by using a different command line argument which is good. Also, tests are missing. It seems that t/t4032 might be a good place to add those tests. Rest all is quite good! :) Regards, Pranit Bauva

[PATCH v2 2/2] t9813: avoid using pipes

The exit code of the upstream in a pipe is ignored thus we should avoid using it. By writing out the output of the git command to a file, we can test the exit codes of both the commands. Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- t/t9813-git-p4-preserve-users.sh | 8 -

[PATCH v2 1/2] don't use test_must_fail with grep

test_must_fail should only be used for testing git commands. To test the failure of other commands use `!`. Reported-by: Stefan Beller <sbel...@google.com> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- t/t3510-cherry-pick-sequence.sh | 6 +++--- t/t5504-fetch-receive-str

Re: [PATCH] don't use test_must_fail with grep

ouldn't we need this? > > git p4 commit >actual 2>&1 && > ! grep "git author.*does not match" actual && > > -- Hannes This seems better! Since I am at it, I can remove the traces of pipes in an another patch. Regards, Pranit Bauva

Re: [PATCH v15 15/27] bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C

ext bisection state then find the >>>> next bisection state"), BISECT_AUTO_NEXT), >>> >>> The next bisection *state* is found? >> >> checkout is more appropriate. I don't remember why I used "find". > > "checkout the next bisection commit" maybe? Seems better. Thanks! Regards, Pranit Bauva

[PATCH] don't use test_must_fail with grep

test_must_fail should only be used for testing git commands. To test the failure of other commands use `!`. Reported-by: Stefan Beller <sbel...@google.com> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- t/t3510-cherry-pick-sequence.sh | 6 +++--- t/t5504-fetch-receive-str

Re: [PATCH v15 15/27] bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C

Hey Stephan, On Tue, Nov 22, 2016 at 3:05 AM, Stephan Beyer <s-be...@gmx.net> wrote: > Hi Pranit, > > in this mail I review the "second part" of your patch: the transition of > bisect_next and bisect_auto_next to C. > > On 10/14/2016 04:14 PM, Pranit Bauva wro

Re: [PATCH v15 15/27] bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C

and autonext part. > > On 10/14/2016 04:14 PM, Pranit Bauva wrote: >> diff --git a/bisect.c b/bisect.c >> index 45d598d..7c97e85 100644 >> --- a/bisect.c >> +++ b/bisect.c >> @@ -843,16 +878,21 @@ static int check_ancestors(const char *prefix) >> * >

Re: [PATCH v2] am: add am.signoff add config variable

gt; more idiomatic way? > > I just found out that "test_must_fail grep ..." is a common > idiom, so what about: Is there any particular reason to use "grep" instead of "test_cmp"? To check for non-zero error code, you can always use "! test_cmp". Regards, Pranit Bauva

Re: [PATCH v15 08/27] bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

Hey Stephan, On Thu, Nov 17, 2016 at 5:17 AM, Stephan Beyer <s-be...@gmx.net> wrote: > Hi, > > On 10/14/2016 04:14 PM, Pranit Bauva wrote: >> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c >> index d84ba86..c542e8b 100644 >> --- a/builtin/bisect-

Re: [PATCH v15 08/27] bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

Hey Stephan, On Wed, Dec 7, 2016 at 1:03 AM, Pranit Bauva <pranit.ba...@gmail.com> wrote: >> I don't understand why the return value is int and not void. To avoid a >> "return 0;" line when calling this function? > > Initially I thought I would be using th

Re: [PATCH v15 19/27] bisect--helper: `bisect_state` & `bisect_head` shell function in C

Hey Stephan, On Wed, Dec 7, 2016 at 5:24 AM, Stephan Beyer <s-be...@gmx.net> wrote: > Hi Pranit, > > On 12/06/2016 11:40 PM, Pranit Bauva wrote: >> On Tue, Nov 22, 2016 at 5:42 AM, Stephan Beyer <s-be...@gmx.net> wrote: >>> On 10/14/2016 04:14 PM, Pranit Bauva

Re: [PATCH v15 12/27] bisect--helper: `get_terms` & `bisect_terms` shell function in C

Hey Stephan, On Wed, Dec 7, 2016 at 4:35 AM, Stephan Beyer <s-be...@gmx.net> wrote: > Hey Pranit, > > On 12/06/2016 10:14 PM, Pranit Bauva wrote: >>>> + >>>> + if (argc == 0) { >>>> + printf(_("Your current terms are %

Re: [PATCH v15 23/27] bisect--helper: `bisect_replay` shell function in C

ider it very bad style to leak memory... but Git is rather written > as a scripting tool than a genuine library, so perhaps many people here > do not care about it as long as it works... Thanks for taking out your time to review my series extremely carefully. I will try to post a v16 next week

Re: [PATCH v15 10/27] bisect--helper: `check_and_set_terms` shell function in C

Hey Stephan, On Fri, Nov 18, 2016 at 1:55 AM, Stephan Beyer <s-be...@gmx.net> wrote: > Hi Pranit, > > On 10/14/2016 04:14 PM, Pranit Bauva wrote: >> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c >> index 3f19b68..c6c11e3 100644 >> --- a/builtin/

Re: [PATCH v15 22/27] bisect--helper: `bisect_log` shell function in C

Hey Stephan, On Fri, Nov 18, 2016 at 3:17 AM, Stephan Beyer <s-be...@gmx.net> wrote: > Hi, > > On 10/14/2016 04:14 PM, Pranit Bauva wrote: >> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c >> index 493034c..c18ca07 100644 >> --- a/builtin/bisect-

Re: [PATCH v15 19/27] bisect--helper: `bisect_state` & `bisect_head` shell function in C

Hey Stephan, On Tue, Nov 22, 2016 at 5:42 AM, Stephan Beyer <s-be...@gmx.net> wrote: > Hi, > > On 10/14/2016 04:14 PM, Pranit Bauva wrote: >> Reimplement the `bisect_state` shell function in C and also add a >> subcommand `--bisect-state` to `git-bisect--helper` to ca

Re: [PATCH v15 09/27] bisect--helper: `bisect_write` shell function in C

Hey Stephan, On Thu, Nov 17, 2016 at 3:10 PM, Stephan Beyer <s-be...@gmx.net> wrote: > Hi, > > I've only got some minors to mention here ;) > > On 10/14/2016 04:14 PM, Pranit Bauva wrote: >> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c >&

Re: [PATCH v15 12/27] bisect--helper: `get_terms` & `bisect_terms` shell function in C

Hey Stephan, On Fri, Nov 18, 2016 at 3:02 AM, Stephan Beyer <s-be...@gmx.net> wrote: > Hi, > > On 10/14/2016 04:14 PM, Pranit Bauva wrote: >> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c >> index 317d671..6a5878c 100644 >> --- a/builtin/bisect-

Re: [PATCH v15 18/27] bisect--helper: `bisect_autostart` shell function in C

Hey Stephan, On Mon, Nov 21, 2016 at 1:45 AM, Stephan Beyer <s-be...@gmx.net> wrote: > Hi, > > On 10/14/2016 04:14 PM, Pranit Bauva wrote: >> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c >> index 502bf18..1767916 100644 >> --- a/builtin/bisect-

Re: [PATCH v15 08/27] bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

Hey Stephan, On Thu, Nov 17, 2016 at 5:17 AM, Stephan Beyer <s-be...@gmx.net> wrote: > Hi, > > On 10/14/2016 04:14 PM, Pranit Bauva wrote: >> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c >> index d84ba86..c542e8b 100644 >> --- a/builtin/bisect-

Re: [PATCH v15 11/27] bisect--helper: `bisect_next_check` & bisect_voc shell function in C

Hey Stephan, Sorry for the late replies. My end semester exams just got over. On Fri, Nov 18, 2016 at 2:29 AM, Stephan Beyer <s-be...@gmx.net> wrote: > > Hi Pranit, > > On 10/14/2016 04:14 PM, Pranit Bauva wrote: > > Also reimplement `bisect_voc` shell functi

Re: [PATCH v15 07/27] bisect--helper: `bisect_reset` shell function in C

Hey Stephan, On Thu, Nov 17, 2016 at 4:53 AM, Stephan Beyer <s-be...@gmx.net> wrote: > Hi, > > On 10/14/2016 04:14 PM, Pranit Bauva wrote: >> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c >> index 4254d61..d84ba86 100644 >> --- a/builtin/bisect-

Re: [PATCH v15 13/27] bisect--helper: `bisect_start` shell function partially in C

Hey Stephan, On Wed, Nov 16, 2016 at 4:49 AM, Stephan Beyer <s-be...@gmx.net> wrote: > Hi, > > On 10/14/2016 04:14 PM, Pranit Bauva wrote: >> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c >> index 6a5878c..1d3e17f 100644 >> --- a/builtin/bisect-

Re: [PATCH v15 04/27] bisect--helper: `bisect_clean_state` shell function in C

ndex and that is spoiled if anything is deleted in between. Thus it gives a seg fault. See this[1]. I did the same mistake when making this patch and I was confused about that was happening but then Michael Haggerty pointed this out[2]. [1]: https://github.com/git/git/blob/v2.11.0-rc1/refs.h#L183-L191 [2]: http://public-inbox.org/git/574d122f.7080...@alum.mit.edu/ Regards, Pranit Bauva

Re: New to git, need help!

: https://github.com/git/git/tree/master/Documentation [2]: https://github.com/git/git/tree/master/Documentation/technical [3]: https://git.github.io/SoC-2016-Microprojects/ Hope to see a patch from your side soon! :) Regards, Pranit Bauva

Re: [PATCH v15 02/27] bisect: rewrite `check_term_format` shell function in C

of view. > But only two commits for today. The first one seems fine. The second > one makes me write this mail ;-) Thanks a lot! > On 10/14/2016 04:14 PM, Pranit Bauva wrote: >> +static int check_term_format(const char *term, const char *orig_term) >> +{ > [...] >> +

Re: How can I tell, from a script, if “git cherry-pick” fails?

't checked what it returns in git 2.10, but you can always redirect the stdout and stderr to the output and grep for the text which it shows in the actual output. Here[1] is an example of how to do it. [1]: https://github.com/git/git/blob/master/t/t3507-cherry-pick-conflict.sh#L42-L55 Regards, Pranit Bauva

Re: Reporting Bug in Git Version Control System

this helps! :) Regards, Pranit Bauva

Re: What's cooking in git.git (Oct 2016, #05; Thu, 20)

ng with t6030 so that even I could dig further. Heads up: The changes in "git bisect next" were related to revision walking so you might want to check it out. Sorry for any inconvenience caused by this series. Regards, Pranit Bauva

Re: What's cooking in git.git (Oct 2016, #04; Mon, 17)

> - bisect: rewrite `check_term_format` shell function in C > - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL > > GSoC "bisect" topic. You could squash your commit. Thanks! Regards, Pranit Bauva

Re: link broken on git man page

-htmldocs.googlecode.com/git/git.html. > > > ^^^^ > It is fixed in the recent version 2.10.0 . The new link is https://git.github.io/htmldocs/git.html . Regards, Pranit Bauva

[PATCH] t0040: convert all possible tests to use `test-parse-options --expect`

Use "test-parse-options --expect" to rewrite the tests to avoid checking the whole variable dump by just testing what is required. This commit is based on 8ca65aeb (t0040: convert a few tests to use test-parse-options; Junio C Hamano; May 6, 2016). Signed-off-by: Pranit Bauva

Re: [PATCH v15 14/27] t6030: no cleanup with bad merge base

Hey Junio, On Sat, Oct 15, 2016 at 3:13 AM, Junio C Hamano <gits...@pobox.com> wrote: > Pranit Bauva <pranit.ba...@gmail.com> writes: > >> +test_expect_success 'check whether bisection cleanup is not done with bad >> merges' ' >> +

[PATCH v15 27/27] bisect--helper: remove the dequote in bisect_start()

uting" code introduced by the commit 25b48b5c. Mentored-by: Lars Schneider <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- builtin/bisect--helper.c | 26 ++

[PATCH v15 11/27] bisect--helper: `bisect_next_check` & bisect_voc shell function in C

lt;chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- builtin/bisect--helper.c | 110 ++- git-bisect.sh| 60 ++ 2 files changed, 113 insertions(+), 57 deletions(-) diff --git a/builtin/

Re: [PATCH v15 01/27] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

-018e2a7aa6f7-000...@eu-west-1.amazonses.com/T/#m7c26060fcf95abbd19f93742d7317eef87b915a1 [2]: http://public-inbox.org/git/01020157c38b19e0-81123fa5-5d9d-4f64-8f1b-ff336e83ebe4-000...@eu-west-1.amazonses.com/T/#u [3]: http://paste.ubuntu.com/23323581/ Regards, Pranit Bauva

[PATCH v15 25/27] bisect--helper: retire `--bisect-autostart` subcommand

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 <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by:

[PATCH v15 08/27] bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

sc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- builtin/bisect--helper.c | 33 - git-bisect.sh| 20 ++-- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bi

[PATCH v15 02/27] bisect: rewrite `check_term_format` shell function in C

will be introduced for write_terms(). Helped-by: Johannes Schindelein <johannes.schindel...@gmx.de> Mentored-by: Lars Schneider <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- built

[PATCH v15 16/27] bisect--helper: retire `--bisect-clean-state` subcommand

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 <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauv

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

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 <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauv

[PATCH v15 03/27] bisect--helper: `write_terms` shell function in C

implementation will be called by some other method. Mentored-by: Lars Schneider <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- builtin/bisect--helper.c | 36 +

[PATCH v15 24/27] bisect--helper: retire `--bisect-write` subcommand

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 <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauv

[PATCH v15 17/27] bisect--helper: retire `--next-all` subcommand

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 <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by:

[PATCH v15 19/27] bisect--helper: `bisect_state` & `bisect_head` shell function in C

g> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- builtin/bisect--helper.c | 86 git-bisect.sh| 57 +++- 2 files changed, 91 insertions(+), 52 deletions(-) diff --git a/builtin/bisect--helper.

[PATCH v15 18/27] bisect--helper: `bisect_autostart` shell function in C

lt;chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- builtin/bisect--helper.c | 40 git-bisect.sh| 23 +-- 2 files changed, 41 insertions(+), 22 deletions(-) diff --git a/builtin/bisect--helper.

[PATCH v15 12/27] bisect--helper: `get_terms` & `bisect_terms` shell function in C

n Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- builtin/bisect--helper.c| 72 +++-- git-bisect.sh | 35 ++ t/t6030-bisect-porcelain.sh | 2 +- 3 files changed, 73 insertio

[PATCH v15 20/27] bisect--helper: retire `--check-expected-revs` subcommand

; Signed-off-by: Pranit Bauva <pranit.ba...@gmail.com> --- builtin/bisect--helper.c | 6 -- 1 file changed, 6 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 1481c6d..d5fe35b 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -8

[PATCH v15 14/27] t6030: no cleanup with bad merge base

The bisection cleanup should be performed with bad merge base so that the user can return to its original position with `git bisect reset`. Mentored-by: Lars Schneider <larsxschnei...@gmail.com> Mentored-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Pranit Bauv

  1   2   3   4   5   6   >