Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
sort by:
Revision Author Date Message Commit Date
541ad6e Junio C Hamano 01 August 2005, 22:19:34 UTC GIT 0.99.3 Things have slowly but surely started to settle down, and the http transport finally can natively grok packed repositories. To give Pasky a good anchor point, hoping that he can start split off the core part from Cogito, here is the 0.99.3, which will be accompanied with its own tag. Signed-off-by: Junio C Hamano <junkio@cox.net> 01 August 2005, 22:20:14 UTC
bbd14cb Petr Baudis 29 July 2005, 12:53:38 UTC [PATCH] git-merge-cache -q doesn't complain about failing merge program git-merge-cache reporting failed merge program is undesirable for Cogito, since it emits its own more appropriate error message in that case. However, I want to show other possible git-merge-cache error messages. So -q will just silence this particular error. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> 01 August 2005, 22:20:14 UTC
4d8fa91 Linus Torvalds 01 August 2005, 19:11:53 UTC [PATCH] Fix sparse warnings A few sparse warnings have crept in again since I checked last time: undeclared variables with global scope. Fix them by marking the private variables properly "static". Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 01 August 2005, 20:28:58 UTC
9b75e9f Johannes Schindelin 01 August 2005, 14:32:37 UTC [PATCH] Do not rely on a sane wc Some implementations of wc pad the line number with white space, which expr does not grok as a number. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 01 August 2005, 20:27:09 UTC
ade75a5 Johannes Schindelin 01 August 2005, 14:33:19 UTC [PATCH] Updates to tutorial.txt Fix a few typos. Adapt to git-http-pull not borking on packed repositories. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 01 August 2005, 20:27:08 UTC
3206014 Junio C Hamano 01 August 2005, 19:33:05 UTC CVS-like push-pull description update. - Yes, push does not lock, but that does not mean it is not meant for multi-user repository. It just ought to perform correctly without using locks. - Let's not pretend we know _the_ right way. Signed-off-by: Junio C Hamano <junkio@cox.net> 01 August 2005, 19:47:30 UTC
7da71de Johannes Schindelin 01 August 2005, 14:32:58 UTC [PATCH] Updates for cvs-migration.txt Signed-off-by: Junio C Hamano <junkio@cox.net> 01 August 2005, 19:47:20 UTC
c742b81 A Large Angry SCM 01 August 2005, 14:05:57 UTC [PATCH] Fix warning about non-void return in a void function. Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 01 August 2005, 19:47:19 UTC
0f2b4c4 Junio C Hamano 01 August 2005, 07:41:49 UTC Retire git-fetch-dumb-http and missing-revs Now git-http-pull knows how to do packed repo, retire scripted hacks I placed as a stop-gap measure. Signed-off-by: Junio C Hamano <junkio@cox.net> 01 August 2005, 07:41:49 UTC
182005b barkalow@iabervon.org 01 August 2005, 00:54:17 UTC [PATCH] Support downloading packs by HTTP (whitespace fixed) This adds support to http-pull for finding the list of pack files available on the server, downloading the index files for those pack files, and downloading pack files when they contain needed objects not available individually. It retains the index files even if the pack files were not needed, but downloads the list of pack files once per run if an object is not found separately. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 01 August 2005, 06:30:59 UTC
bf592c5 barkalow@iabervon.org 01 August 2005, 00:53:44 UTC [PATCH] Functions for managing the set of packs the library is using (whitespace fixed) This adds support for reading an uninstalled index, and installing a pack file that was added while the program was running, as well as functions for determining where to put the file. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 01 August 2005, 06:30:59 UTC
b1bf95b Josef Weidendorfer 31 July 2005, 19:17:43 UTC [PATCH] Added hook in git-receive-pack Just before updating a ref, $GIT_DIR/hooks/update refname old-sha1 new-sha1 is called if executable. The hook can decline the ref to be updated by exiting with a non-zero status, or allow it to be updated by exiting with a zero status. The mechanism also allows e.g sending of a mail with pushed commits on the remote repository. Documentation update with an example hook is included. jc: The credits of the basic idea and initial implementation go to Josef, but I ended up rewriting major parts of his patch, so bugs are all mine. Also I changed the semantics for the hook from his original version (which were post-update hook) so that the hook can optionally decline to update the ref, and also can be used to implement the overall cleanups. The latter was primarily to implement a suggestion from Linus that calling update-server-info should be made optional. Signed-off-by: Junio C Hamano <junkio@cox.net> 01 August 2005, 06:30:59 UTC
9f6cf65 barkalow@iabervon.org 31 July 2005, 19:59:20 UTC [PATCH] Fix support for old libcurl Old libcurl has curl_easy_setopt(), and http-pull requires it; it just doesn't have one of the options. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 31 July 2005, 23:28:56 UTC
a52b41b Junio C Hamano 31 July 2005, 19:06:22 UTC Fix typo in recent Makefile cleanup (again). Another instance of $(bin) was missed when it was renamed to $(bindir). Signed-off-by: Junio C Hamano <junkio@cox.net> 31 July 2005, 19:06:22 UTC
5da5c8f Junio C Hamano 30 July 2005, 07:58:28 UTC Teach parse_commit_buffer about grafting. Introduce a new file $GIT_DIR/info/grafts (or $GIT_GRAFT_FILE) which is a list of "fake commit parent records". Each line of this file is a commit ID, followed by parent commit IDs, all 40-byte hex SHA1 separated by a single SP in between. The records override the parent information we would normally read from the commit objects, allowing both adding "fake" parents (i.e. grafting), and pretending as if a commit is not a child of some of its real parents (i.e. cauterizing). Signed-off-by: Junio C Hamano <junkio@cox.net> 31 July 2005, 18:58:49 UTC
60036a4 Junio C Hamano 31 July 2005, 00:31:47 UTC Add a stupid "count objects" script. This counts the number of unpacked object files and disk space consumed by them, to help you decide when it is a good time to repack. Signed-off-by: Junio C Hamano <junkio@cox.net> 31 July 2005, 18:58:43 UTC
96155e5 Junio C Hamano 26 July 2005, 05:42:18 UTC Fetch from a packed repository on dumb servers. Implement fetching from a packed repository over http/https using the dumb server support files. I consider some parts of the logic should be in a separate C program, but it appears to work with my simple tests. I have backburnered it for a bit too long for my liking, so let's throw it out in the open and see what happens. Signed-off-by: Junio C Hamano <junkio@cox.net> 31 July 2005, 18:56:44 UTC
80bd6f3 Junio C Hamano 31 July 2005, 17:32:49 UTC Merge with gitk. 31 July 2005, 17:32:49 UTC
1115fb3 Paul Mackerras 31 July 2005, 11:35:21 UTC Fix some bugs causing application error popups. Specifically this should fix the following errors: wrong # args: should be "startdiff ids" (fix from Junio Hamano) can't read "filelines(....)": no such element in array can't unset "treepending": no such variable 31 July 2005, 11:35:21 UTC
b2c0bd6 Johannes Schindelin 31 July 2005, 00:14:23 UTC [PATCH] add NO_CURL option to the Makefile This patch implements Linus' idea that if you are not interested in pulling by HTTP, you can now say NO_CURL=1 make to compile everything except git-http-pull (thus not needing curl at all). Signed-off-by: Junio C Hamano <junkio@cox.net> 31 July 2005, 06:01:09 UTC
4f7eb2e Linus Torvalds 30 July 2005, 22:10:20 UTC Fix merge-base from getting confused. On Sat, 30 Jul 2005, Linus Torvalds wrote: > > Yup, it's git-merge-base, and it is confused by the same thing that > confused git-rev-list. Hmm.. Here's a tentative fix. I'm not really happy with it, and maybe somebody else can come up with a better one. I think this one ends up being quite a bit more expensive than the old one (it will look up _all_ common parents that have a child that isn't common, and then select the newest one of the bunch), but I haven't really thought it through very much. Signed-off-by: Linus Torvalds <torvalds@osdl.org> 31 July 2005, 05:58:21 UTC
8cc6a08 Linus Torvalds 30 July 2005, 17:08:20 UTC [PATCH] Making it easier to find which change introduced a bug This adds a new "git bisect" command. - "git bisect start" start bisection search. - "git bisect bad <rev>" mark some version known-bad (if no arguments, then current HEAD) - "git bisect good <revs>..." mark some versions known-good (if no arguments, then current HEAD) - "git bisect reset <branch>" done with bisection search and go back to your work (if no arguments, then "master"). The way you use it is: git bisect start git bisect bad # Current version is bad git bisect good v2.6.13-rc2 # v2.6.13-rc2 was the last version # tested that was good When you give at least one bad and one good versions, it will bisect the revision tree and say something like: Bisecting: 675 revisions left to test after this and check out the state in the middle. Now, compile that kernel, and boot it. Now, let's say that this booted kernel works fine, then just do git bisect good # this one is good which will now say Bisecting: 337 revisions left to test after this and you continue along, compiling that one, testing it, and depending on whether it is good or bad, you say "git bisect good" or "git bisect bad", and ask for the next bisection. Until you have no more left, and you'll have been left with the first bad kernel rev in "refs/bisect/bad". Oh, and then after you want to reset to the original head, do a git bisect reset to get back to the master branch, instead of being in one of the bisection branches ("git bisect start" will do that for you too, actually: it will reset the bisection state, and before it does that it checks that you're not using some old bisection branch). Not really any harder than doing series of "quilt push" and "quilt pop", now is it? [jc: This patch is a rework based on what Linus posted to the list. The changes are: - The original introduced four separate commands, which was three too many, so I merged them into one with subcommands. - Since the next thing you would want to do after telling it "bad" and "good" is always to bisect, this version does it automatically for you. - I think the termination condition was wrong. The original version checked if the set of revisions reachable from next bisection but not rechable from any of the known good ones is empty, but if the current bisection was a bad one, this would not terminate, so I changed it to terminate it when the set becomes a singleton or empty. - Removed the use of shell array variable. ] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 21:03:14 UTC
9e95049 Junio C Hamano 30 July 2005, 05:43:06 UTC NO_OPENSSL should really mean no openssl. Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 18:10:44 UTC
9e44f89 Junio C Hamano 30 July 2005, 01:38:15 UTC Fix typo in recent Makefile cleanup. Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 01:38:15 UTC
adcd351 Matthias Urlichs 29 July 2005, 18:10:46 UTC [PATCH] document git-rev-list better Document new (and not-so-new) flags of git-rev-list. Signed-off-By: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 00:21:53 UTC
623c8a1 Petr Baudis 29 July 2005, 17:21:53 UTC [PATCH] Build commands through object files Separate the process of building the commands to compilation and linkage. This makes it more consistent with the library objects, is the traditional thing to do, and significantly speeds up the subsequent rebuilds, especially for us the people who develop git on 300MHz notebooks. Ported from Cogito. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 00:21:53 UTC
eb3c430 Junio C Hamano 29 July 2005, 22:32:43 UTC Skip --merge-order test when built with NO_OPENSSL When built with NO_OPENSSL, rev-list --merge-order does not work, causing t6001 test to fail. Detect that and skip this test to allow continuing to the rest of the tests. Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 00:21:53 UTC
dd53c7a Petr Baudis 29 July 2005, 15:50:51 UTC [PATCH] Support for NO_OPENSSL Support for completely OpenSSL-less builds. FSF considers distributing GPL binaries with OpenSSL linked in as a legal problem so this is trouble e.g. for Debian, or some people might not want to install OpenSSL anyway. If you make NO_OPENSSL=1 you get completely OpenSSL-less build, disabling --merge-order and using Mozilla's SHA1 implementation. Ported from Cogito. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 00:21:52 UTC
28818ff Petr Baudis 29 July 2005, 15:50:24 UTC [PATCH] Reorder Makefile rules The Makefile rules were massively reordered so that they are actually logically grouped now. Captions were added to separate the sections. No rule contents was touched during the process. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 00:21:52 UTC
e468305 Petr Baudis 29 July 2005, 15:48:50 UTC [PATCH] Remove the explicit Makefile dependencies description Remove about one gazillion of explicit dependency rules with few lines describing the general dependency pattern and then the exceptions. This noticably shortens the Makefile and makes it easier to touch it. This is part of the Cogito Makefile changes port. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 00:21:51 UTC
5bdac8b Petr Baudis 29 July 2005, 15:48:26 UTC [PATCH] Improve the compilation-time settings interface Describe variables which make itself takes and adjusts compilation accordingly (MOZILLA_SHA1, NO_OPENSSL, PPC_SHA1), and make adding defines more convenient through the $DEFINES variable. $COPTS includes -g as well now and is not overriden if it was already declared in the environment. Also, $CFLAGS is appended to rather than reset, so that if there was already a $CFLAGS environment variable, it's appended to. Some more variables are also made overridable through the environment. Renamed $bin to $bindir which is the name commonly used for this. This is part of the Cogito Makefile changes port. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 00:21:51 UTC
4d1f119 Petr Baudis 29 July 2005, 09:01:26 UTC [PATCH] Unify usage strings declaration All usage strings are now declared as static const char []. This is carried over from my old git-pb branch. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 00:21:50 UTC
0b124bb Petr Baudis 29 July 2005, 09:00:45 UTC [PATCH] Trivial tidyups Simple whitespace-related tidyups ensuring style consistency. This is carried over from my old git-pb branch. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 00:21:49 UTC
e35f982 Pavel Roskin 29 July 2005, 14:49:14 UTC [PATCH] mmap error handling I have reviewed all occurrences of mmap() in git and fixed three types of errors/defects: 1) The result is not checked. 2) The file descriptor is closed if mmap() succeeds, but not when it fails. 3) Various casts applied to -1 are used instead of MAP_FAILED, which is specifically defined to check mmap() return value. [jc: This is a second round of Pavel's patch. He fixed up the problem that close() potentially clobbering the errno from mmap, which the first round had.] Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 00:21:48 UTC
1df092d Junio C Hamano 29 July 2005, 06:53:29 UTC Documentation and tests: ls-files exclude pattern. Update the tests and documentation to match the new "last one determines its fate" semantics. Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 00:21:47 UTC
fee8825 Junio C Hamano 29 July 2005, 06:32:20 UTC ls-files: rework exclude patterns. Pasky and others raised many valid points on the problems initial exclude pattern enhancement work had. Based on the list discussion, rework the exclude logic to use "last match determines its fate" rule, and order the list by exclude-from (the fallback default pattern file), exclude-per-directory (shallower to deeper, so deeper ones can override), and then command line exclude patterns. Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 00:21:47 UTC
6c3b84c Linus Torvalds 29 July 2005, 22:50:30 UTC [PATCH] Fix interesting git-rev-list corner case This corner-case was triggered by a kernel commit that was not in date order, due to a misconfigured time zone that made the commit appear three hours older than it was. That caused git-rev-list to traverse the commit tree in a non-obvious order, and made it parse several of the _parents_ of the misplaced commit before it actually parsed the commit itself. That's fine, but it meant that the grandparents of the commit didn't get marked uninteresting, because they had been reached through an "interesting" branch. The reason was that "mark_parents_uninteresting()" (which is supposed to mark all existing parents as being uninteresting - duh) didn't actually traverse more than one level down the parent chain. NORMALLY this is fine, since with the date-based traversal order, grandparents won't ever even have been looked at before their parents (so traversing the chain down isn't needed, because the next time around when we pick out the parent we'll mark _its_ parents uninteresting), but since we'd gotten out of order, we'd already seen the parent and thus never got around to mark the grandparents. Anyway, the fix is simple. Just traverse parent chains recursively. Normally the chain won't even exist (since the parent hasn't been parsed yet), so this is not actually going to trigger except in this strange corner-case. Add a comment to the simple one-liner, since this was a bit subtle, and I had to really think things through to understand how it could happen. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 30 July 2005, 00:21:46 UTC
a05ed8c Junio C Hamano 29 July 2005, 05:33:45 UTC Tutorial: use a bit longer sample filenames. Darrin Thompson noticed when he was showing off GIT to others that the use of filenames "a" and "b" in the tutorial example was unnecessarily confusing, especially with our "patch -p1" prefix a/ and b/, without giving us any patch. I was very tempted to change them back to l/ and k/ prefixes, but decided to restrain myself and update the tutorial instead ;-). Signed-off-by: Junio C Hamano <junkio@cox.net> 29 July 2005, 17:23:38 UTC
4a30976 Johannes Schindelin 29 July 2005, 02:24:13 UTC [PATCH] support older versions of libcurl Some newer features of libcurl are used which are not strictly necessary for http-pull. Use them only if libcurl is new enough to know about them. [jc: I just reworked #ifdef sprinkled all over the code into a single section that defines a set of macros.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 29 July 2005, 17:21:19 UTC
89ab859 Junio C Hamano 29 July 2005, 17:17:37 UTC Merge with gitk. 29 July 2005, 17:17:37 UTC
c8a4acb Paul Mackerras 29 July 2005, 14:23:03 UTC Improve the merge display when the result differs from all parents. Now we see if the result is quite similar to one of the parents, and if it is, display the result as a diff from that parent. If the result is similar to more than one parent, pick the one that it's most similar to. 29 July 2005, 14:23:03 UTC
bfb1536 Johannes Schindelin 28 July 2005, 14:51:41 UTC [PATCH] socklen_t needs to be defined and libssl to be linked on old Mac OS X On older Mac OS X (10.2.8), no socklen_t is defined, and therefore daemon.c does not compile. However, Mac OS X 10.4 seems to define socklen_t differently. Also, linking fails due to some symbols defined in libssl (not just libcrypto). [jc: I am tentatively dropping the socklen_t part of the patch because I am waiting for confirmation on the server side IPV6 patch from Yoshifuji-san] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 29 July 2005, 07:12:03 UTC
148519b Johannes Schindelin 28 July 2005, 14:48:37 UTC [PATCH] support bc version 1.04 Test t6002 unnecessarily fails when bc is a bit older than average. Signed-off-by: Johannes.Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 29 July 2005, 07:12:03 UTC
bd6bc56 Johannes Schindelin 28 July 2005, 14:48:13 UTC [PATCH] remove "-r" option to xargs git-prune-script still contained that non-portable option. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 29 July 2005, 07:12:02 UTC
b614e3d Junio C Hamano 28 July 2005, 21:33:17 UTC server-info: do not complain if a tag points at a non-commit. Linux 2.6 tree has one of those tree tags. Signed-off-by: Junio C Hamano <junkio@cox.net> 29 July 2005, 07:12:02 UTC
6291709 Linus Torvalds 29 July 2005, 03:37:23 UTC [PATCH] Make git-apply --stat less butt-ugly with long filenames When git-apply was printing out long filenames, it used to just truncate them to show the last "max_len" characters of the filename. Which can be really quite ugly (note the two filenames that have just been silently truncated from the beginning - it looks even worse when there are lots of them, like there were in the current v2.6.13-rc4 cris arch update): Documentation/video4linux/README.saa7134 | 9 Documentation/video4linux/bttv/Cards | 74 umentation/video4linux/hauppauge-wintv-cx88-ir.txt | 54 Documentation/video4linux/lifeview.txt | 42 mentation/video4linux/not-in-cx2388x-datasheet.txt | 41 Documentation/w1/w1.generic | 107 With this patch it now looks like so: Documentation/video4linux/README.saa7134 | 9 Documentation/video4linux/bttv/Cards | 74 .../video4linux/hauppauge-wintv-cx88-ir.txt | 54 Documentation/video4linux/lifeview.txt | 42 .../video4linux/not-in-cx2388x-datasheet.txt | 41 Documentation/w1/w1.generic | 107 ie we've made it clear with an ellipsis that we've cut off something from the beginning, and it also tries to do it cleanly at a subdirectory level. Signed-off-by: Linus "good taste" Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 29 July 2005, 04:05:06 UTC
73b6a6c Junio C Hamano 28 July 2005, 07:28:44 UTC [PATCH] gitk: Use GIT_DIR where appropriate. Some places assumed .git is the GIT_DIR, resulting heads and tags not showing when it was run like "GIT_DIR=. gitk --all". This is not a contrived example --- I rely on it to verify my private copy of git.git repository before pushing it out. Define a single procedure "gitdir" and use it. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Paul Mackerras <paulus@samba.org> 28 July 2005, 12:29:59 UTC
df076bd YOSHIFUJI Hideaki 23 July 2005, 08:24:59 UTC [PATCH] GIT: Listen on IPv6 as well, if available. Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 28 July 2005, 05:47:07 UTC
429a935 Ryan Anderson 25 July 2005, 06:13:11 UTC [PATCH] Add documentation for git-rename-script Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 28 July 2005, 05:47:07 UTC
d36ac03 Ryan Anderson 25 July 2005, 05:26:47 UTC [PATCH] Add support for directories to git-rename-script. Oh, and in the process, rewrite it in Perl. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 28 July 2005, 05:47:06 UTC
4ef1753 Paul Mackerras 28 July 2005, 03:16:51 UTC Import the --topo-order change and fix the writing of ~/.gitk. 28 July 2005, 03:16:51 UTC
9d2a52e Paul Mackerras 28 July 2005, 03:15:47 UTC Display the diffs for a merge in a unified fashion. Stuff that ended up in the result is shown in bold with a "+" at the beginning of the line; stuff that didn't is in the normal font with a "-" at the beginning of the line. The color shows which parent the stuff was in; red for the first parent, blue for the second, then green, purple, brown, and the rest are grey. If the result is different from all of the parents it is shown in black (and bold). 28 July 2005, 03:15:47 UTC
fb6a3d8 Junio C Hamano 28 July 2005, 01:55:18 UTC Document --strict flag to the fsck-cache command. Signed-off-by: Junio C Hamano <junkio@cox.net> 28 July 2005, 01:57:14 UTC
6407180 Linus Torvalds 27 July 2005, 23:08:43 UTC git-fsck-cache: be stricter about "tree" objects In particular, warn about things like zero-padding of the mode bits, which is a big no-no, since it makes otherwise identical trees have different representations (and thus different SHA1 numbers). Also make the warnings more regular. Signed-off-by: Linus Torvalds <torvalds@osdl.org> 28 July 2005, 01:57:14 UTC
4e81304 Linus Torvalds 27 July 2005, 22:29:38 UTC git-convert-cache: fix up mode conversion The old mode conversion was not only complex, it also refused to change the length of a mode, which made it fragile. By moving the mode conversion around a bit, we can not only simplify it, it also ends up being more powerful. Also fix a memory leak that made it impossible to convert huge archives without tons and tons of memory. Signed-off-by: Linus Torvalds <torvalds@osdl.org> 28 July 2005, 01:57:13 UTC
de2eb7f Linus Torvalds 27 July 2005, 22:16:03 UTC git-fsck-cache.c: check commit objects more carefully We historically used to be very careful in fsck-cache, but when it was re-written to use "parse_object()" instead of parsing everything by hand, it lost a bit of the checks. This, together with the previous commit, should make it do more proper commit object syntax checks. Also add a "--strict" flag, which warns about the old-style "0664" file mode bits, which shouldn't exist in modern trees, but that happened early on in git trees and that the default git-fsck-cache thus silently accepts. Signed-off-by: Linus Torvalds <torvalds@osdl.org> 28 July 2005, 01:57:03 UTC
f7cc77d Linus Torvalds 27 July 2005, 22:12:48 UTC Make "parse_commit()" be a lot more careful This was brought on by a bad tree of Thomas Gleixner, where some bogus commit objects weren't warned about properly Signed-off-by: Linus Torvalds <torvalds@osdl.org> 28 July 2005, 01:56:29 UTC
f315724 Linus Torvalds 27 July 2005, 03:04:22 UTC Tutorial typofix. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 27 July 2005, 18:53:49 UTC
54c6870 Junio C Hamano 27 July 2005, 07:04:16 UTC Typofix: usage strings fix. The *_usage strings should not start with "usage: ", since the usage() function gives its own. Signed-off-by: Junio C Hamano <junkio@cox.net> 27 July 2005, 18:53:49 UTC
b134922 Linus Torvalds 27 July 2005, 03:04:22 UTC git-log: make sure we have some commit to start from. When no usable head/tag is specified, git log barfed with underlying error message from rev-list, which was not helpful. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 27 July 2005, 18:53:48 UTC
9969b64 Junio C Hamano 26 July 2005, 18:47:31 UTC request-pull: minor tweaks. - use --verify to make sure rev param is a rev, and barf otherwise. - make it always output to stdout; no funny business with tee. - take optional branch head name to specify which branch to summarize. - show baserev in a human readable way. - do not depend on diffstat; use git-apply --stat instead. Signed-off-by: Junio C Hamano <junkio@cox.net> 27 July 2005, 18:53:48 UTC
ab421d2 Ryan Anderson 26 July 2005, 07:30:36 UTC [PATCH] Add git-request-pull-script, a short script that generates a summary of pending changes A short message requesting a pull from the repository is also included. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 27 July 2005, 18:53:47 UTC
b55db7b Ryan Anderson 27 July 2005, 08:36:08 UTC [PATCH] git-status-script was missed during the conversion from N -> A git-status-script was missed during the conversion from "N" to "A" as the new-file marker flag. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 27 July 2005, 18:47:51 UTC
a977d2c Ryan Anderson 23 July 2005, 19:26:32 UTC Deb Packaging fixes: Build against Mozilla libs for Debian, conflict with "git" This patch includes two fixes to the git-core Debian package: * Conflict with the GNU Interactive Tools package, which _also_ wants to install /usr/bin/git. * Compile against the unencumbered Mozilla SHA1 code, instead of the iffy OpenSSL code, as much as possible. This makes it easier to get the package included for distribution with Debian. This has been based upon the original patch by Sebastian Kuzminsky <seb@highlab.com>, but has been fixed up based upon feedback. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 27 July 2005, 05:23:19 UTC
bdf2514 Linus Torvalds 27 July 2005, 03:04:22 UTC Fix potential send-pack SIGSEGV The check that the source is ahead of the destination incorrectly expects pop_most_recent_commit() to gracefully handle an empty list. Fix by just checking the list itself, rather than the return value of the pop function. [jc: I did the test script that demonstrated the problem] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 27 July 2005, 05:23:18 UTC
2779fad Junio C Hamano 27 July 2005, 00:21:16 UTC Name it 0.99.2 Signed-off-by: Junio C Hamano <junkio@cox.net> 27 July 2005, 00:21:16 UTC
2bbcdde Junio C Hamano 26 July 2005, 07:22:43 UTC Adjust diff-raw tests to the status letter change. We use 'A' for added files instead of 'N' to make the it visually easier to distinguish from 'M' now. While we are at it, make the test scripts executable. Yes, I know it does not matter because t/Makefile runs them explicitly with "sh tXXXX-blah.sh", but being consistent is always better. Signed-off-by: Junio C Hamano <junkio@cox.net> 26 July 2005, 07:22:43 UTC
ca8c915 Junio C Hamano 25 July 2005, 21:31:19 UTC diff-raw: Use 'A' instead of 'N' for added files. This actually changes the diff-raw status letter from N to A for added files. Signed-off-by: Junio C Hamano <junkio@cox.net> 26 July 2005, 00:16:20 UTC
e7baa4f Junio C Hamano 25 July 2005, 20:05:44 UTC Use symbolic constants for diff-raw status indicators. Both Cogito and StGIT prefer to see 'A' for new files. The current 'N' is visually harder to distinguish from 'M', which is used for modified files. Prepare the internals to use symbolic constants to make the change easier. Signed-off-by: Junio C Hamano <junkio@cox.net> 26 July 2005, 00:15:34 UTC
30b0535 Junio C Hamano 24 July 2005, 22:47:26 UTC Documentation: describe git-ls-files --exclude patterns. Signed-off-by: Junio C Hamano <junkio@cox.net> 26 July 2005, 00:03:52 UTC
f87f949 Junio C Hamano 24 July 2005, 22:26:09 UTC git-ls-files: --exclude mechanism updates. Add --exclude-per-directory=<name> option that specifies a file to contain exclude patterns local to that directory and its subdirectories. Update the exclusion logic to be able to say "include files that match this more specific pattern, even though later exclude patterns may match them". Also enhances that a pattern can contain '/' in which case fnmatch is called with FNM_PATHNAME flag to match the entire path. Signed-off-by: Junio C Hamano <junkio@cox.net> 26 July 2005, 00:03:52 UTC
b7e438f Ryan Anderson 25 July 2005, 06:17:16 UTC Update the documentation for git-tag-script to reflect current behavior. [jc: I updated Ryan's patch to mention -a to create an unsigned tag.] Signed-off-by: Ryan Anderson <ryan@michonline.com> 25 July 2005, 23:34:26 UTC
0fad0fd Junio C Hamano 25 July 2005, 22:18:35 UTC git-tag-script updates. This adds -a (annotate only but not sign) option "A Large Angry SCM" <gitzilla@gmail.com> sent to the list, after fixing up the whitespace corruption in the patch, with some of my own fixes. Namely: * A new flag '-a' can be used to create an unsigned tag object; * The '-f' flag logic did not do the right thing; * When creating a signed tag, we did not check for GPG failure as we should; * Try to use the key for the tagger identity when signing the tag. Signed-off-by: Junio C Hamano <junkio@cox.net> 25 July 2005, 22:24:53 UTC
154d3d2 Linus Torvalds 24 July 2005, 03:28:34 UTC Fix up applymbox script for the addition of "git-" prefix Ehh, it works much better that way ;) 24 July 2005, 03:28:34 UTC
2002eed Junio C Hamano 23 July 2005, 23:35:25 UTC [PATCH] diffcore-pickaxe: switch to "counting" behaviour. Instead of finding old/new pair that one side has and the other side does not have the specified string, find old/new pair that contains the specified string as a substring different number of times. This would still not catch a case where you introduce two static variable declarations and remove two static function definitions from a file with -S"static", but would make it behave a bit more intuitively. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 24 July 2005, 03:27:49 UTC
399144f Linus Torvalds 24 July 2005, 01:52:22 UTC Add a "git rename" to help with - surprise surprise - renames It's stupid. We'd want to rename directories too, but this doesn't do that yet - easy enough to do per se, we just need to carefully list all the pathnames that got moved (and remember to ignore the files that weren't tracked but are in the subdirectory that got moved). Doing the directory case will require a bit more scripting.. Something like oldfiles=($(git-ls-files | grep '^$src')) newfiles=($(git-ls-files | sed ':^$src: s:^$src:$dst:')) mv $src $dst && git-update-cache --add --remove -- "${oldfiles[@]}" "${newfiles[@]}" might do it, except it needs to be done right, and carefully. Methinks perl is probably better at this. Hint hint.. 24 July 2005, 01:52:22 UTC
fd1fcd9 Linus Torvalds 24 July 2005, 01:46:27 UTC Rename the "tools" programs to also have the "git-" prefix Hey, people are using them, and we have an install target for them, so make sure that we can actually install them sanely without disturbing the namespace. 24 July 2005, 01:46:27 UTC
c0a58fb Junio C Hamano 24 July 2005, 00:55:07 UTC [PATCH] Support cloning packed repo from dumb http servers. Using the information prepared with update-server-info, a truly dumb http server can allow cloning with this client side support. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 24 July 2005, 01:28:19 UTC
61e3ef3 Junio C Hamano 24 July 2005, 00:54:56 UTC [PATCH] Document update-server-info. This adds a minimum documentation to the new command. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 24 July 2005, 01:28:19 UTC
8f3f9b0 Junio C Hamano 24 July 2005, 00:54:41 UTC [PATCH] Add update-server-info. The git-update-server-info command prepares informational files to help clients discover the contents of a repository, and pull from it via a dumb transport protocols. Currently, the following files are produced. - The $repo/info/refs file lists the name of heads and tags available in the $repo/refs/ directory, along with their SHA1. This can be used by git-ls-remote command running on the client side. - The $repo/info/rev-cache file describes the commit ancestry reachable from references in the $repo/refs/ directory. This file is in an append-only binary format to make the server side friendly to rsync mirroring scheme, and can be read by git-show-rev-cache command. - The $repo/objects/info/pack file lists the name of the packs available, the interdependencies among them, and the head commits and tags contained in them. Along with the other two files, this is designed to help clients to make smart pull decisions. The git-receive-pack command is changed to invoke it at the end, so just after a push to a public repository finishes via "git push", the server info is automatically updated. In addition, building of the rev-cache file can be done by a standalone git-build-rev-cache command separately. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 24 July 2005, 01:28:19 UTC
0fec082 Junio C Hamano 24 July 2005, 00:54:26 UTC [PATCH] git-ls-remote: show and optionally store remote refs. Retrieve and list the remote refs from git, http, and rsync repositories, and optionally stores the retrieved refs in the local repository under the same name. To access a git URL, git-peek-remote command is used. An http URL needs to have an up-to-date info/refs file for discovery, which will be introduced by a later update-server-info patch. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 24 July 2005, 01:28:19 UTC
508e67a Junio C Hamano 24 July 2005, 00:54:15 UTC [PATCH] Documentation: git-peek-remote. Add documentation for the git-peek-remote and link it from the main index. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 24 July 2005, 01:28:18 UTC
1870595 Junio C Hamano 24 July 2005, 00:54:03 UTC [PATCH] git-peek-remote: show tags and heads from a remote repository. Add a git-peek-remote command that talks with upload-pack the same way git-fetch-pack and git-clone-pack do, to show the references the remote side has on the standard output. A later patch introduces git-ls-remote that implements a UI to store tag values retrieved using this command. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 24 July 2005, 01:28:18 UTC
a7333f9 Linus Torvalds 23 July 2005, 22:24:53 UTC Update tutorial.txt branches/tags to use the nicer helper syntax Teach people to use "git tag <tag-name>" instead of writing the current HEAD by hand into the .git/refs/tags/<tag-name> file. Most people probably don't really want to know about how git does things internally. 23 July 2005, 22:24:53 UTC
d727782 Linus Torvalds 23 July 2005, 22:21:22 UTC Make "git tag" create both simple and signed tags A simple tag is just a direct pointer to the object, while a signed tag is a pointer to a "tag object" that has a pgp signature and points to the object we tagged. Use "git tag -s tagname" to create a signed tag. The "-f" flag overwrites any previous tag of that name (useful if you update a tag to point to a newer version for things like "latest" etc tags that aren't necessarily static versions). 23 July 2005, 22:21:22 UTC
1d8fa41 Junio C Hamano 23 July 2005, 09:10:31 UTC [PATCH] mailinfo: handle folded header. Some people split their long E-mail address over two lines using the RFC2822 header "folding". We can lose authorship information this way, so make a minimum effort to deal with it, instead of special casing only the "Subject:" field. We could teach mailsplit to unfold the folded header, but teaching mailinfo about folding would make more sense; a single message can be fed to mailinfo without going through mailsplit. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 23 July 2005, 18:13:11 UTC
ce6f8e7 Linus Torvalds 23 July 2005, 18:10:21 UTC Fix git protocol connection 'port' override It was broken by the IPv6 patches - we need to remove the ":" part from the hostname for a successful name lookup. 23 July 2005, 18:10:21 UTC
5ba8844 YOSHIFUJI Hideaki 21 July 2005, 13:10:36 UTC [PATCH] GIT: Try all addresses for given remote name Try all addresses for given remote name until it succeeds. Also supports IPv6. Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 23 July 2005, 18:05:58 UTC
34862b2 Ryan Anderson 22 July 2005, 06:36:07 UTC [PATCH] Deb packaging needs two more configuration files The deb package building needs these two new files to work correctly. debian/compat sets the rules under which the debhelper scripts (dh_*) operate. debian/git-core.install tells dh_install what files to install in each package that is generated. There is only one package being generated, so all files go into it. (I missed these in the last patch, mostly because I needed to do this to find stuff I had missed: find . -name .git -type d -prune -o -type f -print \ | grep -v -e .tree1 -e .tree2 \ | sed -e "s/^\.\///" \ | sort >.tree1 git-ls-files | grep -v -e .tree1 -e .tree2 \ | sort >.tree2 diff -u .tree1 .tree2 ) Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 23 July 2005, 18:05:58 UTC
71fb3de Ryan Anderson 22 July 2005, 05:55:56 UTC [PATCH] Deb packages should include the binaries The Deb packages were missing a dependency on "build install" from the binary target - this fixes that, and cleans up some inconsistencies elsewhere in the rulesets. Traditionally, Debian packaging uses a file called "build-stamp" (or "install-stamp", etc) in the main source tree. The initial deb package support for Git tried to move this "build-stamp" file into the debian/ directory, but some instances were missed. That problem, however, was incidental - the real fix is the missing dependency mentioned above. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 23 July 2005, 18:05:58 UTC
4311d32 Linus Torvalds 23 July 2005, 17:01:49 UTC Be more aggressive about marking trees uninteresting We'll mark all the trees at the edges (as deep as we had to go to realize that we have all the commits needed) as uninteresting. Otherwise we'll occasionally list a lot of objects that were actually available at the edge in a commit that we just never ended up parsing because we could determine early that we had all relevant commits. NOTE! The object listing is still just a _heuristic_. It's guaranteed to list a superset of the actual new objects, but there might be the occasional old object in the list, just because the commit that referenced it was much further back in the history. For example, let's say that a recent commit is a revert of part of the tree to much older state: since we didn't walk _that_ far back in the commit history tree to list the commits necessary, git-rev-tree will never have marked the old objects uninteresting, and we'll end up listing them as "new". That's ok. 23 July 2005, 17:01:49 UTC
a692b96 Junio C Hamano 23 July 2005, 02:13:07 UTC [PATCH] tutorial: mention "git clone" records .git/branches/origin Update the recommended workflow for individual developers. While they are tracking the origin, refs/heads/origin is updated by "git fetch", so there is no need to manually copy FETCH_HEAD to refs/heads/ anywhere. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net> 23 July 2005, 03:34:17 UTC
1cadb5a Junio C Hamano 23 July 2005, 02:11:22 UTC [PATCH] git-clone-script: store where we cloned from in .git/branches/origin A bit more usability enhancement, while retaining Cogito compatibility (and fixing the "-u" flag). Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net> 23 July 2005, 03:34:16 UTC
bf0dd8a Junio C Hamano 23 July 2005, 02:09:34 UTC [PATCH] Test framework: prettyprint the failed command. The output from a failure case had the test description message and the first line of the actual test script concatenated on the same line, which was ugly. Correct the output routine a bit to make it more readable. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net> 23 July 2005, 03:34:16 UTC
8cc3930 Junio C Hamano 23 July 2005, 02:09:20 UTC [PATCH] Install tools with "make install-tools". Match the main Makefile by separating COPTS from CFLAGS, defining INSTALL, prefix, and bin. Add a new target 'install-tools' to the main Makefile to install them. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net> 23 July 2005, 03:34:16 UTC
f6e1a4d Junio C Hamano 23 July 2005, 02:09:05 UTC [PATCH] Audit rev-parse users. This patch changes rev-parse users that pass a single argument that is supposed to be a rev parameter to use "--verify". Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net> 23 July 2005, 03:34:16 UTC
a38e727 Junio C Hamano 23 July 2005, 02:08:47 UTC [PATCH] git-branch: avoid getting confused by empty or nonexisting branches. When not specifying the start point explicitly, we ended up emitting ^0 in addition to the default HEAD. Be careful to see if we have "$2" before finding out which commit to base the new branch on. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net> 23 July 2005, 03:34:16 UTC
5bb2c65 Junio C Hamano 23 July 2005, 02:08:32 UTC [PATCH] Help scripts that use git-rev-parse to grok args with SP/TAB/LF The git-rev-parse command uses LF to separate each argument it parses, so its users at least need to set IFS to LF to be able to handle filenames with embedded SPs and TABs. Some commands, however, can take and do expect arguments with embedded LF, notably, "-S" (pickaxe) of diff family, so even this workaround does not work for them. When --sq flag to git-rev-parse is given, instead of showing one argument per line, it outputs arguments quoted for consumption with "eval" by the caller, to remedy this situation. As an example, this patch converts git-whatchanged to use this new feature. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 23 July 2005, 03:34:16 UTC
99cff83 Junio C Hamano 23 July 2005, 00:30:26 UTC [PATCH] Document "curl" requirements. Not just libcurl, but now we require curl executable as well. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 23 July 2005, 00:48:45 UTC
3dcb90f Darrin Thompson 13 July 2005, 02:12:40 UTC [PATCH] Support more http features: https no cert, .netrc -> auth Cause setting environment variable GIT_SSL_NO_VERIFY to turn off curl's ssl peer verification. Only use curl for http transfers, instead of curl and wget. Make curl check ~/.netrc for credentials. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 23 July 2005, 00:48:45 UTC
back to top