1. 01 Aug, 2013 1 commit
  2. 31 Jul, 2013 7 commits
  3. 30 Jul, 2013 3 commits
  4. 29 Jul, 2013 4 commits
    • Ralf Thielow's avatar
      git-rebase: fix typo · ac1998de
      Ralf Thielow authored
      Signed-off-by: default avatarRalf Thielow <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      ac1998de
    • Ramsay Jones's avatar
      commit-slab.h: Fix memory allocation and addressing · d7a1d629
      Ramsay Jones authored
      The slab initialization code includes the calculation of the
      slab 'elem_size', which is in turn used to determine the size
      (capacity) of the slab. Each element of the slab represents an
      array, of length 'stride', of 'elemtype'. (Note that it may be
      clearer if the define_commit_slab macro parameter was called
      'basetype' rather than 'elemtype'). However, the 'elem_size'
      calculation incorrectly uses 'sizeof(struct slabname)' in the
      expression, rather than 'sizeof(elemtype)'.
      
      Within the slab access routine, <slabname>_at(), the given commit
      'index' is transformed into an (slab#, slot#) pair used to address
      the required element (a pointer to the first element of the array
      of 'elemtype' associated with that commit). The current code to
      calculate these address coordinates multiplies the commit index
      by the 'stride' which, at least for the slab#, produces the wrong
      result. Using the commit index directly, without scaling by the
      'stride', produces the correct 'logical' address.
      
      Also, when allocating a new slab, the size of the allocation only
      allows for a slab containing elements of single element arrays of
      'elemtype'. This should allow for elements of an array of length
      'stride' of 'elemtype'. In order to fix this, we need to change
      the element size parameter to xcalloc() by multiplying the current
      element size (sizeof(**s->slab)) by the s->stride.
      
      Having changed the calculation of the slot#, we now need to convert
      the logical 'nth_slot', by scaling with s->stride, into the correct
      physical address.
      Signed-off-by: default avatarRamsay Jones <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      d7a1d629
    • Jeff King's avatar
      commit: tweak empty cherry pick advice for sequencer · c17592a7
      Jeff King authored
      When we refuse to make an empty commit, we check whether we
      are in a cherry-pick in order to give better advice on how
      to proceed. We instruct the user to repeat the commit with
      "--allow-empty" to force the commit, or to use "git reset"
      to skip it and abort the cherry-pick.
      
      In the case of a single cherry-pick, the distinction between
      skipping and aborting is not important, as there is no more
      work to be done afterwards.  When we are using the sequencer
      to cherry pick a series of commits, though, the instruction
      is confusing: does it skip this commit, or does it abort the
      rest of the cherry-pick?
      
      It does skip, after which the user can continue the
      cherry-pick. This is the right thing to be advising the user
      to do, but let's make it more clear what will happen, both
      by using the word "skip", and by mentioning that the rest of
      the sequence can be continued via "cherry-pick --continue"
      (whether we skip or take the commit).
      Noticed-by: default avatarRamkumar Ramachandra <[email protected]>
      Helped-by: default avatarJonathan Nieder <[email protected]>
      Signed-off-by: default avatarJeff King <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      c17592a7
    • Daniele Segato's avatar
      docs/git-tag: explain lightweight versus annotated tags · 29d55538
      Daniele Segato authored
      Stress the difference between the two with a suggestion on
      when the user should use one in place of the other.
      Signed-off-by: Daniele Segato's avatarDaniele Segato <[email protected]>
      Signed-off-by: default avatarJeff King <[email protected]>
      Reviewed-by: default avatarJonathan Nieder <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      29d55538
  5. 26 Jul, 2013 2 commits
  6. 25 Jul, 2013 15 commits
    • Jeff King's avatar
      commit.h: drop redundant comment · 8f6a3e5d
      Jeff King authored
      We mention twice that the from_ident field of struct
      pretty_print_context is internal.
      
      The first comment was added by 10f2fbff, which prepares the
      struct for internal fields, and then the second by a9080475,
      which actually adds such a field. This was a mistake made
      when re-rolling the series on the list; the comment should
      have been removed from the latter commit.
      Signed-off-by: default avatarJeff King <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      8f6a3e5d
    • Junio C Hamano's avatar
      Git 1.8.4-rc0 · c490a607
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      c490a607
    • Junio C Hamano's avatar
      Merge branch 'mh/multimail' · 9e8a901e
      Junio C Hamano authored
      An enhanced "post-receive" hook to send e-mail messages.
      
      * mh/multimail:
        post-receive-email: deprecate script in favor of git-multimail
        git-multimail: an improved replacement for post-receive-email
      9e8a901e
    • Junio C Hamano's avatar
      Merge branch 'ob/typofixes' · 0def7126
      Junio C Hamano authored
      * ob/typofixes:
        typofix: in-code comments
        typofix: documentation
        typofix: release notes
      0def7126
    • Junio C Hamano's avatar
      Merge branch 'es/contacts' · 4274cdf4
      Junio C Hamano authored
      A helper to read from a set of format-patch output files or a range
      of commits and find those who may have insights to the code that
      the changes touch by running a series of "git blame" commands.
      
      * es/contacts:
        contrib: contacts: add documentation
        contrib: contacts: add mailmap support
        contrib: contacts: interpret committish akin to format-patch
        contrib: contacts: add ability to parse from committish
        contrib: add git-contacts helper
      4274cdf4
    • Junio C Hamano's avatar
      Merge branch 'ml/cygwin-updates' · f01723aa
      Junio C Hamano authored
      The tip one does _not_ revert c869753e (Force core.filemode to
      false on Cygwin., 2006-12-30) on purpose, so that people can
      still retain the old behaviour if they wanted to.
      
      * ml/cygwin-updates:
        cygwin: stop forcing core.filemode=false
        Cygwin 1.7 supports mmap
        Cygwin 1.7 has thread-safe pread
        Cygwin 1.7 needs compat/regex
      f01723aa
    • Junio C Hamano's avatar
      Merge branch 'rj/sparse' · fc5894bc
      Junio C Hamano authored
      * rj/sparse:
        Revert "compat/unsetenv.c: Fix a sparse warning"
      fc5894bc
    • Junio C Hamano's avatar
      Merge branch 'sb/traverse-trees-bitmask-variable-name' · cb182465
      Junio C Hamano authored
      * sb/traverse-trees-bitmask-variable-name:
        traverse_trees(): clarify return value of the callback
      cb182465
    • Junio C Hamano's avatar
      Merge branch 'jk/cat-file-batch-optim' · 356df9bd
      Junio C Hamano authored
      If somebody wants to only know on-disk footprint of an object
      without having to know its type or payload size, we can bypass a
      lot of code to cheaply learn it.
      
      * jk/cat-file-batch-optim:
        Fix some sparse warnings
        sha1_object_info_extended: pass object_info to helpers
        sha1_object_info_extended: make type calculation optional
        packed_object_info: make type lookup optional
        packed_object_info: hoist delta type resolution to helper
        sha1_loose_object_info: make type lookup optional
        sha1_object_info_extended: rename "status" to "type"
        cat-file: disable object/refname ambiguity check for batch mode
      356df9bd
    • Junio C Hamano's avatar
      Merge branch 'ml/avoid-using-grep-on-crlf-files' · 2bf35011
      Junio C Hamano authored
      On systems that understand a CRLF as a line ending, tests in this
      script that worked on files with CRLF line endings using "grep" to
      extract matching lines may lose the CR at the end of lines that
      match, causing the actual output not to match the expected output.
      
      * ml/avoid-using-grep-on-crlf-files:
        test-lib.sh - define and use GREP_STRIPS_CR
      2bf35011
    • Junio C Hamano's avatar
      Merge branch 'jm/doc-ref-prune' · 677f32c7
      Junio C Hamano authored
      * jm/doc-ref-prune:
        Documentation: fix git-prune example usage
        Documentation: remove --prune from pack-refs examples
      677f32c7
    • Junio C Hamano's avatar
      Merge branch 'rh/template-updates' · dfb78f03
      Junio C Hamano authored
      * rh/template-updates:
        templates: spell ASCII in uppercase in pre-commit hook
        templates: Reformat pre-commit hook's message
        templates: Use heredoc in pre-commit hook
      dfb78f03
    • Junio C Hamano's avatar
      Merge branch 'mh/ref-races-optim-invalidate-cached' · 29143fc4
      Junio C Hamano authored
      * mh/ref-races-optim-invalidate-cached:
        refs: do not invalidate the packed-refs cache unnecessarily
      29143fc4
    • Junio C Hamano's avatar
      Merge branch 'sb/misc-fixes' · 0c544a22
      Junio C Hamano authored
      Assorted code cleanups and a minor fix.
      
      * sb/misc-fixes:
        diff.c: Do not initialize a variable, which gets reassigned anyway.
        commit: Fix a memory leak in determine_author_info
        daemon.c:handle: Remove unneeded check for null pointer.
      0c544a22
    • Junio C Hamano's avatar
      Merge branch 'tr/line-log' · 1762224d
      Junio C Hamano authored
      Fix "log -L" command line parsing bugs.
      
      * tr/line-log:
        t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges invariant)
        line-log: fix "log -LN" crash when N is last line of file
        range-set: satisfy non-empty ranges invariant
        t4211: demonstrate crash when first -L encountered is empty range
        t4211: demonstrate empty -L range crash
        range-set: fix sort_and_merge_range_set() corner case bug
      1762224d
  7. 24 Jul, 2013 7 commits
  8. 23 Jul, 2013 1 commit
    • Junio C Hamano's avatar
      Merge branch 'es/line-log-further-fixes' into tr/line-log · efc5e5ef
      Junio C Hamano authored
      * es/line-log-further-fixes:
        line-log: fix "log -LN" crash when N is last line of file
        range-set: satisfy non-empty ranges invariant
        t4211: demonstrate crash when first -L encountered is empty range
        t4211: demonstrate empty -L range crash
        range-set: fix sort_and_merge_range_set() corner case bug
        range_set: fix coalescing bug when range is a subset of another
        t4211: fix broken test when one -L range is subset of another
      efc5e5ef