Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'jc/cvsimport' into next * jc/cvsimport: cvsimport: honor -i and non -i upon subsequent imports
Junio C Hamano
Merge branch 'jc/fetch' into next * jc/fetch: fetch: exit non-zero when fast-forward check fails.
Junio C Hamano
Merge branch 'ew/abbrev' into next * ew/abbrev: ls-files: add --abbrev[=<n>] option ls-tree: add --abbrev[=<n>] option blame: Fix git-blame <directory> blame: Nicer output
Junio C Hamano
fetch: exit non-zero when fast-forward check fails. Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong
ls-files: add --abbrev[=<n>] option Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong
ls-tree: add --abbrev[=<n>] option Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
cvsimport: honor -i and non -i upon subsequent imports Documentation says -i is "import only", so without it, subsequent import should update the current branch and working tree files in a sensible way. "A sensible way" defined by this commit is "act as if it is a git pull from foreign repository which happens to be CVS not git". So: - If importing into the current branch (note that cvsimport requires the tracking branch is pristine -- you chec…
Fredrik Kuivinen
blame: Fix git-blame <directory> Before this patch git-blame <directory> gave non-sensible output. (It assigned blame to some random file in <directory>) Abort with an error message instead. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen
blame: Nicer output As pointed out by Junio, it may be dangerous to cut off people's names after 15 bytes. If the name is encoded in an encoding which uses more than one byte per code point we may end up with outputting garbage. Instead of trying to do something smart, just output the entire name. We don't gain much screen space by chopping it off anyway. Furthermore, only output the file name if we actually found a…
Junio C Hamano
Merge branch 'master' into next * master: fix imap-send for OSX Let merge set the default strategy.
Randal L. Schwartz
fix imap-send for OSX This patch works... I've been using it to stay current. Signed-off-by: Junio C Hamano <junkio@cox.net>
Mark Hollomon
Let merge set the default strategy. If the user does not set a merge strategy for git-pull, let git-merge calculate a default strategy. [jc: with minor stylistic tweaks] Signed-off-by: Mark Hollomon <markhollomon@comcast.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'lt/diff' into next * lt/diff: diffcore-delta: 64-byte-or-EOL ultrafast replacement (hash fix).
Linus Torvalds
diffcore-delta: 64-byte-or-EOL ultrafast replacement (hash fix). The rotating 64-bit number was not really rotating, and worse yet ulong was longer than 64-bit on 64-bit architectures X-<. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'master' into next * master: Fix broken slot reuse when fetching alternates
Nick Hengeveld
Fix broken slot reuse when fetching alternates When fetching alternates, http-fetch may reuse the slot to fetch non-http alternates if http-alternates does not exist. When doing so, it now needs to update the slot's finished status so run_active_slot waits for the non-http alternates request to finish. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'lt/diff' into next * lt/diff: diffcore-delta: 64-byte-or-EOL ultrafast replacement.
Linus Torvalds
diffcore-delta: 64-byte-or-EOL ultrafast replacement. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'jc/pack' * jc/pack: pack-objects: simplify "thin" pack. verify-pack -v: show delta-chain histogram.
Junio C Hamano
Merge branch 'jc/fsck' * jc/fsck: fsck-objects: Remove --standalone
Junio C Hamano
Merge branch 'nh/http' * nh/http: http-push: cleanup http-push: support for updating remote info/refs http-push: improve remote lock management http-push: refactor remote file/directory processing HTTP slot reuse fixes http-push: fix revision walk
Junio C Hamano
Merge branch 'fk/blame' * fk/blame: blame: Rename detection (take 2) rev-lib: Make it easy to do rename tracking (take 2) Make it possible to not clobber object.util in sort_in_topological_order (take 2)
Junio C Hamano
Merge branch 'jc/diff' into next * jc/diff: Fix up diffcore-rename scoring
Linus Torvalds
Fix up diffcore-rename scoring The "score" calculation for diffcore-rename was totally broken. It scaled "score" as score = src_copied * MAX_SCORE / dst->size; which means that you got a 100% similarity score even if src and dest were different, if just every byte of dst was copied from src, even if source was much larger than dst (eg we had copied 85% of the bytes, but _deleted_ the remaining 15%). That's clearly bogus. W…
Junio C Hamano
Merge branch 'jc/diff' into next * jc/diff: diffcore-delta: tweak hashbase value.
Junio C Hamano
diffcore-delta: tweak hashbase value. This tweaks the maximum hashvalue we use to hash the string into without making the maximum size of the hashtable can grow from the current limit. With this, the renames detected becomes a bit more precise without incurring additional paging cost. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'jc/diff' into next * jc/diff: diffcore-delta: make the hash a bit denser.
Junio C Hamano
Merge branch 'jc/empty' into next * jc/empty: revision traversal: --remove-empty fix (take #2).
Junio C Hamano
diffcore-delta: make the hash a bit denser. To reduce wasted memory, wait until the hash fills up more densely before we rehash. This reduces the working set size a bit further. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
revision traversal: --remove-empty fix (take #2). Marco Costalba reports that --remove-empty omits the commit that created paths we are interested in. try_to_simplify_commit() logic was dropping a parent we introduced those paths against, which I think is not what we meant. Instead, this makes such parent parentless. Signed-off-by: Junio C Hamano <junkio@cox.net>
  1. Prev
  2. Next