1. Stefan Saasen
  2. git

Commits

Show all
Author Commit Message Date Builds
Junio C Hamano
Git 1.7.9-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.9-rc1
Junio C Hamano
Merge branch 'jc/request-pull-show-head-4' * jc/request-pull-show-head-4: request-pull: use the real fork point when preparing the message
Junio C Hamano
Merge branch 'tr/maint-mailinfo' * tr/maint-mailinfo: mailinfo documentation: accurately describe non -k case
Junio C Hamano
Merge branch 'ss/maint-msys-cvsexportcommit' * ss/maint-msys-cvsexportcommit: git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS t9200: On MSYS, do not pass Windows-style paths to CVS
Junio C Hamano
Merge branch 'jk/maint-upload-archive' * jk/maint-upload-archive: archive: re-allow HEAD:Documentation on a remote invocation
Junio C Hamano
Merge branch 'maint' * maint: Update draft release notes to 1.7.8.4 Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base
Junio C Hamano
Update draft release notes to 1.7.8.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint-1.7.7' into maint * maint-1.7.7: Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base
Junio C Hamano
Update draft release notes to 1.7.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base
Junio C Hamano
Update draft release notes to 1.7.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
thin-pack: try harder to use preferred base objects as base When creating a pack using objects that reside in existing packs, we try to avoid recomputing futile delta between an object (trg) and a candidate for its base object (src) if they are stored in the same packfile, and trg is not recorded as a delta already. This heuristics makes sense because it is likely that we tried to express trg as a delta based on src but it did not produce a good delta when…
Carlos Martín Nieto
archive: re-allow HEAD:Documentation on a remote invocation The tightening done in (ee27ca4a: archive: don't let remote clients get unreachable commits, 2011-11-17) went too far and disallowed HEAD:Documentation as it would try to find "HEAD:Documentation" as a ref. Only DWIM the "HEAD" part to see if it exists as a ref. Once we're sure that we've been given a valid ref, we follow the normal code path. This still disallows attempts to access commits which…
Junio C Hamano
Merge branch 'maint' * maint: attr: fix leak in free_attr_elem t2203: fix wrong commit command
Junio C Hamano
Merge branch 'maint-1.7.7' into maint * maint-1.7.7: attr: fix leak in free_attr_elem t2203: fix wrong commit command
Junio C Hamano
Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: attr: fix leak in free_attr_elem t2203: fix wrong commit command
Jeff King
attr: fix leak in free_attr_elem This function frees the individual "struct match_attr"s we have allocated, but forgot to free the array holding their pointers, leading to a minor memory leak (but it can add up after checking attributes for paths in many directories). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sebastian Schuberth
git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS Due to MSYS path mangling GIT_DIR contains a Windows-style path when checked inside a Perl script even if GIT_DIR was previously set to an MSYS-style path in a shell script. So explicitly convert to an MSYS-style path before calling Perl's rel2abs() to make it work. This fix was inspired by a very similar patch in WebKit: http://trac.webkit.org/changeset/76255/trunk/Tools/Scripts/commit-log-edit…
Sebastian Schuberth
t9200: On MSYS, do not pass Windows-style paths to CVS For details, see the commit message of 4114156ae9. Note that while using $PWD as part of GIT_DIR is not required here, it does no harm and it is more consistent. In addition, on MSYS using an environment variable should be slightly faster than spawning an external executable. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast
mailinfo documentation: accurately describe non -k case Since its very first description of -k, the documentation for git-mailinfo claimed that (in the case without -k) after cleaning up bracketed strings [blah], it would insert [PATCH]. It doesn't; on the contrary, one of the important jobs of mailinfo is to remove those strings. Since we're already there, rewrite the paragraph to give a complete enumeration of all the transformations. Specifically…
Nguyễn Thái Ngọc Duy
t2203: fix wrong commit command Add commit message to avoid commit's aborting due to the lack of commit message, not because there are INTENT_TO_ADD entries in index. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
request-pull: use the real fork point when preparing the message The command takes the "start" argument and computes the merge base between it and the commit to be pulled so that we can show the diffstat, but uses the "start" argument as-is when composing the message The following changes since commit $X are available to tell the integrator which commit the work is based on. Giving "origin" (most of the time it resolves to refs/remotes/origin/master) as t…
Junio C Hamano
Merge branch 'bw/maint-t8006-sed-incomplete-line' * bw/maint-t8006-sed-incomplete-line: Use perl instead of sed for t8006-blame-textconv test
Junio C Hamano
Sync with maint Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Prepare for 1.7.8.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge the attributes fix in from maint-1.6.7 branch Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Prepare for 1.7.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge the attributes fix in from maint-1.6.6 branch Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Prepare for 1.7.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Documentation: rerere's rr-cache auto-creation and rerere.enabled The description of rerere.enabled left the user in the dark as to who might create an rr-cache directory. Add a note that simply invoking rerere does this. Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next