Re: [PATCH 1/9] Report bugs consistently

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > The vast majority of error messages in Git's source code which report a > > bug use the convention to prefix the message with "BUG:". > > Good thing to do. >

Re: [PATCH 9/9] am: make a direct call to merge_recursive

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > From: Junio C Hamano > > Did I write this thing? Yes, you did. It was db05d6194d3f9ea9e64163944961d5f6e85302be as part of pu@{2016-06-15}. > Having two sets of numbers that illustr

Re: [PATCH 1/9] Report bugs consistently

Hi Hannes, On Thu, 30 Jun 2016, Johannes Sixt wrote: > Am 29.06.2016 um 13:36 schrieb Johannes Schindelin: > > @@ -955,9 +955,8 @@ static struct merge_file_info merge_file_1(struct > > merge_options *o, > > > > if (!sha_eq(a->sha1, b->sha1)) > >

Re: [PATCH v13 04/20] index-helper: new daemon for caching index and related stuff

ne > +} Even when NO_MMAP is empty, there might be no Unix sockets available (such as is the case on Windows). In any case, you really only want to skip these tests when index-helper is not available, so would you mind squashing this patch in? -- snipsnap -- From: Johannes Schindelin S

Re: git-credentials-store.exe crash

Hi Peff, it is sad when bug reporters simply delete the part of our bug reporting template that says: "I searched for existing bug reports but did not find any". It saves the reporters a few minutes... and spends the time of you and me in the hour range. In this particular case, the bug report i

Re: [PATCH 0/5] consistent setup code for external commands

Hi Peff, On Fri, 1 Jul 2016, Jeff King wrote: > - for external programs run as "git foo", you get _two_ times. I considered doing this in my work-around, but decided against it because I deemed it too inelegant to call it twice. But your patch series has more benefits than just fixing the ass

Re: [PATCH 2/5] common-main: call git_extract_argv0_path()

Hi Peff, On Fri, 1 Jul 2016, Jeff King wrote: > This has been an accident-waiting-to-happen for a long time, > but wasn't triggered until recently because it involves one > of those programs actually calling system_path(). That > happened with git-credential-store in v2.8.0 with ae5f677 > (lazily

Re: [PATCH 1/5] add an extra level of indirection to main()

