summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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-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-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>
2006-03-12Merge branch 'master' into nextLibravatar Junio C Hamano3-4/+5
* master: imap-send: Add missing #include for macosx git-diff: -p disables rename detection. imap-send: cleanup execl() call to use NULL sentinel instead of 0 annotate.perl triggers rpm bug
2006-03-12Merge branch 'jc/diff' into nextLibravatar Junio C Hamano5-21/+149
* jc/diff: diffcore-rename: somewhat optimized.
2006-03-12imap-send: Add missing #include for macosxLibravatar Johannes Schindelin1-0/+1
There is a compile error without that. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-12diffcore-rename: somewhat optimized.Libravatar Junio C Hamano5-21/+149
This changes diffcore-rename to reuse statistics information gathered during similarity estimation, and updates the hashtable implementation used to keep track of the statistics to be denser. This seems to give better performance. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-11git-diff: -p disables rename detection.Libravatar Junio C Hamano1-2/+2
2006-03-11imap-send: cleanup execl() call to use NULL sentinel instead of 0Libravatar Marco Roeland1-1/+1
Some versions of gcc check that calls to the exec() family have the proper sentinel for variadic calls. This should be (char *) NULL according to the man page. Although for all other purposes the 0 is equivalent, gcc nevertheless does emit a warning for 0 and not for NULL. This also makes the usage consistent throughout git. The whitespace in function calls throughout imap-send.c has its own style, so I left it that way. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-11annotate.perl triggers rpm bugLibravatar sean1-1/+1
RPM, at least on Fedora boxes, automatically creates a dependency for any perl "use" lines, and one of the help text lines unfortunately begins like this: -S, --rev-file revs-file use revs from revs-file instead of calling git-rev-list RPM gets confused and creates a false dependecy for the nonexistent perl package "revs". Obviously this creates a problem when someone goes to install the git-core rpm. Since other help sentences all start with capital letter, make this one match them by upcasing "Use". As a side effect, RPM stops getting confused. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-10Merge branch 'nh/http' into nextLibravatar 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-10http-push: cleanupLibravatar Nick Hengeveld1-24/+33
More consistent usage string, condense push output, remove extra slashes in URLs, fix unused variables, include HTTP method name in failure messages. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-10http-push: support for updating remote info/refsLibravatar Nick Hengeveld1-11/+536
If info/refs exists on the remote, get a lock on info/refs, make sure that there is a local copy of the object referenced in each remote ref (in case someone else added a tag we don't have locally), do all the refspec updates, and generate and send an updated info/refs file. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-10http-push: improve remote lock managementLibravatar Nick Hengeveld1-73/+76
Associate the remote locks with the remote repo, add a function to check and refresh all current locks. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-10http-push: refactor remote file/directory processingLibravatar Nick Hengeveld1-137/+106
Replace single-use functions with one that can get a list of remote collections and pass file/directory information to user-defined functions for processing. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-10HTTP slot reuse fixesLibravatar Nick Hengeveld3-20/+49
Incorporate into http-push a fix related to accessing slot results after the slot was reused, and fix a case in run_active_slot where a finished slot wasn't detected if the slot was reused. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-10http-push: fix revision walkLibravatar Nick Hengeveld1-8/+5
The revision walk was not including tags because setup_revisions zeroes out the revs flags. Pass --objects so it picks up all the necessary bits. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-10Merge branch 'ew/remote' into nextLibravatar Junio C Hamano3-6/+20
* ew/remote: fetch,parse-remote,fmt-merge-msg: refs/remotes/* support
2006-03-10Merge branch 'fk/blame' into nextLibravatar Junio C Hamano14-110/+1711
* 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) Add git-imap-send, derived from isync 1.0.1. repack: prune loose objects when -d is given try_to_simplify_commit(): do not skip inspecting tree change at boundary. Fix t1200 test for breakage caused by removal of full-stop at the end of fast-forward message. Describe how to add extra mail header lines in mail generated by git-format-patch. Document the --attach flag. allow double click on current HEAD id after git-pull
2006-03-10fetch,parse-remote,fmt-merge-msg: refs/remotes/* supportLibravatar Eric Wong3-6/+20
We can now easily fetch and merge things from heads in the refs/remotes/ hierarchy in remote repositories. The refs/remotes/ hierarchy is likely to become the standard for tracking foreign SCMs, as well as the location of Pull: targets for tracking remote branches in newly cloned repositories. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-10blame: Rename detection (take 2)Libravatar Fredrik Kuivinen1-40/+199
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-10rev-lib: Make it easy to do rename tracking (take 2)Libravatar Fredrik Kuivinen3-47/+75
prune_fn in the rev_info structure is called in place of try_to_simplify_commit. This makes it possible to do rename tracking with a custom try_to_simplify_commit-like function. This commit also introduces init_revisions which initialises the rev_info structure with default values. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-10Make it possible to not clobber object.util in sort_in_topological_order ↵Libravatar Fredrik Kuivinen2-12/+44
(take 2) Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-10Add git-imap-send, derived from isync 1.0.1.Libravatar Mike McCormack3-1/+1362
git-imap-send drops a patch series generated by git-format-patch into an IMAP folder. This allows patch submitters to send patches through their own mail program. git-imap-send uses the following values from the GIT repository configuration: The target IMAP folder: [imap] Folder = "INBOX.Drafts" A command to open an ssh tunnel to the imap mail server. [imap] Tunnel = "ssh -q user@imap.server.com /usr/bin/imapd ./Maildir 2> /dev/null" [imap] Host = imap.server.com User = bob Password = pwd Port = 143
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-27 03:46:24 +0000