summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-03-18Merge branch 'master' into nextLibravatar Junio C Hamano2-3/+11
* master: Makefile: Add TAGS and tags targets ls-files: Don't require exclude files to end with a newline.
2006-03-18Makefile: Add TAGS and tags targetsLibravatar Fredrik Kuivinen1-2/+9
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-18ls-files: Don't require exclude files to end with a newline.Libravatar Alexandre Julliard1-1/+2
Without this patch, the last line of an exclude file is silently ignored if it doesn't end with a newline. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-18Merge branch 'master' into nextLibravatar Junio C Hamano1-2/+2
* master: git-pull: run repo-config with dash form.
2006-03-18git-pull: run repo-config with dash form.Libravatar Junio C Hamano1-2/+2
... as discussed on the list for consistency. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-18Merge branch 'jc/cvsimport' into nextLibravatar Junio C Hamano1-0/+1
* jc/cvsimport: cvsimport: fix reading from rev-parse
2006-03-18cvsimport: fix reading from rev-parseLibravatar Junio C Hamano1-0/+1
The updated code reads the tip of the current branch before and after the import runs, but forgot to chomp what we read from the command. The read-tree command did not them with the trailing LF. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-18Merge branch 'jc/empty'Libravatar Junio C Hamano1-2/+10
* jc/empty: revision traversal: --remove-empty fix (take #2). revision traversal: --remove-empty fix. Conflicts: revision.c (adjust for the updates by Fredrik)
2006-03-17Merge branch 'master' into nextLibravatar Junio C Hamano8-23/+60
* master: 3% tighter packs for free Rewrite synopsis to clarify the two primary uses of git-checkout. Fix minor typo. Reference git-commit-tree for env vars. Clarify git-rebase example commands. Document the default source of template files. Call out the two different uses of git-branch and fix a typo. Add git-show reference
2006-03-173% tighter packs for freeLibravatar Nicolas Pitre1-1/+16
This patch makes for 3.4% smaller pack with the git repository, and a bit more than 3% smaller pack with the kernel repository. And so with _no_ measurable CPU difference. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17Rewrite synopsis to clarify the two primary uses of git-checkout.Libravatar Jon Loeliger1-10/+13
Fix a few typo/grammar problems. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17Fix minor typo.Libravatar Jon Loeliger1-1/+1
Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17Reference git-commit-tree for env vars.Libravatar Jon Loeliger1-0/+4
Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17Clarify git-rebase example commands.Libravatar Jon Loeliger1-3/+3
Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17Document the default source of template files.Libravatar Jon Loeliger1-5/+13
Also explain a bit more about how the template option works. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17Call out the two different uses of git-branch and fix a typo.Libravatar Jon Loeliger1-3/+7
Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17Add git-show referenceLibravatar Jon Loeliger1-0/+3
Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17Merge branch 'jc/cvsimport' into nextLibravatar Junio C Hamano1-1/+17
* jc/cvsimport: cvsimport: honor -i and non -i upon subsequent imports
2006-03-17Merge branch 'jc/fetch' into nextLibravatar Junio C Hamano1-0/+1
* jc/fetch: fetch: exit non-zero when fast-forward check fails.
2006-03-17Merge branch 'ew/abbrev' into nextLibravatar Junio C Hamano5-12/+85
* ew/abbrev: ls-files: add --abbrev[=<n>] option ls-tree: add --abbrev[=<n>] option blame: Fix git-blame <directory> blame: Nicer output
2006-03-17fetch: exit non-zero when fast-forward check fails.Libravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17ls-files: add --abbrev[=<n>] optionLibravatar Eric Wong2-4/+24
Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17ls-tree: add --abbrev[=<n>] optionLibravatar Eric Wong2-3/+25
Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17cvsimport: honor -i and non -i upon subsequent importsLibravatar Junio C Hamano1-1/+17
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 checked out the tracking branch but it is your responsibility not to make your own commits there), fast forward the branch head and match the index and working tree using two-way merge, just like "git pull" does. - If importing into a separate tracking branch, update that branch head, and merge it into your current branch, again, just like "git pull" does. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17blame: Fix git-blame <directory>Libravatar Fredrik Kuivinen1-0/+6
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>
2006-03-17blame: Nicer outputLibravatar Fredrik Kuivinen1-5/+30
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 any renames. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-15Merge branch 'master' into nextLibravatar Junio C Hamano2-9/+5
* master: fix imap-send for OSX Let merge set the default strategy.
2006-03-15fix imap-send for OSXLibravatar Randal L. Schwartz1-2/+2
This patch works... I've been using it to stay current. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-15Let merge set the default strategy.Libravatar Mark Hollomon1-7/+3
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>
2006-03-15Merge branch 'lt/diff' into nextLibravatar Junio C Hamano1-9/+10
* lt/diff: diffcore-delta: 64-byte-or-EOL ultrafast replacement (hash fix).
2006-03-15diffcore-delta: 64-byte-or-EOL ultrafast replacement (hash fix).Libravatar Linus Torvalds1-9/+10
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>
2006-03-15Merge branch 'master' into nextLibravatar Junio C Hamano1-0/+4
* master: Fix broken slot reuse when fetching alternates
2006-03-15Fix broken slot reuse when fetching alternatesLibravatar Nick Hengeveld1-0/+4
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>
2006-03-15Merge branch 'lt/diff' into nextLibravatar Junio C Hamano1-18/+16
* lt/diff: diffcore-delta: 64-byte-or-EOL ultrafast replacement.
2006-03-15diffcore-delta: 64-byte-or-EOL ultrafast replacement.Libravatar Linus Torvalds1-18/+16
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-13Merge branch 'jc/pack'Libravatar Junio C Hamano2-28/+30
* jc/pack: pack-objects: simplify "thin" pack. verify-pack -v: show delta-chain histogram.
2006-03-13Merge branch 'jc/fsck'Libravatar Junio C Hamano2-26/+9
* jc/fsck: fsck-objects: Remove --standalone
2006-03-13Merge branch 'nh/http'Libravatar Junio C Hamano3-264/+796
* 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
2006-03-13Merge branch 'fk/blame'Libravatar Junio C Hamano6-99/+318
* 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)
2006-03-12Merge branch 'jc/diff' into nextLibravatar Junio C Hamano1-7/+5
* jc/diff: Fix up diffcore-rename scoring
2006-03-12Fix up diffcore-rename scoringLibravatar Linus Torvalds1-7/+5
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. We should do the score calculation relative not to the destination size, but to the max size of the two. This seems to fix it. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-12Merge branch 'jc/diff' into nextLibravatar Junio C Hamano1-1/+8
* jc/diff: diffcore-delta: tweak hashbase value.
2006-03-12diffcore-delta: tweak hashbase value.Libravatar Junio C Hamano1-1/+8
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>
2006-03-12Merge branch 'jc/diff' into nextLibravatar Junio C Hamano2-6/+11
* jc/diff: diffcore-delta: make the hash a bit denser.
2006-03-12Merge branch 'jc/empty' into nextLibravatar Junio C Hamano1-5/+9
* jc/empty: revision traversal: --remove-empty fix (take #2).
2006-03-12diffcore-delta: make the hash a bit denser.Libravatar Junio C Hamano2-6/+11
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>
2006-03-12revision traversal: --remove-empty fix (take #2).Libravatar Junio C Hamano1-5/+9
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>
2006-03-12Merge branch 'jc/empty' into nextLibravatar Junio C Hamano2-3/+7
* jc/empty: revision traversal: --remove-empty fix. annotate-tests: override VISUAL when running tests.
2006-03-12revision traversal: --remove-empty fix.Libravatar Junio C Hamano1-3/+8
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 marks such parent uninteresting. The traversal does not go beyond that parent as advertised, but we still say that the current commit changed things from that parent. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-12annotate-tests: override VISUAL when running tests.Libravatar Mark Wooding1-1/+1
The tests hang for me waiting for Emacs with its output directed somewhere strage, because I hedged my bets and set both EDITOR and VISUAL to run Emacs. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-03 16:41:11 +0000