Hi Peff, On Fri, 1 Jul 2016, Jeff King wrote: > I waffled between the two mechanisms. Opinions welcome. I am happy you took the cmd_main() approach: we do have to play some tricks on Windows, in particular in some upcoming changes that support building with MS Visual C++ (we want to ensure that

Re: [PATCH 4/9] merge_recursive: abort properly upon errors

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > There are a couple of places where return values indicating errors > > are ignored. Let's teach them manners. > > > > Signed-off-by: Johannes Schindelin

Re: [PATCH 3/9] Prepare the builtins for a libified merge_recursive()

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > A truly libified function does not die() just for fun. > > The sentence is wasting bits. After all, a helper function in > run-once-and-exit program does not die() just for fun, eith

Re: [PATCH 2/9] merge-recursive: clarify code in was_tracked()

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > It can be puzzling to see that was_tracked() tries to match an index > > entry by name even if cache_name_pos() returned a negative value. Let's > > clarify that cache_name_pos

Re: [PATCH 7/9] merge-recursive: handle return values indicating errors

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > diff --git a/merge-recursive.c b/merge-recursive.c > > index 6ab7dfc..bb075e3 100644 > > --- a/merge-recursive.c > > +++ b/merge-recursive.c > > @@ -266,8 +266,10 @@

Re: [PATCH 8/9] merge-recursive: switch to returning errors instead of dying

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > @@ -743,6 +741,8 @@ static int update_file_flags(struct merge_options *o, > > int update_cache, > > int update_wd) > > .

Re: [PATCH 9/9] am: make a direct call to merge_recursive

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > - cp.git_cmd = 1; > > + init_merge_options(&o); > > + > > + o.branch1 = "HEAD"; > > + his_tree_name = xstrfmt("%.*s", linelen

Re: [PATCH 1/5] add an extra level of indirection to main()

Hi Peff, On Fri, 1 Jul 2016, Jeff King wrote: > On Fri, Jul 01, 2016 at 10:04:44AM +0200, Johannes Schindelin wrote: > > > On Fri, 1 Jul 2016, Jeff King wrote: > > > > > I waffled between the two mechanisms. Opinions welcome. > > > > I am happy you took

Re: git svn clone segmentation faul issue

Hi Yannis, On Fri, 1 Jul 2016, Ioannis Kappas wrote: > Johannes Schindelin gmx.de> writes: > > > [...] > > > > My more immediate concern is MSYS2 (the POSIX-emulating basis of Git > > for Windows), and I opened a Pull Request there: > > > > h

Re: [PATCH 5/9] merge-recursive: avoid returning a wholesale struct

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > It is technically allowed, as per C89, for functions' return type to > > be complete structs (i.e. *not* just pointers to structs), but it is > > bad practice. > >

Re: [PATCH 1/9] Report bugs consistently

Hi Peff, On Thu, 30 Jun 2016, Jeff King wrote: > On Thu, Jun 30, 2016 at 10:42:37AM +0200, Johannes Schindelin wrote: > > > > > The vast majority of error messages in Git's source code which report a > > > > bug use the convention to prefix the message with &q

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

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > While developing patch series, it is a good practice to run the test > > suite from time to time, just to make sure that obvious bugs are caught > > early. With complex patch ser

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

Hi Peff, On Thu, 30 Jun 2016, Jeff King wrote: > On Wed, Jun 29, 2016 at 09:02:37AM +0200, Johannes Schindelin wrote: > > > It is the most convenient way to determine which tests failed after > > running the entire test suite, in parallel, to look for left-over &quo

Re: [PATCH 5/5] Skip blank lines when matching ^{/foo}

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > When trying to match a pattern in the commit subject, simply skip leading > > blank lines in the commit message. This is consistent with the > > pretty-printing machinery: it silent

Re: [PATCH 1/5] add an extra level of indirection to main()

Hi Peff, On Fri, 1 Jul 2016, Jeff King wrote: > On Fri, Jul 01, 2016 at 03:39:03PM +0200, Johannes Schindelin wrote: > > > > The description was sufficiently long that I didn't want to try > > > repeating it, and opted for a reference instead. If you're plann

Re: [PATCH 2/9] merge-recursive: clarify code in was_tracked()

Hi Junio, On Fri, 1 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > I would like to propose this diff instead (it is larger, but with a net > > savings of one line): > > > > -- snipsnap -- > > diff --git a/merge-recursive.c b/merge-re

Re: [PATCH 3/9] Prepare the builtins for a libified merge_recursive()

Hi Junio, On Fri, 1 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> > A truly libified function does not die() just for fun. > >> > >> The sentence is wasting bits. After all, a helper function in > >> run-once-and-exi

Re: preview: What's cooking in git.git (Jun 2016, #10; Tue, 28)

Hi Junio, On Wed, 29 Jun 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Tue, 28 Jun 2016, Junio C Hamano wrote: > > > >> * jk/ansi-color (2016-06-23) 7 commits > >> (merged to 'next' on 2016-06-28 at 354989c) > >>

Re: [PATCH 1/9] Report bugs consistently

Hi Duy, On Sat, 2 Jul 2016, Duy Nguyen wrote: > On Wed, Jun 29, 2016 at 1:36 PM, Johannes Schindelin > wrote: > > @@ -955,9 +955,8 @@ static struct merge_file_info merge_file_1(struct > > merge_options *o, > > > >

Re: [PATCH 2/2] t3404: add a test for the --gpg-sign option

Hi Junio, On Fri, 1 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> that has a substring '-S"' in it to ensure that the codepath to > >> parse --gpg-sign= on the command line of "rebase", and to the > >> message we

Re: What's cooking in git.git (Jul 2016, #01; Fri, 1)

Hi, On Fri, 1 Jul 2016, Junio C Hamano wrote: > * jk/common-main-2.8 (2016-07-01) 5 commits > - common-main: call git_setup_gettext() > - common-main: call restore_sigpipe_to_default() > - common-main: call sanitize_stdfds() > - common-main: call git_extract_argv0_path() > - add an extra lev

Re: What's cooking in git.git (Jul 2016, #01; Fri, 1)

Hi Junio, On Fri, 1 Jul 2016, Junio C Hamano wrote: > * jc/t2300-setup (2016-06-22) 1 commit > (merged to 'next' on 2016-06-28 at 62b902a) > + t2300: "git --exec-path" is not usable in $PATH on Windows as-is > > Portability fix for Windows. > > Will merge to 'master'. Would you mind cherr

Re: [PATCH v13 04/20] index-helper: new daemon for caching index and related stuff

Hi Duy, On Thu, 30 Jun 2016, Duy Nguyen wrote: > On Thu, Jun 30, 2016 at 3:06 PM, Johannes Schindelin > wrote: > > Even when NO_MMAP is empty, there might be no Unix sockets available (such > > as is the case on Windows). In any case, you really only want to skip > >

Re: [PATCH 4/9] merge_recursive: abort properly upon errors

Hi Junio, On Fri, 1 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> > saved_b2 = o->branch2; > >> > o->branch1 = "Temporary merge branch 1"; > >> &g

Re: [PATCH v14 00/21] index-helper/watchman

Hi Dave, On Sun, 3 Jul 2016, David Turner wrote: > This addresses comments on v13: > removed unnecessary no_mmap ifdef > add an ifdef in unix-socket > OS X fix for select() > test improvement Thanks. Would you mind re-sending 20 & 21, they seem to have gotten lost. Or is there a public reposito

Re: [PATCH v14 00/21] index-helper/watchman

Hi Dave, On Sun, 3 Jul 2016, Johannes Schindelin wrote: > On Sun, 3 Jul 2016, David Turner wrote: > > > This addresses comments on v13: > > removed unnecessary no_mmap ifdef > > add an ifdef in unix-socket > > OS X fix for select() > > test improvement

Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.8.4

Hi Fabio, On Mon, 4 Jul 2016, Fabio Porcedda wrote: > How i can download the version 2.8.4? > Trough the download link https://git-for-windows.github.io/ it's available > only the latest version. Please click on the "repository" link in the header of that web site. This will take you to the Gi

Re: Missing Package in git Installation Instructions (git-scm.com)

Hi Chris, On Tue, 5 Jul 2016, Christoph Michelbach wrote: > Hi, I noticed that the instructions on https://git-scm.com/book/en/v2/G > etting-Started-Installing-Git don't work without dh-autoreconf > installed on an apt-get system which isn't listed on that site. Can you > fix that or tell me whom

Re: GIT Integration with Siebel

Hi Tarun, On Tue, 5 Jul 2016, tarun patanwar wrote: > We are trying to integrate GIT with Siebel 8.1 for source code control. > We are not able to progress further since there seems to be no > documentation available for the same. Would you kindly explain what Siebel is, and what purpose the bat

[PATCH v2 02/17] Report bugs consistently

nt with the de facto rule. Signed-off-by: Johannes Schindelin --- builtin/ls-files.c | 3 ++- builtin/update-index.c | 2 +- grep.c | 8 imap-send.c| 4 ++-- merge-recursive.c | 15 +++ sha1_file.c| 4 ++-- trailer

[PATCH v2 04/17] merge-recursive: clarify code in was_tracked()

exact match do we need to look harder for any matching entry in stage 2. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 19 +-- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index e51f8fc..66ce27c 100644 --- a/

[PATCH v2 03/17] Avoid translating bug messages

patch. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 6 +++--- wt-status.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 9849439..e51f8fc 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -956,7 +

[PATCH v2 00/17] Use merge_recursive() directly in the builtin am

. Now that I addressed concerns such as fixing translated bug reports, I would appreciate thorough reviews with a focus on the critical parts of the code, those that could result in regressions. Johannes Schindelin (17): Verify that `git pull --rebase` shows the helpful advice when failin

[PATCH v2 01/17] Verify that `git pull --rebase` shows the helpful advice when failing

Signed-off-by: Johannes Schindelin --- t/t5520-pull.sh | 30 ++ 1 file changed, 30 insertions(+) diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 3159956..b281d6f 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -255,6 +255,36 @@ test_expect_success

[PATCH v2 14/17] merge-recursive: write the commit title in one go

Signed-off-by: Johannes Schindelin --- merge-recursive.c | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 0eb23a6..81836f2 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -191,25 +191,26 @@ static voi

[PATCH v2 10/17] merge-recursive: switch to returning errors instead of dying

re already prepared to detect negative return values to indicate errors and to behave as previously: exit with code 128 (which is the same thing that die() does, after printing the message). Signed-off-by: Johannes Schindelin --- merge-recursive.c | 59 +++-

[PATCH v2 06/17] merge_recursive: abort properly upon errors

There are a couple of places where return values indicating errors are ignored. Let's teach them manners. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 66

[PATCH v2 15/17] merge-recursive: offer an option to retain the output in 'obuf'

error messages into the output buffer when the caller asked not to flush the output buffer, for two reasons: 1) to retain the correct output order, and 2) to allow the caller to suppress *all* output. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 17 + merge-recursive.h

[PATCH v2 11/17] am: counteract gender bias

ance of the Git developer community. Let's start changing that by using the variable name "her_tree" for an equal number of years out of fairness, and change to the gender neutral "their_tree" after that. Signed-off-by: Johannes Schindelin --- builtin/am.c | 16 ++

[PATCH v2 17/17] merge-recursive: flush output buffer even when erroring out

buffers are flushed even when the return value indicates an error. The first two changes were introduced through earlier commits in this patch series, and this commit addresses the third one. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1

[PATCH v2 05/17] Prepare the builtins for a libified merge_recursive()

ater patch. Signed-off-by: Johannes Schindelin --- builtin/checkout.c | 4 +++- builtin/merge.c| 2 ++ sequencer.c| 4 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index c3486bd..14312f7 100644 --- a/builtin/checkout.c +++

[PATCH v2 12/17] am -3: use merge_recursive() directly again

of Git's functions. Therefore, the error value -1 naturally is handled correctly, and we do not have to take care of it specifically. Signed-off-by: Johannes Schindelin --- builtin/am.c | 49 - 1 file changed, 16 insertions(+), 33 deletions(-)

[PATCH v2 07/17] merge-recursive: avoid returning a wholesale struct

duced such a return type. Besides, by converting this construct to pass in the struct, we can now start returning a value that can indicate errors in future patches. This will help the current effort to libify merge-recursive.c. Signed-off-by: Johannes Schindelin --- merge-recursive.c

[PATCH v2 08/17] merge-recursive: allow write_tree_from_memory() to error out

It is possible that a tree cannot be written (think: disk full). We will want to give the caller a chance to clean up instead of letting the program die() in such a case. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

[PATCH v2 13/17] merge-recursive: flush output buffer before printing error messages

or further processing by the caller. If the caller asked for that, we will then also write the error messages into the output buffer. This is necessary to give the caller more control not only how to react in case of errors but also control how/if to display the error messages. Signed-off-by

[PATCH v2 16/17] Ensure that the output buffer is released after calling merge_trees()

, because we exited after the operation anyway. Ever since cherry-pick learned to pick a commit range, however, this memory leak had the potential of becoming a problem. Signed-off-by: Johannes Schindelin --- builtin/checkout.c | 1 + merge-recursive.c | 2 ++ sequencer.c| 1 + 3 files changed

[PATCH v2 09/17] merge-recursive: handle return values indicating errors

e for the next patch where we will convert all of the die() calls in the same function to go through the free_buf return path instead. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 196 +- 1 file changed, 121 insertions(+), 75 dele

Re: GIT Integration with Siebel

Hi Tarun, On Tue, 5 Jul 2016, tarun patanwar wrote: > Siebel is a Oracle Product for CRM implementation, just like SAP and > SalesForce. So Siebel as a product provides option to integrate any > third party Source Control tool with it. > > Integration between Siebel and Source Control tool is fa

Re: [PATCH 1/9] Report bugs consistently

Hi Duy, On Sat, 2 Jul 2016, Duy Nguyen wrote: > You're changing the string and adding more work to translators. So > either leave the string untouched, or drop _(). Thanks. I addressed that concern in v2. Could you please now have a look at the parts of the patch series which could possibly regr

Re: topological index field for commit objects

Hi Peff, On Wed, 29 Jun 2016, Jeff King wrote: > I haven't thought hard specifically about merge bases computation, so > perhaps that is a case that isn't helped at all. I guess it is not helped by generation numbers. But then, we often ask: "is commit A an ancestor of commit B" e.g. to check w

[PATCH] revert: clarify seemingly bogus OPT_END repetition

ed by inserting a simple and clear comment. Signed-off-by: Johannes Schindelin --- Another patch from the rebase--helper queue. Published-As: https://github.com/dscho/git/releases/tag/clarify-opt-end-v1 builtin/revert.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/rever

Re: [PATCH v2 02/17] Report bugs consistently

Hi Kuba, On Tue, 5 Jul 2016, Jakub Narębski wrote: > W dniu 2016-07-05 o 13:23, Johannes Schindelin pisze: > > diff --git a/builtin/ls-files.c b/builtin/ls-files.c > > index f02e3d2..00ea91a 100644 > > --- a/builtin/ls-files.c > > +++ b/builtin/ls-files.c > >

reflogs and worktrees?

Hi Duy, ever since I started working extensively with worktrees, I end up with these funny gc problems, like broken links and stale reflogs. Is it maybe possible that the reflogs (which are per-worktree now) are not traversed completely when gc'ing (which is *not* per-worktree)? Ciao, Dscho -- T

Re: [PATCH] revert: clarify seemingly bogus OPT_END repetition

Hi Peff & Jacob, On Tue, 5 Jul 2016, Jacob Keller wrote: > On Tue, Jul 5, 2016 at 1:44 PM, Jeff King wrote: > > On Tue, Jul 05, 2016 at 04:28:20PM -0400, Jeff King wrote: > > > > Something like the patch below. > > > > I admit this isn't buggy _now_, so this is potentially just churn. It > > doe

Re: [PATCH] revert: clarify seemingly bogus OPT_END repetition

Hi Peff, On Tue, 5 Jul 2016, Jeff King wrote: > By the way, I notice that the error message when concat fails is just: > > if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra)) > die(_("program error")); > > Should this become: > > die("BUG: not enough room to conca

Re: [PATCH] revert: clarify seemingly bogus OPT_END repetition

Hi Peff, On Tue, 5 Jul 2016, Jeff King wrote: > + ALLOC_ARRAY(ret, st_add3(a_len, b_len, 1)); > + for (i = 0; i < a_len; i++) > + ret[i] = a[i]; > + for (i = 0; i < b_len; i++) > + ret[a_len + i] = b[i]; > + ret[a_len + b_len] = b[b_len]; /* final OPTION_EN

Re: [PATCH v14 15/21] index-helper: kill mode

Hi Dave, On Sun, 3 Jul 2016, David Turner wrote: > @@ -357,10 +359,29 @@ static const char * const usage_text[] = { > NULL > }; > > +static void request_kill(void) > +{ > + int fd = unix_stream_connect(git_path("index-helper.sock")); > + > + if (fd >= 0) { > + write_i

Over-/underquoting, was Re: [PATCH] revert: clarify seemingly bogus OPT_END repetition

Hi Michael, On Wed, 6 Jul 2016, Michael J Gruber wrote: > Johannes Schindelin venit, vidit, dixit 06.07.2016 09:01: > > > BTW Jacob, would you terribly mind cutting the quoted parts properly (I > > cut 112 lines)? It may not seem like much, but I seem to spend more and > &g

Re: What's cooking in git.git (Jul 2016, #01; Fri, 1)

Hi Junio, On Wed, 6 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Fri, 1 Jul 2016, Junio C Hamano wrote: > > > >> * jc/t2300-setup (2016-06-22) 1 commit > >> (merged to 'next' on 2016-06-28 at 62b902a) > >>

Re: [PATCH 2/2] t3404: add a test for the --gpg-sign option

Hi Junio, On Wed, 6 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Of course I agree that it would be very nice to have a test at a later > > stage that does exercise GPG if it is available. But would it really > > be so terrible to have a (simple

Re: [PATCH 0/5] consistent setup code for external commands

Hi Junio, On Wed, 6 Jul 2016, Junio C Hamano wrote: > I think that amounts to the following single patch, which I cherry > picked from the topic in Dscho's repository he mentioned earlier. That patch would be fine by me, too. Thanks, Dscho -- To unsubscribe from this list: send the line "unsubs

Re: [PATCH v2 00/17] Use merge_recursive() directly in the builtin am

Hi Junio, On Wed, 6 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > This is the second iteration of the long-awaited re-roll of the attempt to > > avoid spawning merge-recursive from the builtin am and use merge_recursive() > > directly instead. >

Re: [PATCH 2/9] merge-recursive: clarify code in was_tracked()

Hi Junio, On Wed, 6 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > To understand why we're not done yet, the crucial point is *not* that the > > return value encodes the insert position. The crucial point is that > > despite asking for an in

Re: [PATCH v2 02/17] Report bugs consistently

Hi Duy, On Wed, 6 Jul 2016, Duy Nguyen wrote: > On Tue, Jul 5, 2016 at 1:23 PM, Johannes Schindelin > wrote: > > The vast majority of error messages in Git's source code which report a > > bug use the convention to prefix the message with "BUG:". > > >

Re: [PATCH v2 11/17] am: counteract gender bias

Hi Junio, On Wed, 6 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), i.e. for > > almost 11 years already,... > > ...Let's start changing that by using the variable name "he

[PATCH] am: counteract gender bias

ance of the Git developer community. Let's start changing that by using the variable name "her_tree" for an equal number of years out of fairness, and change to the gender neutral "their_tree" after that. Signed-off-by: Johannes Schindelin --- Published-As: https://githu

Re: [PATCH v14 21/21] mailmap: use main email address for dturner

Hi, On Wed, 6 Jul 2016, Junio C Hamano wrote: > David Turner writes: > > > Signed-off-by: David Turner > > --- > > .mailmap | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/.mailmap b/.mailmap > > index e5b4126..edcae89 100644 > > --- a/.mailmap > > +++ b/.mailmap > > @@ -46,6 +

Re: [PATCH] am: counteract gender bias

Hi Mike, On Thu, 7 Jul 2016, Mike Hommey wrote: > On Thu, Jul 07, 2016 at 01:47:19PM +0200, Johannes Schindelin wrote: > > Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), i.e. for > > almost 11 years already, we demonstrated our disrespect to the pioneers

Re: [PATCH] am: counteract gender bias

Hi Kuba, On Thu, 7 Jul 2016, Jakub Narębski wrote: > Instead of nebulous "fairness" (i.e., be unfair in other direction), > [...] There is nothing nebulous about it. Ciao, Dscho

[PATCH v3 02/16] Report bugs consistently

nt with the de facto rule. Signed-off-by: Johannes Schindelin --- builtin/ls-files.c | 3 ++- builtin/update-index.c | 2 +- grep.c | 8 imap-send.c| 4 ++-- merge-recursive.c | 15 +++ sha1_file.c| 4 ++-- trailer

[PATCH v3 00/16] Use merge_recursive() directly in the builtin am

v2 rebased on top of pu (resolving many merge conflicts in the process that are hidden from the interdiff) This patch series touches rather important code. Now that I addressed concerns such as fixing translated bug reports, I would appreciate thorough reviews with a focus on the critical part

[PATCH v3 14/16] merge-recursive: offer an option to retain the output in 'obuf'

error messages into the output buffer when the caller asked not to flush the output buffer, for two reasons: 1) to retain the correct output order, and 2) to allow the caller to suppress *all* output. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 17 + merge-recursive.h

[PATCH v3 01/16] Verify that `git pull --rebase` shows the helpful advice when failing

Signed-off-by: Johannes Schindelin --- t/t5520-pull.sh | 30 ++ 1 file changed, 30 insertions(+) diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 5d4880e..217b416 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -255,6 +255,36 @@ test_expect_success

[PATCH v3 03/16] Avoid translating bug messages

patch. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 05b9789..ea0df22 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -983,7 +983,7 @@ static struct

[PATCH v3 07/16] merge-recursive: avoid returning a wholesale struct

duced such a return type. Besides, by converting this construct to pass in the struct, we can now start returning a value that can indicate errors in future patches. This will help the current effort to libify merge-recursive.c. Signed-off-by: Johannes Schindelin --- merge-recursive.c

[PATCH v3 10/16] merge-recursive: switch to returning errors instead of dying

re already prepared to detect negative return values to indicate errors and to behave as previously: exit with code 128 (which is the same thing that die() does, after printing the message). Signed-off-by: Johannes Schindelin --- merge-recursive.c | 63 +++-

[PATCH v3 12/16] merge-recursive: flush output buffer before printing error messages

or further processing by the caller. If the caller asked for that, we will then also write the error messages into the output buffer. This is necessary to give the caller more control not only how to react in case of errors but also control how/if to display the error messages. Signed-off-by

[PATCH v3 04/16] merge-recursive: clarify code in was_tracked()

exact match do we need to look harder for any matching entry in stage 2. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 30 ++ 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index ea0df22..469741d 1

[PATCH v3 06/16] merge_recursive: abort properly upon errors

There are a couple of places where return values indicating errors are ignored. Let's teach them manners. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 46

[PATCH v3 11/16] am -3: use merge_recursive() directly again

Git's functions. Therefore, the error value -1 naturally is handled correctly, and we do not have to take care of it specifically. Signed-off-by: Johannes Schindelin --- builtin/am.c | 63 ++-- 1 file changed, 23 insertions(+), 40

[PATCH v3 09/16] merge-recursive: handle return values indicating errors

e for the next patch where we will convert all of the die() calls in the same function to go through the free_buf return path instead. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 199 +- 1 file changed, 123 insertions(+), 76 dele

[PATCH v3 08/16] merge-recursive: allow write_tree_from_memory() to error out

It is possible that a tree cannot be written (think: disk full). We will want to give the caller a chance to clean up instead of letting the program die() in such a case. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

[PATCH v3 05/16] Prepare the builtins for a libified merge_recursive()

ater patch. Signed-off-by: Johannes Schindelin --- builtin/checkout.c | 4 +++- builtin/merge.c| 2 ++ sequencer.c| 4 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 27c1a05..07dea3b 100644 --- a/builtin/checkout.c +++

[PATCH v3 13/16] merge-recursive: write the commit title in one go

Signed-off-by: Johannes Schindelin --- merge-recursive.c | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 205ea04..ad5b961 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -191,25 +191,26 @@ static voi

[PATCH v3 15/16] Ensure that the output buffer is released after calling merge_trees()

, because we exited after the operation anyway. Ever since cherry-pick learned to pick a commit range, however, this memory leak had the potential of becoming a problem. Signed-off-by: Johannes Schindelin --- builtin/checkout.c | 1 + merge-recursive.c | 2 ++ sequencer.c| 1 + 3 files changed

[PATCH v3 16/16] merge-recursive: flush output buffer even when erroring out

buffers are flushed even when the return value indicates an error. The first two changes were introduced through earlier commits in this patch series, and this commit addresses the third one. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1

Re: [PATCH 2/2] t3404: add a test for the --gpg-sign option

Hi Junio, On Wed, 6 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Okay, so here is the deal: on the development machine where this was > > developed, I do not have gpg installed. So please take this test case just > > to make sure that things

[PATCH v2 3/3] rebase -i: we allow extra spaces after fixup!/squash!

x27;s law by being lenient. Signed-off-by: Johannes Schindelin --- t/t3415-rebase-autosquash.sh | 9 + 1 file changed, 9 insertions(+) diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index 9b71a49..48346f1 100755 --- a/t/t3415-rebase-autosquash.sh +++ b/t/t3415-r

[PATCH v2 2/3] rebase -i: demonstrate a bug with --autosquash

. The upcoming rebase--helper patches will address this bug, therefore we do not need to make the current autosquash code even more complex than it already is, just to fix this bug. Signed-off-by: Johannes Schindelin --- t/t3415-rebase-autosquash.sh | 24 1 file changed

[PATCH v2 1/3] t3404: add a test for the --gpg-sign option

;edit' operation. We really should test that the interactive rebase signs the commits properly, iff GPG is available. This test is left for later. Signed-off-by: Johannes Schindelin --- t/t3404-rebase-interactive.sh | 8 1 file changed, 8 insertions(+) diff --git a/t/t3

[PATCH v2 0/3] Additional rebase -i tests

introduce a regression (this test actually helped me debug and fix a regression in some previous revision of the rebase--helper) Johannes Schindelin (3): t3404: add a test for the --gpg-sign option rebase -i: demonstrate a bug with --autosquash rebase -i: we allow extra spaces after

Re: [PATCH v2 11/17] am: counteract gender bias

Hi Junio, On Thu, 7 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> I doubt this kind fo distraction is desirable in the middle of a > >> seriously heavy series like this one. As a standalone clean-up to > >> turn these directly to &quo

Re: [PATCH] Add very verbose porcelain output to status

Hi, On Thu, 7 Jul 2016, Jeff Hostetler wrote: > Tools interacting with Git repositories may need to know the complete > state of the working directory. For efficiency, it would be good to have > a single command to obtain this information. > > We already have a `--porcelain` mode intended for to

<    1   2   3   4   5   6   7   8   9   10   >