public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

• * Re: Bug#757297: 'git status' output is confusing after 'git add -N'
         [not found] <20140807003449.GC12427@google.com>
  @ 2014-08-07  1:51 ` Duy Nguyen
    2014-08-07 16:31   ` Junio C Hamano
    0 siblings, 1 reply; 2+ messages in thread
  From: Duy Nguyen @ 2014-08-07  1:51 UTC (permalink / raw)
    To: Jonathan Nieder, 757297, Git Mailing List; +Cc: submit
  
  On Thu, Aug 7, 2014 at 7:34 AM, Jonathan Nieder <jrnieder@gmail•com> wrote:
  > Package: git
  > Version: 1:2.0.0-1
  > Tags: upstream
  >
  >   $ git init foo
  >   Initialized empty Git repository in /tmp/t/foo/.git/
  >   $ cd foo
  >   $ echo hi >README
  >   $ git add -N README
  >   $ git status
  >   On branch master
  >
  >   Initial commit
  >
  >   Changes to be committed:
  >     (use "git rm --cached <file>..." to unstage)
  >
  >           new file:   README
  >
  >   Changes not staged for commit:
  >     (use "git add <file>..." to update what will be committed)
  >     (use "git checkout -- <file>..." to discard changes in working directory)
  >
  >           modified:   README
  >
  > If I then run "git commit", it does not actually commit the addition
  > of the README file.
  
  We used to reject such a commit operation before 3f6d56d (commit:
  ignore intent-to-add entries instead of refusing - 2012-02-07) so it
  was harder to misunderstand this case.
  
  > It would be clearer to have a separate section,like so:
  >
  >   Tracked files not to be committed:
  >     (use "git rm --cached <file>..." to stop tracking)
  >
  >            new file:   README
  >
  
  Or make the "Changes not staged for commit" part say "new file:
  README" ("modified" is implied)
  -- 
  Duy
  
  ^ permalink raw reply	[flat|nested] 2+ messages in thread

• • * Re: Bug#757297: 'git status' output is confusing after 'git add -N'
      2014-08-07  1:51 ` Bug#757297: 'git status' output is confusing after 'git add -N' Duy Nguyen
    @ 2014-08-07 16:31   ` Junio C Hamano
      0 siblings, 0 replies; 2+ messages in thread
    From: Junio C Hamano @ 2014-08-07 16:31 UTC (permalink / raw)
      To: Duy Nguyen; +Cc: Jonathan Nieder, 757297, Git Mailing List, submit
    
    Duy Nguyen <pclouds@gmail•com> writes:
    
    > On Thu, Aug 7, 2014 at 7:34 AM, Jonathan Nieder <jrnieder@gmail•com> wrote:
    >> Package: git
    >> Version: 1:2.0.0-1
    >> Tags: upstream
    >>
    >>   $ git init foo
    >>   Initialized empty Git repository in /tmp/t/foo/.git/
    >>   $ cd foo
    >>   $ echo hi >README
    >>   $ git add -N README
    >>   $ git status
    >>   On branch master
    >>
    >>   Initial commit
    >>
    >>   Changes to be committed:
    >>     (use "git rm --cached <file>..." to unstage)
    >>
    >>           new file:   README
    >>
    >>   Changes not staged for commit:
    >>     (use "git add <file>..." to update what will be committed)
    >>     (use "git checkout -- <file>..." to discard changes in working directory)
    >>
    >>           modified:   README
    >>
    >> If I then run "git commit", it does not actually commit the addition
    >> of the README file.
    >
    > We used to reject such a commit operation before 3f6d56d (commit:
    > ignore intent-to-add entries instead of refusing - 2012-02-07) so it
    > was harder to misunderstand this case.
    >
    >> It would be clearer to have a separate section,like so:
    >>
    >>   Tracked files not to be committed:
    >>     (use "git rm --cached <file>..." to stop tracking)
    >>
    >>            new file:   README
    >>
    >
    > Or make the "Changes not staged for commit" part say "new file:
    > README" ("modified" is implied)
    
    Yeah, after reading the justification in the quoted commit, I agree
    that it is status that is at fault in the above; "new file: README"
    is part of "Changes not staged for commit" in this case (it is told
    to the index, but the user never said it is "for commit" yet, which
    is the whole point of "-N"), so instead of adding a new section, I
    agree that it should be classified as "new file" not "modified"
    there.
    
    ^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-08-07 16:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20140807003449.GC12427@google.com>
2014-08-07  1:51 ` Bug#757297: 'git status' output is confusing after 'git add -N' Duy Nguyen
2014-08-07 16:31   ` Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox