Skip to content
Commits on May 4, 2011
  1. @gitster

    Git 1.7.5.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 4, 2011
  2. @gitster

    Merge branch 'jh/dirstat' into maint

    * jh/dirstat:
      --dirstat: In case of renames, use target filename instead of source filename
      Teach --dirstat not to completely ignore rearranged lines within a file
      --dirstat-by-file: Make it faster and more correct
      --dirstat: Describe non-obvious differences relative to --stat or regular diff
    gitster committed May 4, 2011
  3. @gitster

    Merge branch 'sp/maint-clear-postfields' into maint

    * sp/maint-clear-postfields:
      http: clear POSTFIELDS when initializing a slot
    gitster committed May 4, 2011
  4. @gitster

    Merge branch 'jk/maint-stash-oob' into maint

    * jk/maint-stash-oob:
      stash: fix false positive in the invalid ref test.
      stash: fix accidental apply of non-existent stashes
    
    Conflicts:
    	t/t3903-stash.sh
    gitster committed May 4, 2011
  5. @gitster

    Merge branch 'jk/maint-upload-pack-shallow' into maint

    * jk/maint-upload-pack-shallow:
      upload-pack: start pack-objects before async rev-list
    gitster committed May 4, 2011
  6. @gitster

    Merge branch 'dm/stash-k-i-p' into maint

    * dm/stash-k-i-p:
      stash: ensure --no-keep-index and --patch can be used in any order
      stash: add two more tests for --no-keep-index
    gitster committed May 4, 2011
  7. @gitster

    Merge branch 'jc/pack-objects-bigfile' into maint

    * jc/pack-objects-bigfile:
      Teach core.bigfilethreashold to pack-objects
    gitster committed May 4, 2011
  8. @gitster

    Merge branch 'mg/reflog-with-options' into maint

    * mg/reflog-with-options:
      reflog: fix overriding of command line options
      t/t1411: test reflog with formats
      builtin/log.c: separate default and setup of cmd_log_init()
    gitster committed May 4, 2011
  9. @gitster

    Merge branch 'jk/stash-loosen-safety' into maint

    * jk/stash-loosen-safety:
      stash: drop dirty worktree check on apply
    gitster committed May 4, 2011
  10. @gitster

    Merge branch 'ar/clean-rmdir-empty' into maint

    * ar/clean-rmdir-empty:
      clean: unreadable directory may still be rmdir-able if it is empty
    gitster committed May 4, 2011
  11. @gitster

    Merge branch 'mg/sha1-path-advise' into maint

    * mg/sha1-path-advise:
      sha1_name: Suggest commit:./file for path in subdir
      t1506: factor out test for "Did you mean..."
    gitster committed May 4, 2011
  12. @esc @gitster

    git-add.txt: document 'add.ignoreErrors'

    Signed-off-by: Valentin Haenel <valentin.haenel@gmx.de>
    Noticed-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    esc committed with gitster May 4, 2011
Commits on Apr 29, 2011
  1. @gitster

    Start 1.7.5.1 maintenance track

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 29, 2011
  2. @gitster

    Merge branch 'mg/x-years-12-months' into maint

    * mg/x-years-12-months:
      date: avoid "X years, 12 months" in relative dates
    gitster committed Apr 29, 2011
  3. @sylr @gitster

    git-send-email: fix missing space in error message

    When the command cannot make a connection to the SMTP server the error
    message to diagnose the broken configuration is issued.  However, when an
    optional smtp-server-port is given and needs to be reported, the message
    lacked a space between "hello=<smtp-domain>" and "port=<smtp-server-port>".
    
    Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    sylr committed with gitster Apr 29, 2011
Commits on Apr 26, 2011
  1. @gitster

    http: clear POSTFIELDS when initializing a slot

    After posting a short request using CURLOPT_POSTFIELDS, if the slot
    is reused for posting a large payload, the slot ends up having both
    POSTFIELDS (which now points at a random garbage) and READFUNCTION,
    in which case the curl library tries to use the stale POSTFIELDS.
    
    Clear it as part of the general slot initialization in get_active_slot().
    
    Heavylifting-by: Shawn Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Acked-by: Shawn Pearce <spearce@spearce.org>
    gitster committed Apr 26, 2011
Commits on Apr 24, 2011
  1. @gitster

    Git 1.7.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 23, 2011
Commits on Apr 21, 2011
  1. @mjg @gitster

    date: avoid "X years, 12 months" in relative dates

    When relative dates are more than about a year ago, we start
    writing them as "Y years, M months".  At the point where we
    calculate Y and M, we have the time delta specified as a
    number of days. We calculate these integers as:
    
      Y = days / 365
      M = (days % 365 + 15) / 30
    
    This rounds days in the latter half of a month up to the
    nearest month, so that day 16 is "1 month" (or day 381 is "1
    year, 1 month").
    
    We don't round the year at all, though, meaning we can end
    up with "1 year, 12 months", which is silly; it should just
    be "2 years".
    
    Implement this differently with months of size
    
      onemonth = 365/12
    
    so that
    
      totalmonths = (long)( (days + onemonth/2)/onemonth )
      years = totalmonths / 12
      months = totalmonths % 12
    
    In order to do this without floats, we write the first formula as
    
      totalmonths = (days*12*2 + 365) / (365*2)
    
    Tests and inspiration by Jeff King.
    
    Helped-by: Jeff King <peff@peff.net>
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Apr 20, 2011
Commits on Apr 19, 2011
  1. @gitster

    Git 1.7.5-rc3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 19, 2011
  2. @gitster

    Sync with 1.7.4.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 19, 2011
  3. @gitster

    Git 1.7.4.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 19, 2011
  4. @mjg @gitster

    git-svn.txt: Document --mergeinfo

    6abd933 (git-svn: allow the mergeinfo property to be set, 2010-09-24)
    introduced the --mergeinfo option. Document it.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Apr 19, 2011
Commits on Apr 18, 2011
  1. @gitster

    Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"

    This reverts commit ebec842, which
    somehow mistakenly thought that any non-zero return from write(2) is
    an error.
    gitster committed Apr 18, 2011
Commits on Apr 14, 2011
  1. @gitster

    Merge branch 'maint'

    * maint:
      archive: document limitation of tar.umask config setting
      t3306,t5304: avoid clock skew issues
      git.txt: fix list continuation
    gitster committed Apr 14, 2011
  2. @gitster

    archive: document limitation of tar.umask config setting

    The local value of the config variable tar.umask is not passed to the
    other side with --remote.  We may want to change that, but for now just
    document this fact.
    
    Reported-by: Jacek Masiulaniec <jacek.masiulaniec@gmail.com>
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Apr 14, 2011
  3. @mjg @gitster

    t3306,t5304: avoid clock skew issues

    On systems where the local time and file modification time may be out of
    sync (e.g. test directory on NFS) t3306 and t5305 can fail because prune
    compares times such as "now" (client time) with file modification times
    (server times for remote file systems). I.e., these are spurious test
    failures.
    
    Avoid this by setting the relevant modification times to the local time.
    
    Noticed on a system with as little as 2s time skew.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Apr 14, 2011
  4. @mjg @gitster

    git.txt: fix list continuation

    Remove a spurious empty line which prevented asciidoc from recognizing a
    list continuation mark ('+'), so that it does not get output literally any
    more.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Apr 14, 2011
Commits on Apr 13, 2011
  1. @gitster

    Git 1.7.5-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 13, 2011
  2. @gitster

    Merge branch 'maint'

    * maint:
    gitster committed Apr 13, 2011
  3. @gitster

    Merge branch 'jc/rev-list-options-fix' into maint

    * jc/rev-list-options-fix:
      "log --cherry-pick" documentation regression fix
    gitster committed Apr 13, 2011
  4. @gitster

    Merge branch 'js/checkout-untracked-symlink' into maint

    * js/checkout-untracked-symlink:
      t2021: mark a test as fixed
    gitster committed Apr 13, 2011
  5. @meyering @gitster

    remove doubled words, e.g., s/to to/to/, and fix related typos

    I found that some doubled words had snuck back into projects from which
    I'd already removed them, so now there's a "syntax-check" makefile rule in
    gnulib to help prevent recurrence.
    
    Running the command below spotted a few in git, too:
    
      git ls-files | xargs perl -0777 -n \
        -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt])\s+\1\b/gims)' \
        -e '{$n=($` =~ tr/\n/\n/ + 1); ($v=$&)=~s/\n/\\n/g;' \
        -e 'print "$ARGV:$n:$v\n"}'
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    meyering committed with gitster Apr 13, 2011
  6. @artagnon @gitster

    revert: Hide '-r' option in default usage

    The '-r' command-line option is a no-op provided only for backward
    compatiblity since abd6970 (cherry-pick: make -r the default, 2006-10-05),
    and somehow ended up surviving across reimplementation in C at 9509af6
    (Make git-revert & git-cherry-pick a builtin, 2007-03-01) and another
    rewrite of the command line parser at f810379 (Make builtin-revert.c use
    parse_options, 2007-10-07).  We should have stopped advertising the option
    long time ago.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Apr 10, 2011
Commits on Apr 12, 2011
  1. @jherland @gitster

    --dirstat: In case of renames, use target filename instead of source …

    …filename
    
    This changes --dirstat analysis to count "damage" toward the target filename,
    rather than the source filename. For renames within a directory, this won't
    matter to the final output, but when moving files between diretories, the
    output now lists the target directory rather than the source directory.
    
    Signed-off-by: Johan Herland <johan@herland.net>
    Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jherland committed with gitster Apr 12, 2011
  2. @gitster

    Merge branch 'js/checkout-untracked-symlink'

    * js/checkout-untracked-symlink:
      t2021: mark a test as fixed
    gitster committed Apr 12, 2011
Something went wrong with that request. Please try again.