1. 28 Nov, 2016 3 commits
    • Duy Nguyen's avatar
      worktree list: keep the list sorted · 4df1d4d4
      Duy Nguyen authored
      It makes it easier to write tests for. But it should also be good for
      the user since locating a worktree by eye would be easier once they
      notice this.
      Signed-off-by: Duy Nguyen's avatarNguyễn Thái Ngọc Duy <pclouds@gmail.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      4df1d4d4
    • Duy Nguyen's avatar
      worktree.c: get_worktrees() takes a new flag argument · 4fff1ef7
      Duy Nguyen authored
      This is another no-op patch, in preparation for get_worktrees() to do
      optional things, like sorting.
      Signed-off-by: Duy Nguyen's avatarNguyễn Thái Ngọc Duy <pclouds@gmail.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      4fff1ef7
    • Duy Nguyen's avatar
      get_worktrees() must return main worktree as first item even on error · a234563a
      Duy Nguyen authored
      This is required by git-worktree.txt, stating that the main worktree is
      the first line (especially in --porcelain mode when we can't just change
      behavior at will).
      
      There's only one case when get_worktrees() may skip main worktree, when
      parse_ref() fails. Update the code so that we keep first item as main
      worktree and return something sensible in this case:
      
       - In user-friendly mode, since we're not constraint by anything,
         returning "(error)" should do the job (we already show "(detached
         HEAD)" which is not machine-friendly). Actually errors should be
         printed on stderr by parse_ref() (*)
      
       - In plumbing mode, we do not show neither 'bare', 'detached' or
         'branch ...', which is possible by the format description if I read
         it right.
      
      Careful readers may realize that when the local variable "head_ref" in
      get_main_worktree() is emptied, add_head_info() will do nothing to
      wt->head_sha1. But that's ok because head_sha1 is zero-ized in the
      previous patch.
      
      (*) Well, it does not. But it's supposed to be a stop gap implementation
          until we can reuse refs code to parse "ref: " stuff in HEAD, from
          resolve_refs_unsafe(). Now may be the time since refs refactoring is
          mostly done.
      Signed-off-by: Duy Nguyen's avatarNguyễn Thái Ngọc Duy <pclouds@gmail.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      a234563a
  2. 23 Nov, 2016 1 commit
  3. 14 Oct, 2016 1 commit
  4. 12 Jul, 2016 1 commit
  5. 08 Jul, 2016 1 commit
  6. 13 Jun, 2016 1 commit
  7. 04 Jun, 2016 2 commits
  8. 24 May, 2016 2 commits
  9. 06 May, 2016 1 commit
    • Li Peng's avatar
      typofix: assorted typofixes in comments, documentation and messages · 832c0e5e
      Li Peng authored
      Many instances of duplicate words (e.g. "the the path") and
      a few typoes are fixed, originally in multiple patches.
      
          wildmatch: fix duplicate words of "the"
          t: fix duplicate words of "output"
          transport-helper: fix duplicate words of "read"
          Git.pm: fix duplicate words of "return"
          path: fix duplicate words of "look"
          pack-protocol.txt: fix duplicate words of "the"
          precompose-utf8: fix typo of "sequences"
          split-index: fix typo
          worktree.c: fix typo
          remote-ext: fix typo
          utf8: fix duplicate words of "the"
          git-cvsserver: fix duplicate words
      Signed-off-by: default avatarLi Peng <lip@dtdream.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      832c0e5e
  10. 22 Apr, 2016 7 commits
  11. 19 Jan, 2016 1 commit
  12. 08 Oct, 2015 3 commits
  13. 02 Oct, 2015 1 commit