Skip to main content

Browse the archive

swh:1:snp:6df5a50b8107b6bbe1e51d0239d816a7503c536a
sort by:
Revision Author Date Message Commit Date
e1a0c8b Junio C Hamano 02 March 2006, 01:06:12 UTC Merge branch 'lt/fix-apply' into maint * lt/fix-apply: git-am: --whitespace=x option. git-apply: war on whitespace -- finishing touches. git-apply --whitespace=nowarn apply --whitespace: configuration option. apply: squelch excessive errors and --whitespace=error-all apply --whitespace fixes and enhancements. The war on trailing whitespace 02 March 2006, 01:06:12 UTC
9e7c73d Josef Weidendorfer 01 March 2006, 18:09:23 UTC git-mv: fixes for path handling Moving a directory ending in a slash was not working as the destination was not calculated correctly. E.g. in the git repo, git-mv t/ Documentation gave the error Error: destination 'Documentation' already exists To get rid of this problem, strip trailing slashes from all arguments. The comment in cg-mv made me curious about this issue; Pasky, thanks! As result, the workaround in cg-mv is not needed any more. Also, another bug was shown by cg-mv. When moving files outside of a subdirectory, it typically calls git-mv with something like git-mv Documentation/git.txt Documentation/../git-mv.txt which triggers the following error from git-update-index: Ignoring path Documentation/../git-mv.txt The result is a moved file, removed from git revisioning, but not added again. To fix this, the paths have to be normalized not have ".." in the middle. This was already done in git-mv, but only for a better visual appearance :( Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 01 March 2006, 20:13:46 UTC
5e6f85f Josef Weidendorfer 01 March 2006, 17:16:36 UTC git-mv: Allow -h without repo & fix error message This fixes "git-mv -h" to output the usage without the need to be in a git repository. Additionally: - fix confusing error message when only one arg was given - fix typo in error message Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 01 March 2006, 20:13:44 UTC
5734643 Junio C Hamano 19 February 2006, 07:42:03 UTC Allow git-mv to accept ./ in paths. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 9a0e6731c632c841cd2de9dec0b9091b2f10c6fd commit) 01 March 2006, 20:12:53 UTC
feffadd Mark Wooding 27 February 2006, 12:52:52 UTC combine-diff: Honour -z option correctly. Combined diffs don't null terminate things in the same way as standard diffs. This is presumably wrong. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 6baf0484efcd29bb5e58ccd5ea0379481d4a83f4 commit) 01 March 2006, 12:09:41 UTC
b9003c0 Mark Wooding 27 February 2006, 12:52:50 UTC combine-diff: Honour --full-index. For some reason, combined diffs don't honour the --full-index flag when emitting patches. Fix this. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from e70c6b35749c316f6e97099bd6bdac895c9d6f68 commit) 01 March 2006, 12:09:40 UTC
a64dd34 Junio C Hamano 01 March 2006, 04:19:47 UTC diffcore-break: micro-optimize by avoiding delta between identical files. We did not check if we have the same file on both sides when computing break score. This is usually not a problem, but if the user said --find-copies-harde with -B, we ended up trying a delta between the same data even when we know the SHA1 hash of both sides match. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from aeecd23ae2785a0462d42191974e9d9a8e439fbe commit) 01 March 2006, 12:08:12 UTC
12cbbdc Junio C Hamano 01 March 2006, 04:26:25 UTC git-am: --whitespace=x option. This is passed down to git-apply to override the built-in default and per-repository configuration at runtime. Signed-off-by: Junio C Hamano <junkio@cox.net> 01 March 2006, 06:38:40 UTC
56248c5 Junio C Hamano 28 February 2006, 09:12:52 UTC git-apply: war on whitespace -- finishing touches. This changes the default --whitespace policy to nowarn when we are only getting --stat, --summary etc. IOW when not applying the patch. When applying the patch, the default is warn (spit out warning message but apply the patch). Signed-off-by: Junio C Hamano <junkio@cox.net> 28 February 2006, 09:17:14 UTC
5c0d46e Junio C Hamano 28 February 2006, 01:07:16 UTC git-apply --whitespace=nowarn Andrew insists --whitespace=warn should be the default, and I tend to agree. This introduces --whitespace=warn, so if your project policy is more lenient, you can squelch them by having apply.whitespace=nowarn in your configuration file. Signed-off-by: Junio C Hamano <junkio@cox.net> 28 February 2006, 01:36:00 UTC
383e20b Junio C Hamano 27 February 2006, 22:47:45 UTC apply --whitespace: configuration option. The new configuration option apply.whitespace can take one of "warn", "error", "error-all", or "strip". When git-apply is run to apply the patch to the index, they are used as the default value if there is no command line --whitespace option. Andrew can now tell people who feed him git trees to update to this version and say: git repo-config apply.whitespace error Signed-off-by: Junio C Hamano <junkio@cox.net> 28 February 2006, 01:36:00 UTC
59aa256 Junio C Hamano 27 February 2006, 22:16:30 UTC apply: squelch excessive errors and --whitespace=error-all This by default makes --whitespace=warn, error, and strip to warn only the first 5 additions of trailing whitespaces. A new option --whitespace=error-all can be used to view all of them before applying. Signed-off-by: Junio C Hamano <junkio@cox.net> 28 February 2006, 01:35:59 UTC
5c7b580 Junio C Hamano 27 February 2006, 02:13:25 UTC apply --whitespace fixes and enhancements. In addition to fixing obvious command line parsing bugs in the previous round, this changes the following: * Adds "--whitespace=strip". This applies after stripping the new trailing whitespaces introduced to the patch. * The output error message format is changed to say "patch-filename:linenumber:contents of the line". This makes it similar to typical compiler error message format, and helps C-x ` (next-error) in Emacs compilation buffer. * --whitespace=error and --whitespace=warn do not stop at the first error. We might want to limit the output to say first 20 such lines to prevent cluttering, but on the other hand if you are willing to hand-fix after inspecting them, getting everything with a single run might be easier to work with. After all, somebody has to do the clean-up work somewhere. Signed-off-by: Junio C Hamano <junkio@cox.net> 28 February 2006, 01:35:59 UTC
1187df5 Linus Torvalds 26 February 2006, 17:29:00 UTC The war on trailing whitespace On Sat, 25 Feb 2006, Andrew Morton wrote: > > I'd suggest a) git will simply refuse to apply such a patch unless given a > special `forcing' flag, b) even when thus forced, it will still warn and c) > with a different flag, it will strip-then-apply, without generating a > warning. This doesn't do the "strip-then-apply" thing, but it allows you to make git-apply generate a warning or error on extraneous whitespace. Use --whitespace=warn to warn, and (surprise, surprise) --whitespace=error to make it a fatal error to have whitespace at the end. Totally untested, of course. But it compiles, so it must be fine. HOWEVER! Note that this literally will check every single patch-line with "+" at the beginning. Which means that if you fix a simple typo, and the line had a space at the end before, and you didn't remove it, that's still considered a "new line with whitespace at the end", even though obviously the line wasn't really new. I assume this is what you wanted, and there isn't really any sane alternatives (you could make the warning activate only for _pure_ additions with no deletions at all in that hunk, but that sounds a bit insane). Linus 28 February 2006, 01:35:59 UTC
a204756 Junio C Hamano 26 February 2006, 23:16:41 UTC sample hooks template. These two sample hooks try to detect and use the corresponding commit hook from the same repository. However, they forgot to set up GIT_DIR for their own use, so was not in effect. Signed-off-by: Junio C Hamano <junkio@cox.net> 26 February 2006, 23:16:41 UTC
6d5129a Junio C Hamano 24 February 2006, 10:21:00 UTC Merge branch 'fix' into maint * fix: git-am: do not allow empty commits by mistake. 24 February 2006, 10:21:00 UTC
7bd1527 Junio C Hamano 24 February 2006, 06:25:32 UTC Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak' and 'ar/fix-win' into maint * jc/fix-co-candy: checkout - eye candy. * jc/fix-rename-leak: diffcore-rename: plug memory leak. * ar/fix-win: fix t5600-clone-fail-cleanup.sh on windows 24 February 2006, 06:25:32 UTC
6d28644 Junio C Hamano 24 February 2006, 06:14:47 UTC git-am: do not allow empty commits by mistake. Running "git-am --resolved" without doing anything can create an empty commit. Prevent it. Thanks for Eric W. Biederman for spotting this. Signed-off-by: Junio C Hamano <junkio@cox.net> 24 February 2006, 06:14:47 UTC
edd3ebf Alex Riesen 23 February 2006, 11:25:20 UTC fix t5600-clone-fail-cleanup.sh on windows In windows you cannot remove current or opened directory, an opened file, a running program, a loaded library, etc... [jc: signoffs? With a minor quoting fix.] Signed-off-by: Junio C Hamano <junkio@cox.net> 23 February 2006, 11:47:15 UTC
09a5d72 Junio C Hamano 23 February 2006, 03:45:48 UTC diffcore-rename: plug memory leak. Spotted by Nicolas Pitre. Signed-off-by: Junio C Hamano <junkio@cox.net> 23 February 2006, 03:45:48 UTC
bd2afde Junio C Hamano 23 February 2006, 01:47:10 UTC Give no terminating LF to error() function. Signed-off-by: Junio C Hamano <junkio@cox.net> 23 February 2006, 03:10:26 UTC
744633c Junio C Hamano 23 February 2006, 03:02:39 UTC checkout - eye candy. This implements "eye candy" similar to the pack-object/unpack-object to entertain users while a large tree is being checked out after a clone or a pull. Signed-off-by: Junio C Hamano <junkio@cox.net> 23 February 2006, 03:04:06 UTC
6dc78e6 Junio C Hamano 22 February 2006, 21:10:37 UTC git-fetch: follow tag only when tracking remote branch. Unless --no-tags flag was given, git-fetch tried to always follow remote tags that point at the commits we picked up. It is not very useful to pick up tags from remote unless storing the fetched branch head in a local tracking branch. This is especially true if the fetch is done to merge the remote branch into our current branch as one-shot basis (i.e. "please pull"), and is even harmful if the remote repository has many irrelevant tags. This proposed update disables the automated tag following unless we are storing the a fetched branch head in a local tracking branch. Signed-off-by: Junio C Hamano <junkio@cox.net> 23 February 2006, 00:04:08 UTC
183bdb2 Junio C Hamano 23 February 2006, 00:02:59 UTC pack-objects eye-candy: finishing touches. This updates the progress output to match "every one second or every percent whichever comes early" used by unpack-objects, as discussed on the list. Signed-off-by: Junio C Hamano <junkio@cox.net> 23 February 2006, 00:02:59 UTC
5e8dc75 Nicolas Pitre 22 February 2006, 22:41:32 UTC also adds progress when actually writing a pack If that pack is big, it takes significant time to write and might benefit from some more eye candies as well. This is however disabled when the pack is written to stdout since in that case the output is usually piped into unpack_objects which already does its own progress reporting. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 22 February 2006, 22:51:58 UTC
b2504a0 Nicolas Pitre 22 February 2006, 21:00:08 UTC nicer eye candies for pack-objects This provides a stable and simpler progress reporting mechanism that updates progress as often as possible but accurately not updating more than once a second. The deltification phase is also made more interesting to watch (since repacking a big repository and only seeing a dot appear once every many seconds is rather boring and doesn't provide much food for anticipation). Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 22 February 2006, 21:15:26 UTC
d64e6b0 Junio C Hamano 19 February 2006, 04:51:26 UTC Keep Porcelainish from failing by broken ident after making changes. "empty ident not allowed" error makes commit-tree fail, so we are already safer in that we would not end up with commit objects that have bogus names on the author or committer fields. However, before commit-tree is called there are already changes made to the index file and the working tree. The operation can be resumed after fixing the environment problem, but when this triggers to a newcomer with unusable gecos, the first question becomes "what did I lose and how would I recover". This patch modifies some Porcelainish commands to verify GIT_COMMITTER_IDENT as soon as we know we are going to make some commits before doing much damage to prevent confusion. Signed-off-by: Junio C Hamano <junkio@cox.net> 22 February 2006, 21:14:57 UTC
589e4f9 Junio C Hamano 19 February 2006, 04:31:05 UTC Delay "empty ident" errors until they really matter. Previous one warned people upfront to encourage fixing their environment early, but some people just use repositories and git tools read-only without making any changes, and in such a case there is not much point insisting on them having a usable ident. This round attempts to move the error until either "git-var" asks for the ident explicitly or "commit-tree" wants to use it. Signed-off-by: Junio C Hamano <junkio@cox.net> 22 February 2006, 21:14:57 UTC
2fb4a21 Junio C Hamano 18 February 2006, 09:20:06 UTC Make "empty ident" error message a bit more helpful. It appears that some people who did not care about having bogus names in their own commit messages are bitten by the recent change to require a sane environment [*1*]. While it was a good idea to prevent people from using bogus names to create commits and doing sign-offs, the error message is not very informative. This patch attempts to warn things upfront and hint people how to fix their environments. [Footnote] *1* The thread is this one. http://marc.theaimsgroup.com/?t=113868084800004 Especially this message. http://marc.theaimsgroup.com/?m=113932830015032 Signed-off-by: Junio C Hamano <junkio@cox.net> 22 February 2006, 21:14:57 UTC
15b4d57 Junio C Hamano 18 February 2006, 04:58:45 UTC pack-objects: avoid delta chains that are too long. This tries to rework the solution for the excess delta chain problem. An earlier commit worked it around ``cheaply'', but repeated repacking risks unbound growth of delta chains. This version counts the length of delta chain we are reusing from the existing pack, and makes sure a base object that has sufficiently long delta chain does not get deltified. Signed-off-by: Junio C Hamano <junkio@cox.net> 22 February 2006, 21:14:57 UTC
4181bda Junio C Hamano 16 February 2006, 19:57:18 UTC git-repack: allow passing a couple of flags to pack-objects. A new flag -q makes underlying pack-objects less chatty. A new flag -f forces delta to be recomputed from scratch. Signed-off-by: Junio C Hamano <junkio@cox.net> 22 February 2006, 21:14:57 UTC
ab7cd7b Junio C Hamano 16 February 2006, 19:55:51 UTC pack-objects: finishing touches. This introduces --no-reuse-delta option to disable reusing of existing delta, which is a large part of the optimization introduced by this series. This may become necessary if repeated repacking makes delta chain too long. With this, the output of the command becomes identical to that of the older implementation. But the performance suffers greatly. It still allows reusing non-deltified representations; there is no point uncompressing and recompressing the whole text. It also adds a couple more statistics output, while squelching it under -q flag, which the last round forgot to do. $ time old-git-pack-objects --stdout >/dev/null <RL Generating pack... Done counting 184141 objects. Packing 184141 objects.................... real 12m8.530s user 11m1.450s sys 0m57.920s $ time git-pack-objects --stdout >/dev/null <RL Generating pack... Done counting 184141 objects. Packing 184141 objects..................... Total 184141, written 184141 (delta 138297), reused 178833 (delta 134081) real 0m59.549s user 0m56.670s sys 0m2.400s $ time git-pack-objects --stdout --no-reuse-delta >/dev/null <RL Generating pack... Done counting 184141 objects. Packing 184141 objects..................... Total 184141, written 184141 (delta 134833), reused 47904 (delta 0) real 11m13.830s user 9m45.240s sys 0m44.330s There is one remaining issue when --no-reuse-delta option is not used. It can create delta chains that are deeper than specified. A<--B<--C<--D E F G Suppose we have a delta chain A to D (A is stored in full either in a pack or as a loose object. B is depth1 delta relative to A, C is depth2 delta relative to B...) with loose objects E, F, G. And we are going to pack all of them. B, C and D are left as delta against A, B and C respectively. So A, E, F, and G are examined for deltification, and let's say we decided to keep E expanded, and store the rest as deltas like this: E<--F<--G<--A Oops. We ended up making D a bit too deep, didn't we? B, C and D form a chain on top of A! This is because we did not know what the final depth of A would be, when we checked objects and decided to keep the existing delta. Unfortunately, deferring the decision until just before the deltification is not an option. To be able to make B, C, and D candidates for deltification with the rest, we need to know the type and final unexpanded size of them, but the major part of the optimization comes from the fact that we do not read the delta data to do so -- getting the final size is quite an expensive operation. To prevent this from happening, we should keep A from being deltified. But how would we tell that, cheaply? To do this most precisely, after check_object() runs, each object that is used as the base object of some existing delta needs to be marked with the maximum depth of the objects we decided to keep deltified (in this case, D is depth 3 relative to A, so if no other delta chain that is longer than 3 based on A exists, mark A with 3). Then when attempting to deltify A, we would take that number into account to see if the final delta chain that leads to D becomes too deep. However, this is a bit cumbersome to compute, so we would cheat and reduce the maximum depth for A arbitrarily to depth/4 in this implementation. Signed-off-by: Junio C Hamano <junkio@cox.net> 22 February 2006, 21:14:57 UTC
3f9ac8d Junio C Hamano 16 February 2006, 01:34:29 UTC pack-objects: reuse data from existing packs. When generating a new pack, notice if we have already needed objects in existing packs. If an object is stored deltified, and its base object is also what we are going to pack, then reuse the existing deltified representation unconditionally, bypassing all the expensive find_deltas() and try_deltas() calls. Also, notice if what we are going to write out exactly match what is already in an existing pack (either deltified or just compressed). In such a case, we can just copy it instead of going through the usual uncompressing & recompressing cycle. Without this patch, in linux-2.6 repository with about 1500 loose objects and a single mega pack: $ git-rev-list --objects v2.6.16-rc3 >RL $ wc -l RL 184141 RL $ time git-pack-objects p <RL Generating pack... Done counting 184141 objects. Packing 184141 objects.................... a1fc7b3e537fcb9b3c46b7505df859f0a11e79d2 real 12m4.323s user 11m2.560s sys 0m55.950s With this patch, the same input: $ time ../git.junio/git-pack-objects q <RL Generating pack... Done counting 184141 objects. Packing 184141 objects..................... a1fc7b3e537fcb9b3c46b7505df859f0a11e79d2 Total 184141, written 184141, reused 182441 real 1m2.608s user 0m55.090s sys 0m1.830s Signed-off-by: Junio C Hamano <junkio@cox.net> 22 February 2006, 21:14:56 UTC
26125f6 Junio C Hamano 22 February 2006, 19:16:38 UTC detect broken alternates. The real problem triggered an earlier fix was that an alternate entry was pointing at a removed directory. Complaining on object/pack directory that cannot be opendir-ed produces noise in an ancient repository that does not have object/pack directory and has never been packed. Detect the real user error and report it. Also if opendir failed for other reasons (e.g. no read permissions), report that as well. Spotted by Andrew Vasquez <andrew.vasquez@qlogic.com>. Signed-off-by: Junio C Hamano <junkio@cox.net> 22 February 2006, 19:16:38 UTC
aa06474 Carl Worth 22 February 2006, 04:28:50 UTC git-push: Update documentation to describe the no-refspec behavior. It turns out that the git-push documentation didn't describe what it would do when not given a refspec, (not on the command line, nor in a remotes file). This is fairly important for the user who is trying to understand operations such as: git clone git://something/some/where # hack, hack, hack git push origin I tracked the mystery behavior down to git-send-pack and lifted the relevant portion of its documentation up to git-push, (namely that all refs existing both locally and remotely are updated). Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 22 February 2006, 06:11:50 UTC
fab5de7 Junio C Hamano 22 February 2006, 02:13:32 UTC format-patch: pretty-print timestamp correctly. Perl is not C and does not truncate the division result. Arghh! Signed-off-by: Junio C Hamano <junkio@cox.net> 22 February 2006, 02:13:32 UTC
60ace87 Carl Worth 21 February 2006, 23:33:49 UTC git-add: Add support for --, documentation, and test. This adds support to git-add to allow the common -- to separate command-line options and file names. It adds documentation and a new git-add test case as well. [jc: this should apply to 1.2.X maintenance series, so I reworked git-ls-files --error-unmatch test. ] Signed-off-by: Junio C Hamano <junkio@cox.net> 22 February 2006, 01:33:43 UTC
39ba7d5 Martin Mares 18 February 2006, 20:44:20 UTC Fix retries in git-cvsimport Fixed a couple of bugs in recovering from broken connections: The _line() method now returns undef correctly when the connection is broken instead of falling off the function and returning garbage. Retries are now reported to stderr and the eventual partially downloaded file is discarded instead of being appended to. The "Server gone away" test has been removed, because it was reachable only if the garbage return bug bit. Signed-off-by: Martin Mares <mj@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> 19 February 2006, 00:19:00 UTC
3ff903b Eric Wong 18 February 2006, 11:49:38 UTC archimport: remove files from the index before adding/updating This fixes a bug when importing where a directory gets removed/renamed but is immediately replaced by a file of the same name in the same changeset. This fix only applies to the accurate (default) strategy the moment. This patch should also fix the fast strategy if/when it is updated to handle the cases that would've triggered this bug. This bug was originally found in git-svn, but I remembered I did the same thing with archimport as well. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> 18 February 2006, 19:21:16 UTC
772d8a3 Shawn Pearce 17 February 2006, 07:26:16 UTC Make git-reset delete empty directories When git-reset --hard is used and a subdirectory becomes empty (as it contains no tracked files in the target tree) the empty subdirectory should be removed. This matches the behavior of git-checkout-index and git-read-tree -m which would not have created the subdirectory or would have deleted it when updating the working directory. Subdirectories which are not empty will be left behind. This may happen if the subdirectory still contains object files from the user's build process (for example). [jc: simplified the logic a bit, while keeping the test script.] 18 February 2006, 07:52:57 UTC
735d80b Jonas Fonseca 18 February 2006, 01:11:36 UTC Document --short and --git-dir in git-rev-parse(1) Signed-off-by: Jonas Fonseca <fonseca@diku.dk> 18 February 2006, 01:33:12 UTC
44de0da Jonas Fonseca 18 February 2006, 01:10:53 UTC git-rev-parse: Fix --short= option parsing Signed-off-by: Jonas Fonseca <fonseca@diku.dk> 18 February 2006, 01:33:11 UTC
b5b1699 Carl Worth 18 February 2006, 00:14:52 UTC Prevent git-upload-pack segfault if object cannot be found Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 18 February 2006, 00:20:51 UTC
eedf8f9 Carl Worth 17 February 2006, 21:33:26 UTC Abstract test_create_repo out for use in tests. Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 18 February 2006, 00:16:53 UTC
41ff7a1 Carl Worth 17 February 2006, 21:33:24 UTC Trap exit to clean up created directory if clone fails. Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 18 February 2006, 00:16:49 UTC
babfaf8 Josef Weidendorfer 15 February 2006, 19:22:11 UTC More useful/hinting error messages in git-checkout Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 16 February 2006, 03:14:04 UTC
6c5c62f Fernando J. Pereda 15 February 2006, 11:37:30 UTC Print an error if cloning a http repo and NO_CURL is set If Git is compiled with NO_CURL=YesPlease and one tries to clone a http repository, git-clone tries to call the curl binary. This trivial patch prints an error instead in such situation. Signed-off-by: Fernando J. Pereda <ferdy@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 16 February 2006, 03:14:01 UTC
504fe71 Junio C Hamano 15 February 2006, 00:05:57 UTC checkout: fix dirty-file display. When we refused to switch branches, we incorrectly showed differences from the branch we would have switched to. Signed-off-by: Junio C Hamano <junkio@cox.net> 15 February 2006, 00:05:57 UTC
9ece716 Junio C Hamano 14 February 2006, 09:11:42 UTC combine-diff: diff-files fix (#2) The raw format "git-diff-files -c" to show unmerged state forgot to initialize the status fields from parents, causing NUL characters to be emitted. Signed-off-by: Junio C Hamano <junkio@cox.net> 14 February 2006, 09:11:42 UTC
713a11f Junio C Hamano 14 February 2006, 07:07:04 UTC combine-diff: diff-files fix. When showing a conflicted merge from index stages and working tree file, we did not fetch the mode from the working tree, and mistook that as a deleted file. Also if the manual resolution (or automated resolution by git rerere) ended up taking either parent's version, we did not show _anything_ for that path. Either was quite bad and confusing. Signed-off-by: Junio C Hamano <junkio@cox.net> 14 February 2006, 07:07:04 UTC
3654638 Fredrik Kuivinen 13 February 2006, 23:15:14 UTC s/SHELL/SHELL_PATH/ in Makefile With the current Makefile we don't use the shell chosen by the platform specific defines when we invoke GIT-VERSION-GEN. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> 14 February 2006, 06:13:22 UTC
4631c00 Junio C Hamano 14 February 2006, 05:25:38 UTC bisect: remove BISECT_NAMES after done. I noticed that we forgot to clean this file and kept it that way, while trying to help with Andrew's bisect problem. Signed-off-by: Junio C Hamano <junkio@cox.net> 14 February 2006, 05:55:27 UTC
41ac06c Junio C Hamano 14 February 2006, 05:52:10 UTC Documentation: git-ls-files asciidocco. Noticed by Jon Nelson. Signed-off-by: Junio C Hamano <junkio@cox.net> 14 February 2006, 05:52:10 UTC
64491e1 Junio C Hamano 13 February 2006, 08:26:14 UTC Documentation: git-commit in 1.2.X series defaults to --include. The documentation was mistakenly describing the --only semantics to be default. The 1.2.0 release and its maintenance series 1.2.X will keep the traditional --include semantics as the default. Clarify the situation. Signed-off-by: Junio C Hamano <junkio@cox.net> 13 February 2006, 08:32:10 UTC
bd9ca0b Junio C Hamano 12 February 2006, 21:14:53 UTC GIT 1.2.0 Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 21:14:53 UTC
4bbdfab Junio C Hamano 12 February 2006, 21:13:12 UTC Fix "test: unexpected operator" on bsd This fixes the same issue as a previous fix by Alex Riesen does. Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 21:13:33 UTC
c5e09c1 Junio C Hamano 12 February 2006, 21:05:53 UTC git-commit: show dirtiness including index. Earlier, when we switched a branch we used diff-files to show paths that are dirty in the working tree. But we allow switching branches with updated index ("read-tree -m -u $old $new" works that way), and only showing paths that have differences in the working tree but not paths that are different in index was confusing. This shows both as modified from the top commit of the branch we just have switched to. Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 21:05:53 UTC
024701f Junio C Hamano 12 February 2006, 21:01:54 UTC Make pack-objects chattier. You could give -q to squelch it, but currently no tool does it. This would make 'git clone host:repo here' over ssh not silent again. Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 21:01:54 UTC
0dbc4e8 Alex Riesen 12 February 2006, 18:05:34 UTC avoid echo -e, there are systems where it does not work FreeBSD 4.11 being one example: the built-in echo doesn't have -e, and the installed /bin/echo does not do "-e" as well. "printf" works, laking just "\e" and "\xAB'. Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 19:36:19 UTC
ef1af9d Alex Riesen 12 February 2006, 18:03:16 UTC fix "test: 2: unexpected operator" on bsd Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 19:36:17 UTC
d7ee090 Linus Torvalds 12 February 2006, 19:24:50 UTC Fix object re-hashing The hashed object lookup had a subtle bug in re-hashing: it did for (i = 0; i < count; i++) if (objs[i]) { .. rehash .. where "count" was the old hash couny. Oon the face of it is obvious, since it clearly re-hashes all the old objects. However, it's wrong. If the last old hash entry before re-hashing was in use (or became in use by the re-hashing), then when re-hashing could have inserted an object into the hash entries with idx >= count due to overflow. When we then rehash the last old entry, that old entry might become empty, which means that the overflow entries should be re-hashed again. In other words, the loop has to be fixed to either traverse the whole array, rather than just the old count. (There's room for a slight optimization: instead of counting all the way up, we can break when we see the first empty slot that is above the old "count". At that point we know we don't have any collissions that we might have to fix up any more. This patch only does the trivial fix) [jc: with trivial fix on trivial fix] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 19:24:50 UTC
2b79636 Junio C Hamano 12 February 2006, 02:51:19 UTC hashtable-based objects: minimum fixups. Calling hashtable_index from find_object before objs is created would result in division by zero failure. Avoid it. Also the given object name may not be aligned suitably for unsigned int; avoid dereferencing casted pointer. Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 13:12:39 UTC
070879c Johannes Schindelin 12 February 2006, 01:57:57 UTC Use a hashtable for objects instead of a sorted list In a simple test, this brings down the CPU time from 47 sec to 22 sec. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 13:12:39 UTC
5b766ea kent@lysator.liu.se 12 February 2006, 12:00:52 UTC Add howto about separating topics. This howto consists of a footnote from an email by JC to the git mailing list (<7vfyms0x4p.fsf@assigned-by-dhcp.cox.net>). Signed-off-by: Kent Engstrom <kent@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 13:02:42 UTC
af8c28e Junio C Hamano 12 February 2006, 13:02:30 UTC Merge branch 'pb/repo' * pb/repo: Add support for explicit type specifiers when calling git-repo-config 12 February 2006, 13:02:30 UTC
c611db1 Junio C Hamano 12 February 2006, 13:02:25 UTC Merge branch 'jc/fixdiff' * jc/fixdiff: diff-tree: do not default to -c 12 February 2006, 13:02:25 UTC
4890f62 Junio C Hamano 11 February 2006, 20:39:11 UTC Avoid using "git-var -l" until it gets fixed. This is to be nicer to people with unusable GECOS field. "git-var -l" is currently broken in that when used by a user who does not have a usable GECOS field and has not corrected it by exporting GIT_COMMITTER_NAME environment variable it dies when it tries to output GIT_COMMITTER_IDENT (same thing for AUTHOR). "git-pull" used "git-var -l" only because it needed to get a configuration variable before "git-repo-config --get" was introduced. Use the latter tool designed exactly for this purpose. "git-sh-setup" used "git-var GIT_AUTHOR_IDENT" without actually wanting to use its value. The only purpose was to cause the command to check and barf if the repository format version recorded in the $GIT_DIR/config file is too new for us to deal with correctly. Instead, use "repo-config --get" on a random property and see if it die()s, and check if the exit status is 128 (comes from die -- missing variable is reported with exit status 1, so we can tell that case apart). Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 12:59:25 UTC
7162dff Petr Baudis 12 February 2006, 03:14:48 UTC Add support for explicit type specifiers when calling git-repo-config Currently, git-repo-config will just return the raw value of option as specified in the config file; this makes things difficult for scripts calling it, especially if the value is supposed to be boolean. This patch makes it possible to ask git-repo-config to check if the option is of the given type (int or bool) and write out the value in its canonical form. If you do not pass --int or --bool, the behaviour stays unchanged and the raw value is emitted. This also incidentally fixes the segfault when option with no value is encountered. [jc: tweaked the option parsing a bit to make it easier to see that the patch does not change anything but the type stuff in the diff output. Also changed to avoid "foo ? : bar" construct. ] Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 08:26:54 UTC
6932c78 Junio C Hamano 12 February 2006, 00:43:30 UTC diff-tree: do not default to -c Marco says it breaks qgit. This makes the flags a bit more orthogonal. $ git-diff-tree -r --abbrev ca18 No output from this command because you asked to skip merge by not having -m there. $ git-diff-tree -r -m --abbrev ca18 ca182053c7710a286d72102f4576cf32e0dafcfb :100644 100644 538d21d... 59042d1... M Makefile :100644 100644 410b758... 6c47c3a... M entry.c ca182053c7710a286d72102f4576cf32e0dafcfb :100644 100644 30479b4... 59042d1... M Makefile The same "independent sets of diff" as before without -c. $ git-diff-tree -r -m -c --abbrev ca18 ca182053c7710a286d72102f4576cf32e0dafcfb ::100644 100644 100644 538d21d... 30479b4... 59042d1... MM Makefile Combined. $ git-diff-tree -r -c --abbrev ca18 ca182053c7710a286d72102f4576cf32e0dafcfb ::100644 100644 100644 538d21d... 30479b4... 59042d1... MM Makefile Asking for combined without -m does not make sense, so -c implies -m. We need to supply -c as default to whatchanged, which is a one-liner. Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 07:18:33 UTC
16139f9 Junio C Hamano 12 February 2006, 07:08:23 UTC t5500: adjust to change in pack-object reporting behaviour. Now pack-object is not as chatty when its stderr is not connected to a terminal, so the test needs to be adjusted for that. Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 07:08:23 UTC
1536dd9 Junio C Hamano 12 February 2006, 02:55:43 UTC Only call git-rerere if $GIT_DIR/rr-cache exists. Johannes noticed that git-rerere depends on Digest.pm, and if one does not use the command, one can live without it. Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 02:55:43 UTC
7bbdeaa Christian Biesinger 11 February 2006, 15:44:11 UTC Use a relative path for SVN importing The absolute path (with the leading slash) breaks SVN importing, because it then looks for /trunk/... instead of /svn/trunk/... (in my case, the repository URL was https://servername/svn/) Signed-off-by: Christian Biesinger <cbiesinger@web.de> Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 01:59:38 UTC
21fcd1b Junio C Hamano 12 February 2006, 01:54:18 UTC fetch-clone progress: finishing touches. This makes fetch-pack also report the progress of packing part. Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 01:54:18 UTC
98deeaa Linus Torvalds 11 February 2006, 18:41:22 UTC Fix fetch-clone in the presense of signals We shouldn't fail a fetch just because a signal might have interrupted the read. Normally, we don't install any signal handlers, so EINTR really shouldn't happen. That said, really old versions of Linux will interrupt an interruptible system call even for signals that turn out to be ignored (SIGWINCH is the classic example - resizing your xterm would cause it). The same might well be true elsewhere too. Also, since receive_keep_pack() doesn't control the caller, it can't know that no signal handlers exist. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 00:50:03 UTC
c548cf4 Linus Torvalds 11 February 2006, 18:43:56 UTC Make "git clone" pack-fetching download statistics better Average it out over a few events to make the numbers stable, and fix the silly usec->binary-ms conversion. Yeah, yeah, it's arguably eye-candy to keep the user calm, but let's do that right. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 12 February 2006, 00:49:52 UTC
5ee2ad6 Linus Torvalds 11 February 2006, 04:31:09 UTC Make "git clone" less of a deathly quiet experience It used to be that "git-unpack-objects" would give nice percentages, but now that we don't unpack the initial clone pack any more, it doesn't. And I'd love to do that nice percentage view in the pack objects downloader too, but the thing doesn't even read the pack header, much less know how much it's going to get, so I was lazy and didn't. Instead, it at least prints out how much data it's gotten, and what the packing speed is. Which makes the user realize that it's actually doing something useful instead of sitting there silently (and if the recipient knows how large the final result is, he can at least make a guess about when it migt be done). So with this patch, I get something like this on my DSL line: [torvalds@g5 ~]$ time git clone master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 clone-test Packing 188543 objects 48.398MB (154 kB/s) where even the speed approximation seems to be roughtly correct (even though my algorithm is a truly stupid one, and only really gives "speed in the last half second or so"). Anyway, _something_ like this is definitely needed. It could certainly be better (if it showed the same kind of thing that git-unpack-objects did, that would be much nicer, but would require parsing the object stream as it comes in). But this is big step forward, I think. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 11 February 2006, 06:28:30 UTC
29e55cd Junio C Hamano 11 February 2006, 03:11:23 UTC Define GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL) to known values. Without these, running tests with an account with empty gecos field would fail. We might want to loosen error from "git-var -l" (but not "git-var GIT_AUTHOR_NAME") later, but that is more or less an independent issue. Signed-off-by: Junio C Hamano <junkio@cox.net> 11 February 2006, 03:11:23 UTC
3f6726e Junio C Hamano 11 February 2006, 02:47:41 UTC Merge branch 'lt/diff-tree' * lt/diff-tree: combine-diff: Record diff status a bit more faithfully find_unique_abbrev() simplification. combine-diff: move formatting logic to show_combined_diff() combined-diff: use diffcore before intersecting paths. diff-tree -c raw output 11 February 2006, 02:47:41 UTC
9ae6be8 Junio C Hamano 11 February 2006, 02:38:24 UTC git-commit -v: have patch at the end. It was pointed out that otherwise more important summary information prefixed with '#' would become prone to be missed. Also instead of chopping at the first '^---$' line, stop at the first 'diff --git a/' line. Signed-off-by: Junio C Hamano <junkio@cox.net> 11 February 2006, 02:44:31 UTC
9da5c2f Junio C Hamano 10 February 2006, 19:56:42 UTC rev-list: default to abbreviate merge parent names under --pretty. When we prettyprint commit log messages, merge parent names were often very long and there was no way to abbreviate it. This changes them to be abbreviated by default, and non-default abbreviations can be specified with --no-abbrev or --abbrev=<n> options. Note that this affects only the prettyprinted parent names. The output from --show-parents is meant for machine consumption and is not affected by this flag. 10 February 2006, 19:56:42 UTC
39556fb Nicolas Pitre 10 February 2006, 18:42:05 UTC delta micro optimization My kernel work habit made me look at the generated assembly for the delta code, and one obvious albeit small improvement is this patch. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 10 February 2006, 19:42:56 UTC
e7ad4a9 Nicolas Pitre 10 February 2006, 15:20:40 UTC count-delta.c: comment fixes There was a stale comment that explains why the old code could undercount when delta data copied things around inside detination buffer. We do not use that kind of delta, so the comment does not apply. 10 February 2006, 17:21:02 UTC
4d44cb1 Junio C Hamano 10 February 2006, 15:14:55 UTC Merge branch 'jc/empty-commit' * jc/empty-commit: t6000: fix a careless test library add-on. Do not allow empty name or email. 10 February 2006, 15:14:55 UTC
d416df8 Junio C Hamano 10 February 2006, 10:30:52 UTC combine-diff: Record diff status a bit more faithfully This shows "new file mode XXXX" and "deleted file mode XXXX" lines like two-way diff-patch output does, by checking the status from each parent. The diff-raw output for combined diff is made a bit uglier by showing diff status letters with each parent. While most of the case you would see "MM" in the output, an Evil Merge that touches a path that was added by inheriting from one parent is possible and it would be shown like these: $ git-diff-tree --abbrev -c HEAD 2d7ca89675eb8888b0b88a91102f096d4471f09f ::000000 000000 100644 0000000... 0000000... 31dd686... AA b ::000000 100644 100644 0000000... 6c884ae... c6d4fa8... AM d ::100644 100644 100644 4f7cbe7... f8c295c... 19d5d80... RR e Signed-off-by: Junio C Hamano <junkio@cox.net> 10 February 2006, 10:50:53 UTC
297a1aa Junio C Hamano 10 February 2006, 09:51:12 UTC find_unique_abbrev() simplification. Earlier it did not grok the 0{40} SHA1 very well, but what it needed to do was to find the shortest 0{N} that is not used as a valid object name to be consistent with the way names of valid objects are abbreviated. This makes some users simpler. Signed-off-by: Junio C Hamano <junkio@cox.net> 10 February 2006, 09:51:12 UTC
cf7bb58 Junio C Hamano 10 February 2006, 08:45:59 UTC git-status -v This revamps the git-status command to take the same set of parameters as git commit. It gives a preview of what is being committed with that command. With -v flag, it shows the diff output between the HEAD commit and the index that would be committed if these flags were given to git-commit command. git-commit also acquires -v flag (it used to mean "verify" but that is the default anyway and there is --no-verify to turn it off, so not much is lost), which uses the updated git-status -v to seed the commit log buffer. This is handy for writing a log message while reviewing the changes one last time. Now, git-commit and git-status are internally share the same implementation. Unlike previous git-commit change, this uses a temporary index to prepare the index file that would become the real index file after a successful commit, and moves it to the real index file once the commit is actually made. This makes it safer than the previous scheme, which stashed away the original index file and restored it after an aborted commit. Signed-off-by: Junio C Hamano <junkio@cox.net> 10 February 2006, 08:54:49 UTC
4dc870d Junio C Hamano 10 February 2006, 06:19:07 UTC Merge branch 'jc/ls-files-o' * jc/ls-files-o: ls-files: honour per-directory ignore file from higher directories. 10 February 2006, 06:19:07 UTC
91c7674 Junio C Hamano 10 February 2006, 01:15:59 UTC count-delta.c: Match the delta data semantics change in version 3. This matches the count_delta() logic to the change previous commit introduces to patch_delta(). Signed-off-by: Junio C Hamano <junkio@cox.net> 10 February 2006, 05:06:38 UTC
d60fc1c Nicolas Pitre 09 February 2006, 22:50:04 UTC remove delta-against-self bit After experimenting with code to add the ability to encode a delta against part of the deltified file, it turns out that resulting packs are _bigger_ than when this ability is not used. The raw delta output might be smaller, but it doesn't compress as well using gzip with a negative net saving on average. Said bit would in fact be more useful to allow for encoding the copying of chunks larger than 64KB providing more savings with large files. This will correspond to packs version 3. While the current code still produces packs version 2, it is made future proof so pack versions 2 and 3 are accepted. Any pack version 2 are compatible with version 3 since the redefined bit was never used before. When enough time has passed, code to use that bit to produce version 3 packs could be added. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 10 February 2006, 05:06:38 UTC
67d4221 Jason Riedy 10 February 2006, 01:56:13 UTC stat() for existence in safe_create_leading_directories() Use stat() to explicitly check for existence rather than relying on the non-portable EEXIST error in sha1_file.c's safe_create_leading_directories(). There certainly are optimizations possible, but then the code becomes almost the same as that in coreutil's lib/mkdir-p.c. Other uses of EEXIST seem ok. Tested on Solaris 8, AIX 5.2L, and a few Linux versions. AIX has some unrelated (I think) failures right now; I haven't tried many recent gits there. Anyone have an old Ultrix box to break everything? ;) Also remove extraneous #includes. Everything's already in git-compat-util.h, included through cache.h. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> 10 February 2006, 02:38:52 UTC
0a79807 Junio C Hamano 09 February 2006, 23:23:06 UTC combine-diff: move formatting logic to show_combined_diff() This way, diff-files can make use of it. Also implement the full suite of what diff_flush_raw() supports just for consistency. With this, 'diff-tree -c -r --name-status' would show what is expected. There is no way to get the historical output (useful for debugging and low-level Plumbing work) anymore, so tentatively it makes '-m' to mean "do not combine and show individual diffs with parents". diff-files matches diff-tree to produce raw output for -c. For textual combined diff, use -p -c. Signed-off-by: Junio C Hamano <junkio@cox.net> 09 February 2006, 23:23:06 UTC
ce1610e Junio C Hamano 09 February 2006, 22:41:39 UTC call git_config() after setup_git_directory() If you call setup_git_directory() to work from a subdirectory, that should be run first before running git_config(). Otherwise you would not read the configuration file from the correct place. Signed-off-by: Junio C Hamano <junkio@cox.net> 09 February 2006, 22:41:39 UTC
5b23683 Junio C Hamano 09 February 2006, 22:35:19 UTC combined-diff: use diffcore before intersecting paths. This is needed to make "diff-tree -c -M" to work semi-sensibly. Otherwise rename detection, pickaxe and friends would never be invoked. Signed-off-by: Junio C Hamano <junkio@cox.net> 09 February 2006, 22:35:19 UTC
147cf31 Jon Loeliger 09 February 2006, 15:12:11 UTC Add --diff-filter= documentation paragraph Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 09 February 2006, 20:06:57 UTC
ee63802 Linus Torvalds 09 February 2006, 18:30:28 UTC diff-tree -c raw output NOTE! This makes "-c" be the default, which effectively means that merges are never ignored any more, and "-m" is a no-op. So it changes semantics. I would also like to make "--cc" the default if you do patches, but didn't actually do that. The raw output format is not wonderfully pretty, but it's distinguishable from a "normal patch" in that a normal patch with just one parent has just one colon at the beginning, while a multi-parent raw diff has <n> colons for <n> parents. So now, in the kernel, when you do git-diff-tree cce0cac125623f9b68f25dd1350f6d616220a8dd (to see the manual ARM merge that had a conflict in arch/arm/Kconfig), you get cce0cac125623f9b68f25dd1350f6d616220a8dd ::100644 100644 100644 4a63a8e2e45247a11c068c6ed66c6e7aba29ddd9 77eee38762d69d3de95ae45dd9278df9b8225e2c 2f61726d2f4b636f6e66696700dbf71a59dad287 arch/arm/Kconfig ie you see two colons (two parents), then three modes (parent modes followed by result mode), then three sha1s (parent sha1s followed by result sha1). Which is pretty close to the normal raw diff output. Cool/stupid exercise: $ git-whatchanged | grep '^::' | cut -f2- | sort | uniq -c | sort -n | less -S will show which files have needed the most file-level merge conflict resolution. Useful? Probably not. But kind of interesting. For the kernel, it's .... 10 arch/ia64/Kconfig 11 drivers/scsi/Kconfig 12 drivers/net/Makefile 17 include/linux/libata.h 18 include/linux/pci_ids.h 23 drivers/net/Kconfig 24 drivers/scsi/libata-scsi.c 28 drivers/scsi/libata-core.c 43 MAINTAINERS Signed-off-by: Junio C Hamano <junkio@cox.net> 09 February 2006, 19:46:05 UTC
701ca74 Junio C Hamano 09 February 2006, 08:08:31 UTC ls-files: honour per-directory ignore file from higher directories. When git-ls-files -o --exclude-per-directory=.gitignore is run from a subdirectory, it did not read from .gitignore from its parent directory. Reading from them makes output from these two commands consistent: $ git ls-files -o --exclude-per-directory=.gitignore Documentation $ cd Documentation && git ls-files -o --exclude-per-directory=.gitignore Signed-off-by: Junio C Hamano <junkio@cox.net> 09 February 2006, 08:08:31 UTC
47e013f Junio C Hamano 07 February 2006, 23:35:46 UTC t6000: fix a careless test library add-on. It tried to "restore" GIT_AUTHOR_EMAIL environment variable but the variable started out as unset, so ended up setting it to an empty string. This is now caught as an error. Signed-off-by: Junio C Hamano <junkio@cox.net> 09 February 2006, 05:55:34 UTC
dfdd309 Junio C Hamano 07 February 2006, 21:19:10 UTC Do not allow empty name or email. Instead of silently allowing to create a bogus commit that lacks information by mistake, complain loudly and die. Signed-off-by: Junio C Hamano <junkio@cox.net> 09 February 2006, 05:55:34 UTC
d19e06f Andreas Ericsson 07 February 2006, 17:21:02 UTC .gitignore git-rerere and config.mak Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net> 07 February 2006, 21:19:51 UTC
deb989b Linus Torvalds 07 February 2006, 18:26:41 UTC Fix "git diff a..b" breakage The "--cc" implies "-p", but without the recursive part. Linus Signed-off-by: Junio C Hamano <junkio@cox.net> 07 February 2006, 21:19:50 UTC
back to top