aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* GIT 1.0.4v1.0.4Junio C Hamano2005-12-24
|\ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * mailinfo: iconv does not like "latin-1" -- should spell it "latin1"Junio C Hamano2005-12-23
| | | | | | | | | | | | | | | | | | | | | | This was a stupid typo that did not follow http://www.iana.org/assignments/character-sets Long noticed but neglected by JC, but finally reported by Marco. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * ls-files --full-name: usage string and documentation.Junio C Hamano2005-12-23
| | | | | | | | | | | | | | Somehow this option was not mentioned anywhere in the documentation nor the usage string. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * merge --no-commit: tweak messageJunio C Hamano2005-12-23
| | | | | | | | | | | | | | | | We did not distinguish the case the user asked not to make a commit with --no-commit flag and the automerge failed. Tell these cases apart and phrase dying message differently. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * show-branch: usability updates.Junio C Hamano2005-12-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does three things: . It simplifies the logic to handle the case in which no refs are given on the command line, and fixes the bug when only "--heads" is specified. Earlier we showed them twice. . It avoids to add the same ref twice. . It sorts the glob result (e.g. "git show-branch 'tags/v1.0*'") according to a more version friendly sort order. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * check_packed_git_idx(): check integrity of the idx file itself.Junio C Hamano2005-12-23
| | | | | | | | | | | | | | | | | | | | | | Although pack-check.c had routine to verify the checksum for the pack index file itself, the core did not check it before using it. This is stolen from the patch to tighten packname requirements. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 797bd6f490c91c07986382b9f268e0df712cb246 commit)
* | GIT 1.0.3v1.0.3Junio C Hamano2005-12-22
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * sha1_to_hex: properly terminate the SHA1Johannes Schindelin2005-12-22
| | | | | | | | | | | | | | | | | | | | | | | | | | sha1_to_hex() returns a pointer to a static buffer. Some of its users modify that buffer by appending a newline character. Other users rely on the fact that you can call printf("%s", sha1_to_hex(sha1)); Just to be on the safe side, terminate the SHA1 in sha1_to_hex(). Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fix for http-fetch from file:// URLsNick Hengeveld2005-12-22
| | | | | | | | | | | | | | Recognize missing files when using http-fetch with file:// URLs Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-format-patch should show the correct versionJohannes Schindelin2005-12-22
| | | | | | | | | | | | | | | | | | We want to record the version of the tools the patch was generated with. While these tools could be rebuilt, git-format-patch stayed the same and report the wrong version. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * send-pack: reword non-fast-forward error message.Junio C Hamano2005-12-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Wnen refusing to push a head, we said cryptic "remote 'branch' object X does not exist on local" or "remote ref 'branch' is not a strict subset of local ref 'branch'". That was gittish. Since the most likely reason this happens is because the pushed head was not up-to-date, clarify the error message to say that straight, and suggest pulling first. First noticed by Johannes and seconded by Andreas. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * \n usage in stderr outputAlex Riesen2005-12-21
| | | | | | | | | | | | | | | | fprintf and die sometimes have missing/excessive "\n" in their arguments, correct the strings where I think it would be appropriate. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * sanity check in add_packed_git()Pavel Roskin2005-12-21
| | | | | | | | | | | | | | | | add_packed_git() tries to get the pack SHA1 by parsing its name. It may access uninitialized memory for packs with short names. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 1.0.0bv1.0.2v1.0.0bJunio C Hamano2005-12-21
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * server-info: skip empty lines.Junio C Hamano2005-12-21
| | | | | | | | | | | | | | Now we allow an empty line in objects/info/packs file, recognize that and stop complaining. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] quote.c: Make loop control more readable.Pavel Roskin2005-12-21
| | | | | | | | | | | | | | | | quote_c_style_counted() in quote.c uses a hard-to-read construct. Convert this to a more traditional form of the for loop. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 1.0.0av1.0.1v1.0.0aJunio C Hamano2005-12-21
|/ | | | | | | | | - Avoid misleading success message on error (Johannes) - objects/info/packs: work around bug in http-fetch.c::fetch_indices() - http-fetch.c: fix objects/info/pack parsing. - An off-by-one bug found by valgrind (Pavel) Signed-off-by: Junio C Hamano <junkio@cox.net>
* An off-by-one bug found by valgrindPavel Roskin2005-12-21
| | | | | | | | Insufficient memory is allocated in index-pack.c to hold the *.idx name. One more byte should be allocated to hold the terminating 0. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Avoid misleading success message on errorJohannes Schindelin2005-12-21
| | | | | | | | When a push fails (for example when the remote head does not fast forward to the desired ref) it is not correct to print "Everything up-to-date". Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* http-fetch.c: fix objects/info/pack parsing.Junio C Hamano2005-12-21
| | | | | | | It failed to register the last pack in the objects/info/packs file. Also it had an independent overrun error. Signed-off-by: Junio C Hamano <junkio@cox.net>
* objects/info/packs: work around bug in http-fetch.c::fetch_indices()Junio C Hamano2005-12-21
| | | | | | | | | The code to fetch pack index files in deployed clients have a bug that causes it to ignore the pack file on the last line of objects/info/packs file, so append an empty line to work it around. Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.0.0v1.0.0Junio C Hamano2005-12-21
|\ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Make "git-send-pack" less verbose by defaultLinus Torvalds2005-12-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to make sense to have git-send-pack talk about the things it sent when (a) it was a new program and (b) nobody had a lot of tags and branches. These days, it's just distracting to see tons of 'refs/tags/xyz': up-to-date ... when updating a remote repo. So shut it up by default, and add a "--verbose" flag for those who really want to see it. Also, since this makes he case of everything being up-to-date just totally silent, make it say "Everything up-to-date" if no refs needed updating. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * A shared repository should be writable by members.Junio C Hamano2005-12-20
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * ce_smudge_racily_clean_entry: explain why it works.Junio C Hamano2005-12-20
| | | | | | | | | | | | | | This is a tricky code and warrants extra commenting. I wasted 30 minutes trying to break it until I realized why it works. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Racy GIT (part #2)Junio C Hamano2005-12-20
| | | | | | | | | | | | | | | | | | The previous round caught the most trivial case well, but broke down once index file is updated again. Smudge problematic entries (they should be very few if any under normal interactive workflow) before writing a new index file out. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Racy GITJunio C Hamano2005-12-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the longstanding "Racy GIT" problem, which was pretty much there from the beginning of time, but was first demonstrated by Pasky in this message on October 24, 2005: http://marc.theaimsgroup.com/?l=git&m=113014629716878 If you run the following sequence of commands: echo frotz >infocom git update-index --add infocom echo xyzzy >infocom so that the second update to file "infocom" does not change st_mtime, what is recorded as the stat information for the cache entry "infocom" exactly matches what is on the filesystem (owner, group, inum, mtime, ctime, mode, length). After this sequence, we incorrectly think "infocom" file still has string "frotz" in it, and get really confused. E.g. git-diff-files would say there is no change, git-update-index --refresh would not even look at the filesystem to correct the situation. Some ways of working around this issue were already suggested by Linus in the same thread on the same day, including waiting until the next second before returning from update-index if a cache entry written out has the current timestamp, but that means we can make at most one commit per second, and given that the e-mail patch workflow used by Linus needs to process at least 5 commits per second, it is not an acceptable solution. Linus notes that git-apply is primarily used to update the index while processing e-mailed patches, which is true, and git-apply's up-to-date check is fooled by the same problem but luckily in the other direction, so it is not really a big issue, but still it is disturbing. The function ce_match_stat() is called to bypass the comparison against filesystem data when the stat data recorded in the cache entry matches what stat() returns from the filesystem. This patch tackles the problem by changing it to actually go to the filesystem data for cache entries that have the same mtime as the index file itself. This works as long as the index file and working tree files are on the filesystems that share the same monotonic clock. Files on network mounted filesystems sometimes get skewed timestamps compared to "date" output, but as long as working tree files' timestamps are skewed the same way as the index file's, this approach still works. The only problematic files are the ones that have the same timestamp as the index file's, because two file updates that sandwitch the index file update must happen within the same second to trigger the problem. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * format-patch: make sure header and body are separated.Junio C Hamano2005-12-19
| | | | | | | | | | | | | | | | | | | | Since log message in a commit object is defined to be binary blob, it could be something without an empty line between the title line and the body text. Be careful to format such into a form suitable for e-mail submission. There must be an empty line between the headers and the body. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * diff --abbrev: document --abbrev=<n> form.Junio C Hamano2005-12-19
| | | | | | | | | | | | It was implemented there but was not advertised. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * diff: --abbrev optionJunio C Hamano2005-12-19
| | | | | | | | | | | | | | | | | | | | | | When I show transcripts to explain how something works, I often find myself hand-editing the diff-raw output to shorten various object names in the output. This adds --abbrev option to the diff family, which shortens diff-raw output and diff-tree commit id headers. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * xread/xwrite: do not worry about EINTR at calling sites.Junio C Hamano2005-12-19
| | | | | | | | | | | | | | | | | | | | We had errno==EINTR check after read(2)/write(2) sprinkled all over the places, always doing continue. Consolidate them into xread()/xwrite() wrapper routines. Credits for suggestion goes to HPA -- bugs are mine. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * tests: make scripts executableJunio C Hamano2005-12-19
| | | | | | | | | | | | just for consistency. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Remove "octopus".Junio C Hamano2005-12-19
| | | | | | | | | | | | | | | | | | We still advertise "git resolve" as a standalone command, but never "git octopus", so nobody should be using it and it is safe to retire it. The functionality is still available as a strategy backend. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Remove unused cmd-rename.shJunio C Hamano2005-12-19
| | | | | | | | | | | | | | This file is a remnant from the big command rename which happened quite some time ago. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Remove generated files */*.py[co]Junio C Hamano2005-12-19
| | | | | | | | | | | | We missed ones in the compat/ subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: stdout of update-hook is connected to /dev/nullJunio C Hamano2005-12-19
| | | | | | | | | | | | Mention that update-hook does not emit its stdout to the sender. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * rev-list --objects: fix object list without commit.Junio C Hamano2005-12-19
| | | | | | | | | | | | | | | | | | Earlier, "rev-list --objects <sha1>" for an object chain that does not have any commit failed with a usage message. This fixes "send-pack remote $tag" where tag points at a non-commit (e.g. a blob). Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation/git-archimport: document -o, -a, f, -D optionsEric Wong2005-12-19
| | | | | | | | | | | | | | Also, ensure usage help switches are in the same order. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * howto/using-topic-branches: Recommend public URL git://git.kernel.org/Junio C Hamano2005-12-19
| | | | | | | | | | | | | | Recommending this means subsystem maintainers do not have to log-in just to resync with upstream. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Make "git help" sort git commands in columnsLinus Torvalds2005-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes "pretty_print_string_list()" to show the git commands alphabetically in column order, which is the normal one. Ie instead of doing git commands available in '/home/torvalds/bin' ---------------------------------------------- add am ... applypatch archimport ... cat-file check-ref-format ... ... it does git commands available in '/home/torvalds/bin' ---------------------------------------------- add diff-tree ... am fetch ... apply fetch-pack ... ... where each column is sorted. This is how "ls" sorts things too, and since visually the columns are much more distinct than the rows, so it _looks_ more sorted. The "ls" command has a "-x" option that lists entries by lines (the way git.c used to): if somebody wants to do that, the new print-out logic could be easily accomodated to that too. Matter of taste and preference, I guess. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Make "git help" react to window size correctlyLinus Torvalds2005-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the git "show commands" function will react to the environment variable COLUMNS, or just default to a width of 80 characters. That's just soo eighties. Nobody sane sets COLUMNS any more, unless they need to support some stone-age software from before the age of steam engines, SIGWINCH and TIOCGWINSZ. So get with the new century, and use TIOCGWINSZ to get the terminal size. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: typos and small fixes in "everyday".Junio C Hamano2005-12-18
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * clone-pack: remove unused and undocumented --keep flagJunio C Hamano2005-12-18
| | | | | | | | | | | | | | While we are at it, give fully spelled --keep to fetch-pack. Also give --quiet in addition to -q to fetch-pack as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * fetch-pack: -k option to keep downloaded pack.Junio C Hamano2005-12-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Split out the functions that deal with the socketpair after finishing git protocol handshake to receive the packed data into a separate file, and use it in fetch-pack to keep/explode the received pack data. We earlier had something like that on clone-pack side once, but the list discussion resulted in the decision that it makes sense to always keep the pack for clone-pack, so unpacking option is not enabled on the clone-pack side, but we later still could do so easily if we wanted to with this change. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Revert "get_sha1_basic(): corner case ambiguity fix"Junio C Hamano2005-12-17
| | | | | | | | | | | | | | This reverts 6677c4665af2d73f670bec382bc82d0f2e9513fb commit. The misguided disambiguation has been reverted, so there is no point testing that misfeature.
| * Revert "We do not like "HEAD" as a new branch name"Junio C Hamano2005-12-17
| | | | | | | | This reverts ee34518d629331dadd58b1a75294369d679eda8b commit.
| * Revert "refs.c: off-by-one fix."Junio C Hamano2005-12-17
| | | | | | | | This reverts 06bf6ac4248e834a229027908d405f5e42ac96d7 commit.
| * Remove misguided branch disambiguation.Junio C Hamano2005-12-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the misguided attempt to refuse processing a branch name xyzzy and insist it to be given as either heads/xyzzy or tags/xyzzy when a tag xyzzy exists. There was no reason to do so --- the search order was predictable and well defined, so if the user says xyzzy we should have taken the tag xyzzy in such a case without complaining. This incidentally fixes another subtle bug related to this. If such a duplicate branch/tag name happened to be a unique valid prefix of an existing commit object name (say, "beef"), we did not take the tag "beef" but after complaining used the commit object whose name started with beef. Another problem this fixes while introducing some confusion is that there is no longer a reason to forbid a branch name HEAD anymore. In other words, now "git pull . ref1:HEAD" would work as expected, once we revert "We do not like HEAD branch" patch. It creates "HEAD" branch under ${GIT_DIR-.git}/refs/heads (or fast-forwards if already exists) using the tip of ref1 branch from the current repository, and merges it into the current branch. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: HTTP needs update-server-info.Junio C Hamano2005-12-17
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Comment fixes.Junio C Hamano2005-12-16
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-15 17:31:47 +0000