1. 31 Aug, 2010 3 commits
    • Junio C Hamano's avatar
      git log/diff: add -G<regexp> that greps in the patch text · f506b8e8
      Junio C Hamano authored
      Teach "-G<regexp>" that is similar to "-S<regexp> --pickaxe-regexp" to the
      "git diff" family of commands.  This limits the diff queue to filepairs
      whose patch text actually has an added or a deleted line that matches the
      given regexp.  Unlike "-S<regexp>", changing other parts of the line that
      has a substring that matches the given regexp IS counted as a change, as
      such a change would appear as one deletion followed by one addition in a
      patch text.
      
      Unlike -S (pickaxe) that is intended to be used to quickly detect a commit
      that changes the number of occurrences of hits between the preimage and
      the postimage to serve as a part of larger toolchain, this is meant to be
      used as the top-level Porcelain feature.
      
      The implementation unfortunately has to run "diff" twice if you are
      running "log" family of commands to produce patches in the final output
      (e.g. "git log -p" or "git format-patch").  I think we _could_ cache the
      result in-core if we wanted to, but that would require larger surgery to
      the diffcore machinery (i.e. adding an extra pointer in the filepair
      structure to keep a pointer to a strbuf around, stuff the textual diff to
      the strbuf inside diffgrep_consume(), and make use of it in later stages
      when it is available) and it may not be worth it.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      f506b8e8
    • Junio C Hamano's avatar
      diff: pass the entire diff-options to diffcore_pickaxe() · 382f013b
      Junio C Hamano authored
      That would make it easier to give enhanced feature to the
      pickaxe transformation.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      382f013b
    • Junio C Hamano's avatar
      gitdiffcore doc: update pickaxe description · a2c2cef0
      Junio C Hamano authored
      The old text described the original design (one side does not have it at
      all while the other side has it); this was later amended to check if the
      number of occurrences changed, which is what we currently do with -S.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      a2c2cef0
  2. 23 Aug, 2010 1 commit
  3. 22 Aug, 2010 16 commits
  4. 20 Aug, 2010 11 commits
  5. 19 Aug, 2010 5 commits
  6. 18 Aug, 2010 4 commits
    • Junio C Hamano's avatar
      Merge branch 'sp/fix-smart-http-deadlock-on-error' into maint · 0a4139b5
      Junio C Hamano authored
      * sp/fix-smart-http-deadlock-on-error:
        smart-http: Don't deadlock on server failure
      0a4139b5
    • Junio C Hamano's avatar
      Merge branch 'jc/maint-follow-rename-fix' · bd3a97a2
      Junio C Hamano authored
      * jc/maint-follow-rename-fix:
        log: test for regression introduced in v1.7.2-rc0~103^2~2
        diff --follow: do call diffcore_std() as necessary
        diff --follow: do not waste cycles while recursing
      bd3a97a2
    • Junio C Hamano's avatar
      Merge branch 'tf/string-list-init' · 6b5005c8
      Junio C Hamano authored
      * tf/string-list-init:
        string_list: Add STRING_LIST_INIT macro and make use of it.
      6b5005c8
    • Junio C Hamano's avatar
      Merge branch 'cc/find-commit-subject' · 165dc789
      Junio C Hamano authored
      * cc/find-commit-subject:
        blame: use find_commit_subject() instead of custom code
        merge-recursive: use find_commit_subject() instead of custom code
        bisect: use find_commit_subject() instead of custom code
        revert: rename variables related to subject in get_message()
        revert: refactor code to find commit subject in find_commit_subject()
        revert: fix off by one read when searching the end of a commit subject
      165dc789