1. 15 Aug, 2018 1 commit
  2. 30 Jan, 2018 2 commits
  3. 02 Jun, 2017 4 commits
  4. 17 Jan, 2016 1 commit
  5. 12 Jan, 2016 1 commit
    • Mike Hommey's avatar
      notes: allow treeish expressions as notes ref · ee76f92f
      Mike Hommey authored
      init_notes() is the main point of entry to the notes API. It ensures
      that the input can be used as ref, because it needs a ref to update to
      store notes tree after modifying it.
      
      There however are many use cases where notes tree is only read, e.g.
      "git log --notes=...".  Any notes-shaped treeish could be used for such
      purpose, but it is not allowed due to existing restriction.
      
      Allow treeish expressions to be used in the case the notes tree is going
      to be used without write "permissions".  Add a flag to distinguish
      whether the notes tree is intended to be used read-only, or will be
      updated.
      
      With this change, operations that use notes read-only can be fed any
      notes-shaped tree-ish can be used, e.g. git log --notes=notes@{1}.
      Signed-off-by: default avatarMike Hommey <mh@glandium.org>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      ee76f92f
  6. 29 Jul, 2013 1 commit
  7. 18 Oct, 2012 1 commit
  8. 16 Sep, 2012 1 commit
  9. 29 Mar, 2011 3 commits
  10. 17 Nov, 2010 2 commits
    • Johan Herland's avatar
      git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" · a6a09095
      Johan Herland authored
      This new strategy is similar to "concatenate", but in addition to
      concatenating the two note candidates, this strategy sorts the resulting
      lines, and removes duplicate lines from the result. This is equivalent to
      applying the "cat | sort | uniq" shell pipeline to the two note candidates.
      
      This strategy is useful if the notes follow a line-based format where one
      wants to avoid duplicate lines in the merge result.
      
      Note that if either of the note candidates contain duplicate lines _prior_
      to the merge, these will also be removed by this merge strategy.
      
      The patch also contains tests and documentation for the new strategy.
      Signed-off-by: default avatarJohan Herland <johan@herland.net>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      a6a09095
    • Johan Herland's avatar
      notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond · 180619a5
      Johan Herland authored
      The combine_notes_fn functions uses a non-zero return value to indicate
      failure. However, this return value was converted to a call to die()
      in note_tree_insert().
      
      Instead, propagate this return value out to add_note(), and return it
      from there to enable the caller to handle errors appropriately.
      
      Existing add_note() callers are updated to die() upon failure, thus
      preserving the current behaviour. The only exceptions are copy_note()
      and notes_cache_put() where we are able to propagate the add_note()
      return value instead.
      
      This patch has been improved by the following contributions:
      - Jonathan Nieder: Future-proof by always checking add_note() return value
      - Jonathan Nieder: Improve clarity of final if-condition in note_tree_insert()
      
      Thanks-to: Jonathan Nieder <jrnieder@gmail.com>
      Signed-off-by: default avatarJohan Herland <johan@herland.net>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      180619a5
  11. 10 Nov, 2010 3 commits
  12. 31 Aug, 2010 1 commit
  13. 24 Jun, 2010 1 commit
  14. 20 May, 2010 1 commit
  15. 07 Apr, 2010 1 commit
  16. 13 Mar, 2010 3 commits
  17. 14 Feb, 2010 11 commits
  18. 20 Oct, 2009 2 commits