mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sam Ravnborg <sam@ravnborg.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: David Miller <davem@davemloft.net>,
	jeremy@goop.org, torvalds@linux-foundation.org,
	linux-kernel@vger.kernel.org, gitster@pobox.com,
	caglar@pardus.org.tr
Subject: Re: [PATCH] Add *.rej to .gitignore
Date: Wed, 18 Feb 2009 01:40:39 +0100	[thread overview]
Message-ID: <20090218004039.GA30812@uranus.ravnborg.org> (raw)
In-Reply-To: <20090218000506.GB12714@elte.hu>

> > From: Jeremy Fitzhardinge <jeremy@goop.org>
> > Date: Tue, 17 Feb 2009 11:59:37 -0800
> > 
> > > *.rej files really are unwanted.  If there are any .rej files, they can be found by
> > > some other means (perhaps git itself could warn when committing with *.rej files present,
> > > or add some distinct notion of "ignored files" vs "never commit" files).
> > > 
> > > (This effectively reverts 1f5d3a6b6532e25a5cdf1f311956b2b03d343a48)
> > > 
> > > Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
> > 
> > I don't know about this.
> > 
> > I really want to know if there are reject files there if I am 
> > checking to see if my tree is clean.
> > 
> > This has caught many patch application errors for myself 
> > personally in the past, so I really don't want git to start 
> > silently ignoring those things.
> > 
> > People should delete reject file explicitly, as they are 
> > evidence of a patch that would not apply cleanly.  If you 
> > abort trying to add the patch, fine, but cleaning up the 
> > reject files is part of that operation.
> 
> Well, it depends on the workflow. You are making the assumption 
> that everyone is using your workflow, and you are judging them 
> based on that false assumption.
> 
> In my workflow i never miss .rej files because i use tools that 
> _do not allow_ rejects to occur - only if i intentionally force 
> them. So i cannot "miss" any .rej files - i generate them very 
> consciously so all my attention is on them already.
So in your advanced usage it does not matter what git does
with .rej files.
And it hepls people using git in a more naive way.

This is an easy judgement - lets do what benefit the most.

	Sam

  reply	other threads:[~2009-02-18  0:39 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-17 19:59 Jeremy Fitzhardinge
2009-02-17 20:08 ` Sam Ravnborg
2009-02-17 21:16 ` Linus Torvalds
2009-02-17 21:36   ` Ingo Molnar
2009-02-17 22:20   ` Alexey Dobriyan
2009-02-17 22:38 ` David Miller
2009-02-18  0:05   ` Ingo Molnar
2009-02-18  0:40     ` Sam Ravnborg [this message]
2009-02-18  0:49       ` Ingo Molnar
2009-02-18  1:05         ` David Miller
2009-02-18 15:21         ` Stefan Richter
     [not found] <c6Eh1-7Og-19@gated-at.bofh.it>
     [not found] ` <c6GLO-3xO-35@gated-at.bofh.it>
     [not found]   ` <c6IaO-60k-5@gated-at.bofh.it>
2009-02-19 20:25     ` Bodo Eggert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090218004039.GA30812@uranus.ravnborg.org \
    --to=sam@ravnborg.org \
    --cc=caglar@pardus.org.tr \
    --cc=davem@davemloft.net \
    --cc=gitster@pobox.com \
    --cc=jeremy@goop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®