| 423325a | Junio C Hamano | 04 December 2005, 07:46:02 UTC | GIT 0.99.9l aka 1.0rc4 | 04 December 2005, 07:46:02 UTC |
| d79374c | Junio C Hamano | 03 December 2005, 09:45:57 UTC | [PATCH] daemon.c and path.enter_repo(): revamp path validation. The whitelist of git-daemon is checked against return value from enter_repo(), and enter_repo() used to return the value obtained from getcwd() to avoid directory aliasing issues as discussed earier (mid October 2005). Unfortunately, it did not go well as we hoped. For example, /pub on a kernel.org public machine is a symlink to its real mountpoint, and it is understandable that the administrator does not want to adjust the whitelist every time /pub needs to point at a different partition for storage allcation or whatever reasons. Being able to keep using /pub/scm as the whitelist is a desirable property. So this version of enter_repo() reports what it used to chdir() and validate, but does not use getcwd() to canonicalize the directory name. When it sees a user relative path ~user/path, it internally resolves it to try chdir() there, but it still reports ~user/path (possibly after appending .git if allowed to do so, in which case it would report ~user/path.git). What this means is that if a whitelist wants to allow a user relative path, it needs to say "~" (for all users) or list user home directories like "~alice" "~bob". And no, you cannot say /home if the advertised way to access user home directories are ~alice,~bob, etc. The whole point of this is to avoid unnecessary aliasing issues. Anyway, because of this, daemon needs to do a bit more work to guard itself. Namely, it needs to make sure that the accessor does not try to exploit its leading path match rule by inserting /../ in the middle or hanging /.. at the end. I resurrected the belts and suspender paranoia code HPA did for this purpose. This check cannot be done in the enter_repo() unconditionally, because there are valid callers of enter_repo() that want to honor /../; authorized users coming over ssh to run send-pack and fetch-pack should be allowed to do so. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 December 2005, 07:17:42 UTC |
| 7950571 | H. Peter Anvin | 04 December 2005, 01:57:48 UTC | A few more options for git-cat-file This adds '-e' option to git-cat-file, to test for the existence of the object. This also cleans up the option-parsing in git-cat-file slightly. [jc: HPA version had -n option which did rev-parse --verify; the real value of this patch is the option parsing cleanup.] Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 December 2005, 07:07:17 UTC |
| e40b61f | Jason Riedy | 02 December 2005, 23:08:28 UTC | Add compat/setenv.c, use in git.c. There is no setenv() in Solaris 5.8. The trivial calls to setenv() were replaced by putenv() in a much earlier patch, but setenv() was used again in git.c. This patch just adds a compat/setenv.c. The rule for building git$(X) also needs to include compat. objects and compiler flags. Those are now in makefile vars COMPAT_OBJS and COMPAT_CFLAGS. Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 December 2005, 06:25:25 UTC |
| 7057463 | Fredrik Kuivinen | 03 December 2005, 10:41:54 UTC | New test case: Criss-cross merge Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 December 2005, 20:29:07 UTC |
| 72d1216 | Fredrik Kuivinen | 03 December 2005, 10:41:20 UTC | New test case: merge with directory/file conflicts Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 December 2005, 20:29:05 UTC |
| d3bfdb7 | Fredrik Kuivinen | 03 December 2005, 10:40:39 UTC | test-lib.sh: Add new function, test_expect_code The test is considered OK if it exits with code $1 Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 December 2005, 20:28:57 UTC |
| 4275df5 | Fredrik Kuivinen | 03 December 2005, 10:40:21 UTC | git-merge: Exit with code 2 if no strategy was able to handle the merge. This way it is possible to test in scripts if the merge was non-clean or if the strategy had other problems with the merge. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 December 2005, 20:28:52 UTC |
| 56b5e94 | No name | 02 December 2005, 11:37:13 UTC | documentation: git-tag [jc: light edit applied on top of the original] Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 December 2005, 20:20:34 UTC |
| d2abdd2 | Junio C Hamano | 02 December 2005, 20:15:23 UTC | documentation: git-bisect (help HTML break man) Use the same trick Josef used to introduce line breaks for git-mv documentation for now, to help HTML rendering. This breaks manpages and we need to come up with a better solution. Noticed by linux@horizon.com (No Name). Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 December 2005, 20:20:34 UTC |
| 3f41f5a | No name | 02 December 2005, 11:37:13 UTC | documentation: clarify read-tree --reset [jc: light edit applied on top of the original] Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 December 2005, 20:20:34 UTC |
| 3ace1fe | Junio C Hamano | 02 December 2005, 09:05:35 UTC | git-merge documentation: conflicting merge leaves higher stages in index This hopefully concludes the latest updates that changes the behaviour of the merge on an unsuccessful automerge. Instead of collapsing the conflicted path in the index to show HEAD, we leave it unmerged, now that diff-files can compare working tree files with higher stages. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 December 2005, 09:08:14 UTC |
| 54dd99a | Junio C Hamano | 02 December 2005, 08:54:50 UTC | merge-one-file: make sure we do not mismerge symbolic links. We ran "merge" command on O->A, O->B, A!=B case without verifying the path involved is not a symlink. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 December 2005, 09:08:14 UTC |
| 1c2c10b | Junio C Hamano | 02 December 2005, 08:50:59 UTC | merge-one-file: make sure we create the merged file. The "update-index followed by checkout-index" chain served two purposes -- to collapse the index to "our" version, and make sure that file exists in the working tree. In the recent update to leave the index unmerged on conflicting path, we wanted to stop doing the former, but we still need to do the latter (we allow merging to work in an un-checked-out working tree). Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 December 2005, 09:08:14 UTC |
| 57ae0d0 | Junio C Hamano | 02 December 2005, 06:49:52 UTC | t3100: add ls-tree -t and -d tests. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 December 2005, 06:49:52 UTC |
| a6b51f1 | Junio C Hamano | 02 December 2005, 05:39:41 UTC | merge-recursive: adjust git-ls-tree use for the latest. You need to pass -t flag if you want to see tree objects in "git-ls-tree -r" output these days. This change broke the tree structure reading code in git-merge-recursive used to detect D/F conflicts. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 December 2005, 05:39:41 UTC |
| 10b15b8 | Alex Riesen | 01 December 2005, 12:48:35 UTC | git wrapper: more careful argument stuffing - Use stderr for error output - Build git_command more careful - ENOENT is good enough for check of failed exec to show usage, no access() check needed [jc: Originally from Alex Riesen with inputs from Sven Verdoolaege mixed in.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 December 2005, 01:06:37 UTC |
| ce3ca27 | Junio C Hamano | 02 December 2005, 01:02:04 UTC | git-merge-one-file: do not worry about 'rmdir -p' not removing directory. 9ae2172aed289f2706a0e88288909fa47eddd7e7 used "rmdir -p" carelessly, causing the more important "git-update-index --remove" to be skipped. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 December 2005, 01:02:04 UTC |
| c639a55 | Junio C Hamano | 01 December 2005, 22:54:00 UTC | ls-tree: --name-only Fingers of some "git diff" users are trained to do --name-only which git-ls-tree unfortunately does not take. With this, cd sub/directory && git-ls-tree -r --name-only .. would show only the names not object names nor modes. I threw in another synonym --name-status only for usability, but obviously ls-tree does not do any comparison so what it does is the same as --name-only. Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 December 2005, 22:54:00 UTC |
| f598467 | Junio C Hamano | 01 December 2005, 21:15:20 UTC | ls-tree: resurrect '-d' to mean 'show trees only' With this: git-ls-tree -d HEAD -- drivers/net/ shows only immediate subtrees of drivers/net. git-ls-tree -d -t HEAD -- drivers/net/ shows drivers, drivers/net and immediate subtrees of drivers/net. git-ls-tree -d -r HEAD -- drivers/net/ shows drivers, drivers/net and all subtrees of drivers/net (but not blobs). Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 December 2005, 22:43:54 UTC |
| 0f8f45c | Linus Torvalds | 01 December 2005, 18:35:51 UTC | git-ls-tree: add "-t" option to always show the tree entries The old (new) behaviour was that it only shows trees if the object is specified exactly, and recursive is not set. That makes sense, because there is obviously nothing else it can show for that case. However, with the new "-t" option, it will show the tree even with "-r", as it traverses down into it. NOTE! This also means that it will show all trees leading up to that tree. For example, if you do a git-ls-tree -t HEAD -- drivers/char/this/file/does/not/exist it will show the trees that lead up to the files that do not exist: [torvalds@g5 linux]$ git-ls-tree -t HEAD -- drivers/char/this/file/does/not/exist 040000 tree 9cb687b77dcd64bf82e9a73214db467c964c1266 drivers 040000 tree 298e2fadf0ff3867d1ef49936fd2c7bf6ce1eb66 drivers/char [torvalds@g5 linux]$ and note how this is true even though I didn't specify "-r": the fact that I supplied a pathspec automatically implies "enough recursion" for that particular pathspec. I think the code is cleaner and easier to understand too: the patch looks bigger, but it's really just splitting up the "should we recurse into this tree" into a function of its own. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 December 2005, 20:27:22 UTC |
| 2731d04 | Junio C Hamano | 01 December 2005, 20:26:41 UTC | Makefile: say the default target upfront. Alex Riesen wants to keep extra makefile targets in config.mak, but the file is included before any of our real targets. Having this at the beginning allows you to do so. Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 December 2005, 20:26:41 UTC |
| a3e3dc4 | Junio C Hamano | 01 December 2005, 20:24:51 UTC | Documentation: describe '-f' option to git-fetch. The option description header was there without body text, confusingly getting rendered as if the description for --tags applied to the option. Noticed by Carl Baldwin. Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 December 2005, 20:24:51 UTC |
| b34403a | Timo Hirvonen | 01 December 2005, 01:32:01 UTC | Move couple of ifdefs after "include config.mk" This makes it possible to define WITH_SEND_EMAIL etc. in config.mak. Also remove GIT_LIST_TWEAK because it isn't used anymore. Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 December 2005, 01:46:35 UTC |
| 9cac9d3 | Junio C Hamano | 30 November 2005, 19:09:33 UTC | Merge branch 'jc/subdir' | 30 November 2005, 19:09:33 UTC |
| 5401f30 | Junio C Hamano | 30 November 2005, 19:05:48 UTC | Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect' and 'lt/merge' | 30 November 2005, 19:05:48 UTC |
| 0738fc2 | Tommi Virtanen | 30 November 2005, 15:37:10 UTC | Do not attempt to access literal dirname "GIT_OBJECT_DIRECTORY". Dereference the environment variable before using it. Signed-off-by: Tommi Virtanen <tv@inoi.fi> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 November 2005, 18:51:24 UTC |
| 0501c24 | Junio C Hamano | 30 November 2005, 10:38:24 UTC | Tutorial: adjust merge example to recursive strategy. Current default, merge-recursive, gives slightly different message while working from merge-resolve which was used to prepare the illustration in the tutorial. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 November 2005, 10:38:24 UTC |
| 58cce8a | Junio C Hamano | 30 November 2005, 10:37:06 UTC | merge-recursive: match the unmerged index entry behaviour with merge-resolve This minimally changes merge-recursive to match what happens when O->A, O->B, A!=B 3-way filelevel merge leaves conflicts to the new merge-resolve behaviour. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 November 2005, 10:37:06 UTC |
| 15bf57a | Junio C Hamano | 30 November 2005, 10:16:36 UTC | diff-files: show diffs with stage0 and unmerged stage at the same time. After thinking about it more, I realized that much of the change I did on top of Linus' version does not make much sense. This commit reverts it so that it by default shows diffs with stage0 paths or stage2 paths with working tree; the unmerged stage to use can be overridden with -1/-2/-3 option (-2 is the default so essentially is a no-op). When the index file is unmerged, we are by definition in the middle of a conflicting merge, and we should show the diff with stage 2 by default. More importantly, paths without conflicts are updated in the working tree and collapsed to stage0 in the index, so showing diff with stage0 at the same time does not hurt. In normal cases, stage0 entries should be in sync with the working tree files and does not clutter the output. It even helps the user to realize that the working tree has local changes unrelated to the merge and remember to be careful not to do a "git-commit -a" after resolving the conflicts. When there is no unmerged entries, giving diff_unmerged_stage a default value of 2 does not cause any harm, because it would not be used anyway. So in all, always showing diff between stage0 paths and unmerged entries from a stage (defaulting to 2) is the right thing to do, as Linus originally did. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 November 2005, 10:17:51 UTC |
| 354b9b5 | Linus Torvalds | 30 November 2005, 05:06:10 UTC | merge-one-file: leave unmerged index entries upon automerge failure. When automerge fails, we used to collapse the path to stage0 from "our" branch, to help "diff-files" users to view the half-merged state against the current HEAD. Now diff-files has been taught how to compare with unmerged stage2,leaving them unmerged is a better thing to do, especially this prevents the unresolved conflicts to be committed by mistake. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 November 2005, 08:14:19 UTC |
| 10637b8 | Linus Torvalds | 30 November 2005, 05:06:10 UTC | diff-files: -1/-2/-3 to diff against unmerged stage. While resolving conflicted merge, it was not easy to compare the working tree file with unmerged index entries. This commit introduces new options -1/-2/-3 (with synonyms --base, --ours, and --theirs) to compare working tree files with specified stages. When none of these options are given, the command defaults to -2 if the index file is unmerged, otherwise it acts as before. [jc: majorly butchered from the version Linus originally posted.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 November 2005, 08:14:18 UTC |
| 5620518 | Junio C Hamano | 30 November 2005, 05:59:04 UTC | git-diff: do not turn off -p/-M with any diff options. When the user gives a diff option (e.g. --cached) to "git diff", we turned off the built-in default option -p, which is usually not what user wants to see. This commit makes lack of --name-status, --name-only nor -r to add -p, and lack of -B*, -C* nor -M* to add -M to the flags given to the underlying diff. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 November 2005, 06:46:12 UTC |
| 069b20a | Junio C Hamano | 29 November 2005, 23:47:32 UTC | Merge http://www.kernel.org/pub/scm/gitk/gitk | 29 November 2005, 23:47:32 UTC |
| 8bf2c69 | Alex Riesen | 29 November 2005, 22:10:24 UTC | [PATCH] Add tests for git-mv in subdirectories Junio C Hamano, Sat, Nov 26, 2005 03:45:52 +0100: > I haven't seriously used git-mv myself, so > somebody needs to test it, and if it actually works and Ack on > it, please. It actually works in subdirs. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 23:43:20 UTC |
| 4518bb8 | Johannes Schindelin | 26 November 2005, 02:45:52 UTC | [PATCH] Make git-mv work in subdirectories, too Turns out, all git programs git-mv uses are capable of operating in a subdirectory just fine. So don't complain about it. [jc: I think that sounds sane. You need to grab the exit status from `git-rev-parse --git-dir`, which I added. Alex Riesen says this worked fine.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 23:34:46 UTC |
| 712fcc0 | Paul Mackerras | 29 November 2005, 22:28:16 UTC | gitk: Add a preferences dialog with some basic stuff There is a lot more that could be put in, such as a selector for the font family etc., but this is a start. Signed-off-by: Paul Mackerras <paulus@samba.org> | 29 November 2005, 22:28:16 UTC |
| 830273d | Junio C Hamano | 29 November 2005, 21:51:27 UTC | format-patch: run diff in C locale Otherwise it would show incomplete line and binary markers in a locale dependent way. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 22:27:59 UTC |
| a004d3f | Junio C Hamano | 29 November 2005, 21:51:27 UTC | format-patch: do not abuse 3-dash marker line. Before GIT version at the end of output we used a 3-dash marker; but 3-dash marker is special and should not be overused. Instead, use "-- " which is a standard practice in e-mails to signal the beginning of trailing garbage. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 22:26:48 UTC |
| 99e368b | Junio C Hamano | 29 November 2005, 21:51:27 UTC | format-patch: remove applies-to. The attempt to help 3-way fallback by recording the tree object id for the entire pre-image was unnecessary, and we already have an better alternative in the form of per-blob "index" lines. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 22:25:00 UTC |
| bf3e274 | Junio C Hamano | 29 November 2005, 21:53:30 UTC | applypatch: use "index" lines not "applies-to". This matches the 3-way fallback used by applypatch to use per-blob "index" lines, not "applies-to" tree object name, to match what git-am does. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 22:18:27 UTC |
| e135554 | Junio C Hamano | 29 November 2005, 22:14:42 UTC | applymbox: typofix to enable -m option. The -m option to fall back on 3-way merge was not honoured at all because of a typo. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 22:14:42 UTC |
| 0349080 | Matthias Urlichs | 29 November 2005, 07:13:04 UTC | SVN import: Use one log call One "svn log" (or its equivalent) per revision adds delay and server load. Instead, open two SVN connections -- one for the log, and one for the files. Positive side effect: Only those log entries which actually contain data are committed => no more empty commits. Also, change the "-l" option to set the maximum revision to be pulled, not the number of revisions. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 18:51:43 UTC |
| b020dcd | jdl@freescale.com | 29 November 2005, 14:59:56 UTC | Fix typos and minor format issues. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 18:51:41 UTC |
| 3e9fabc | Nick Hengeveld | 29 November 2005, 17:33:36 UTC | http-push cleanup The malloc patch from Jan Andres fixed the problem that was causing a segfault when freeing the lock token, and Johannes Schindelin found and fixed a problem when no URL is specified on the command line. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 18:51:39 UTC |
| 2c4ed38 | Pavel Roskin | 29 November 2005, 06:20:49 UTC | git-clone --shared should imply --local The "--shared" option to git-clone is silently ignored if "--local" is not specified. The manual doesn't mention such dependency. Make "--shared" imply "--local". Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:55:12 UTC |
| 99e0169 | Junio C Hamano | 28 November 2005, 11:19:03 UTC | hash-object.c: type-fix to squelch compiler warnings. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:03 UTC |
| d165fa1 | Junio C Hamano | 28 November 2005, 07:33:54 UTC | define die() for scripts that use it. As a fallout from not using git-sh-setup in scripts that can operate from a subdirectory, we lost definition of die() from them. It might make sense to do some cleanup to consolidate them back again, but this should suffice for now. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:03 UTC |
| d6ea70a | Junio C Hamano | 28 November 2005, 07:19:58 UTC | verify-tag: make it operable from a subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:03 UTC |
| 7ea2fc4 | Junio C Hamano | 28 November 2005, 07:19:06 UTC | tag: make it operable from a subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:03 UTC |
| eefaa4f | Junio C Hamano | 28 November 2005, 07:18:04 UTC | lost-found: make it operable from a subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:03 UTC |
| 9cc2527 | Junio C Hamano | 28 November 2005, 07:16:15 UTC | branch: make it operable from a subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:03 UTC |
| 1abacf3 | Junio C Hamano | 28 November 2005, 07:15:02 UTC | ls-remote: define die() now we do not use git-sh-setup Another interesting "property" is that from inside a git managed tree, "git-ls-remote ." names the current repository no matter how deep a subdirectory you are in. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:03 UTC |
| 710b709 | Junio C Hamano | 28 November 2005, 06:53:20 UTC | count-objects: make it operable from a subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:02 UTC |
| 53228a5 | Junio C Hamano | 26 November 2005, 08:50:02 UTC | Make the rest of commands work from a subdirectory. These commands are converted to run from a subdirectory. commit-tree convert-objects merge-base merge-index mktag pack-objects pack-redundant prune-packed read-tree tar-tree unpack-file unpack-objects update-server-info write-tree Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:02 UTC |
| 5a32771 | Junio C Hamano | 26 November 2005, 08:47:59 UTC | Make networking commands to work from a subdirectory. These are whole-tree operations and there is not much point making them operable from within a subdirectory, but it is easy to do so, and using setup_git_directory() upfront helps git:// proxy specification picked up from the correct place. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:02 UTC |
| b191fa7 | Junio C Hamano | 26 November 2005, 08:40:50 UTC | ls-tree: work from subdirectory. This makes ls-tree to work from subdirectory. It defaults to show the paths under the current subdirectory, and interprets user-supplied paths as relative to the current subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:02 UTC |
| 706fe6a | Junio C Hamano | 26 November 2005, 08:30:07 UTC | hash-object: work within subdirectory. When -w is given, it needs to find out where the .git directory is, so run the setup_git_directory() when we see a -w. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:02 UTC |
| c3e9a65 | Junio C Hamano | 26 November 2005, 08:22:48 UTC | checkout-index: work from subdirectory. With this, git-checkout-index from a subdirectory works as expected. Note that "git-checkout-index -a" checks out files only in the current directory and under. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:02 UTC |
| 61e2b01 | Junio C Hamano | 26 November 2005, 07:52:04 UTC | fsck-objects: work from subdirectory. Not much point making it work from subdirectory, but for a consistency make it so. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:02 UTC |
| e44eb3e | Junio C Hamano | 26 November 2005, 07:50:21 UTC | peek-remote: honor proxy config even from subdirectory. Use setup_git_directory_gently() at the beginning of peek-remote so that git:// proxy can be picked up from the configuration file. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:02 UTC |
| edf2e37 | Junio C Hamano | 26 November 2005, 07:14:15 UTC | git-apply: work from subdirectory. When applying a patch to index file, we need to know where GIT_DIR is; use setup_git_directory() to find it out. This also allows us to work from a subdirectory if we wanted to. When git-apply is run from a subdirectory, it applies the given patch only to the files under the current directory and below. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:01 UTC |
| 4ca0660 | Junio C Hamano | 26 November 2005, 07:14:15 UTC | working from subdirectory: preparation - prefix_filename() is like prefix_path() but can be used to name any file on the filesystem, not the files that might go into the index file. - setup_git_directory_gently() tries to find the GIT_DIR, but does not die() if called outside a git repository. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:13:01 UTC |
| e9a45d7 | Junio C Hamano | 28 November 2005, 01:42:05 UTC | bisect: quote pathnames for eval safety. ... and make sure they are on the same line. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:11:38 UTC |
| b3cfd93 | Linus Torvalds | 27 November 2005, 19:32:03 UTC | bisect: limit the searchspace by pathspecs It was surprisingly easy to do. git bisect start <pathspec> followed by all the normal "git bisect good/bad" stuff. Almost totally untested, and I guarantee that if your pathnames have spaces in them (or your GIT_DIR has spaces in it) this won't work. I don't know how to fix that, my shell programming isn't good enough. This involves small changes to make "git-rev-list --bisect" work in the presense of a pathspec limiter, and then truly trivial (and that's the broken part) changes to make "git bisect" save away and use the pathspec. I tried one bisection, and a "git bisect visualize", and it all looked correct. But hey, don't be surprised if it has problems. Linus Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:11:38 UTC |
| 246cc52 | Junio C Hamano | 28 November 2005, 10:32:42 UTC | ls-tree: match the test to the new semantics. The diff for this commit is a good illustration of what changed in ls-tree behaviour. - With -r, tree nodes themselves are not shown anymore, but blobs in subtrees are shown. - The order of paths parameters do not matter, since they are not like arguments to /bin/ls, but are filter patterns. - When filter patterns overlap, unintuitive things happen. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:06:29 UTC |
| 32b5904 | Junio C Hamano | 28 November 2005, 10:30:04 UTC | ls-tree: Resurrect funny name quoting lost during rewrite. The rewrite to match ls-files/diff-tree behaviour accidentally lost the name quoting. I am not proud about this code, but this would get the test going. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 07:03:12 UTC |
| e246637 | Linus Torvalds | 28 November 2005, 06:48:08 UTC | ls-tree: further tweaks of the rewrite It modifies the selection a bit, so that a pathspec that is a superset of a particular tree path will always cause it to recurse into that tree. As an example, let's say that we do git-ls-tree HEAD drivers/char _without_ the "-r". What will happen is that it will start out doing all the base tree, and for "drivers" it will notice that it's a proper subset of "drivers/char", so it will always recurse into _that_ tree (but not into other trees). Then, it will not match anything else than "char" in that subdirectory, and because that's not a proper superset (it's an exact match), it will _not_ recurse into it, so you get: [torvalds@g5 linux]$ ~/git/git-ls-tree HEAD drivers/char 040000 tree 9568cda453aae205bb58983747fa73b9696d9d51 drivers/char which is what you got with the old git-ls-tree too. But interestingly, if you add the slash, it will become a proper superset and it will recurse into _that_ subdirectory (but no deeper: so if you want all subdirectories _below_ drivers/char/, you still need to give "-r"): [torvalds@g5 linux]$ ~/git/git-ls-tree HEAD drivers/char/ 100644 blob 2b6b1d772ed776fff87927fc34adc2e40500218e drivers/char/.gitignore 100644 blob 56b8a2e76ab10a5c21787cb7068a846075cbaffd drivers/char/ChangeLog 100644 blob 970f70d498f4c814e1cf3362e33d7e23ac53c299 drivers/char/Kconfig ... See? This is on top of the previous two diffs, holler if you want a whole new "everything combined" version.. It hasn't gotten lots of testing, but it should work. Linus | 29 November 2005, 07:00:14 UTC |
| b45c569 | Linus Torvalds | 27 November 2005, 19:00:09 UTC | ls-tree: further cleanup to parallel ls-files. To get more a "git-ls-files" approach, this trivial patch (on top of my previous one) enables recursion, and doesn't show partial trees. [jc: after further discussion, this version enables recursion by default, and you can disable it with "-d" flag. git-ls-tree -d HEAD Documentation/no/such/directory shows Documentation tree (without -d it shows nothing). git-ls-tree HEAD shows everything from the tree. Only to get the single level from the top git-ls-tree -d HEAD is needed. But there is no way to get the single level with pathspec. You need to extract the object name of Documentation tree from the parent tree and run git-ls-tree -d $tree_id_of_Documentation_tree to get something similar to what you can get from the current git-ls-tree HEAD Documentation ] | 29 November 2005, 07:00:14 UTC |
| 3c5e846 | Linus Torvalds | 26 November 2005, 17:38:20 UTC | ls-tree: major rewrite to do pathspec git-ls-tree should be rewritten to use a pathspec the same way everybody else does. Right now it's the odd man out: if you do git-ls-tree HEAD divers/char drivers/ it will show the same files _twice_, which is not how pathspecs in general work. How about this patch? It breaks some of the git-ls-tree tests, but it makes git-ls-tree work a lot more like other git pathspec commands, and it removes more than 150 lines by re-using the recursive tree traversal (but the "-d" flag is gone for good, so I'm not pushing this too hard). Linus | 29 November 2005, 07:00:14 UTC |
| 9ef2b3c | Junio C Hamano | 29 November 2005, 06:55:25 UTC | write_name_quoted(): make one of the path a counted string. This is to prepare for ls-tree updates. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 06:55:25 UTC |
| ffb1a4b | Junio C Hamano | 29 November 2005, 06:54:30 UTC | Documentation: Describe merge operation a bit better. In git-merge documentation, add a section to describe what happens to the index and working tree during merge, and what their cleanliness requirements are before the merge. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 06:54:30 UTC |
| 3e2f62b | Jan Andres | 29 November 2005, 00:51:54 UTC | Fix typo in http-push.c Typo resulted in accessing past the beginning of a string causing segfaults. [jc: signoffs?] | 29 November 2005, 05:56:30 UTC |
| f2e6f1c | Junio C Hamano | 29 November 2005, 04:51:44 UTC | name-rev: fix parent counting. Noticed by linux@horizon.com. The first merge parent (typically "our branch") is ^1, not ^0, and the first other branch is ^2. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2005, 04:51:44 UTC |
| 7f4bd5d | Junio C Hamano | 28 November 2005, 21:00:31 UTC | rebase: one safety net, one bugfix and one optimization. When a .dotest from a previously failed rebase or patch application exists, rebase got confused and tried to apply mixture of what was already there and what is being rebased. Check the existence of the directory and barf. It failed with an mysterious "fatal: cannot read mbox" message if the branch being rebased is fully in sync with the base. Also if the branch is a proper descendant of the base, there is no need to run rebase logic. Prevent these from happening by checking where the merge-base is. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 November 2005, 21:00:31 UTC |
| 36d277c | Junio C Hamano | 28 November 2005, 11:11:11 UTC | Merge http://www.kernel.org/pub/scm/gitk/gitk | 28 November 2005, 11:11:11 UTC |
| 90109b3 | Junio C Hamano | 28 November 2005, 10:54:05 UTC | git-mv: quote $src in regexp properly. Noticed and fixed by Matthias Urlichs and Josef Weidendorfer. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 November 2005, 10:54:05 UTC |
| 671bc15 | Junio C Hamano | 28 November 2005, 00:12:51 UTC | [PATCH] gitk: Use i18n.commitencoding configuration item. Hardcoding "utf-8" in the script breaks projects that use local encoding, so allow setting i18n.commitEncoding. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Paul Mackerras <paulus@samba.org> | 28 November 2005, 09:46:49 UTC |
| 0dccc7d | Junio C Hamano | 28 November 2005, 09:46:15 UTC | config.c: constness tightening to avoid compilation warning. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 November 2005, 09:46:15 UTC |
| d327244 | Paul Mackerras | 28 November 2005, 09:41:56 UTC | gitk: Fix diff this->selected and selected->this functions The change in 8b7e5d76e836396a097bb6f61cf930ea872a7bd3, which makes a couple of git-diff-tree calls supply only one id rather than two, fixes the display when showing what a single commit did with dense revlists, but broke the diff this->selected and diff selected->this right-click menu functions. Yann Dirson pointed this out and had a patch that fixed the diff menu functions by passing a "singlecommit" flag around. This fixes it a bit differently, by making the ids and diffids variables be either a single id, in the case of showing what a commit did, or {oldid newid}, in the case of the diff menu functions. That way we can just pass $ids to git-diff-tree as is. Most of the changes in fact are just reversing the order of ids in $ids and $diffids, because they used to be {child parent}, but git-diff-tree requires old id before new id. Signed-off-by: Paul Mackerras <paulus@samba.org> | 28 November 2005, 09:41:56 UTC |
| 9f63892 | Junio C Hamano | 28 November 2005, 09:29:52 UTC | mailinfo: Do not use -u=<encoding>; say --encoding=<encoding> Specifying the value for a single letter, single dash option parameter with equal sign looked funny, and more importantly calling the flag to override encoding from utf-8 to something else "-u" (obviously abbreviated from "utf-8") did not make any sense. So spell it out. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 November 2005, 09:29:52 UTC |
| f1f909e | Junio C Hamano | 28 November 2005, 00:29:38 UTC | mailinfo: Use i18n.commitencoding This uses i18n.commitencoding configuration item to pick up the default commit encoding for the repository when converting form e-mail encoding to commit encoding (the default is utf8). Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 November 2005, 00:29:38 UTC |
| 650e4be | Junio C Hamano | 28 November 2005, 00:22:16 UTC | mailinfo: allow -u to fall back on latin1 to utf8 conversion. When the message body does not identify what encoding it is in, -u assumes it is in latin-1 and converts it to utf8, which is the recommended encoding for git commit log messages. With -u=<encoding>, the conversion is made into the specified one, instead of utf8, to allow project-local policies. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 November 2005, 00:26:50 UTC |
| 4e72dce | Junio C Hamano | 28 November 2005, 00:09:40 UTC | Introduce i18n.commitencoding. This is to hold what the project-local rule as to the charset/encoding for the commit log message is. Lack of it defaults to utf-8. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 November 2005, 00:09:40 UTC |
| 55d1eb0 | Yann Dirson | 27 November 2005, 22:29:30 UTC | Fix gitk this->selected diffs The change made in 8b7e5d76e836396a097bb6f61cf930ea872a7bd3 to accomodate dense revlists in single-commit diffs has broken computing of diffs between arbitrary trees, which does need to consider two commit ids. This patch changes the two git-diff-tree calls to get the necessary two ids in this case. It does so by propagating a "singlecommit" flag through all functions involved via an additional argument. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 November 2005, 22:42:51 UTC |
| 56fc631 | Junio C Hamano | 27 November 2005, 22:42:15 UTC | Merge http://www.kernel.org/pub/scm/gitk/gitk | 27 November 2005, 22:42:15 UTC |
| 2616974 | Josef Weidendorfer | 27 November 2005, 21:11:33 UTC | git-mv: follow -k request even on failing renames -k requests to keep running on an error condition. Previously, git-mv stopped on failing renames even with -k. There are some error conditions which are not checked in the first phase of git-mv, eg. 'permission denied'. Still, option -k should work. Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 November 2005, 22:40:29 UTC |
| b933e81 | Josef Weidendorfer | 27 November 2005, 21:08:33 UTC | Small fixes in Documentation/git-mv.txt The two synopsis lines have to be prefixed with a space so that asciidoc inserts a line break inbetween for the manual page. Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 November 2005, 22:40:29 UTC |
| ca203ee | Josef Weidendorfer | 27 November 2005, 21:06:42 UTC | git-mv: fully detect 'directory moved into itself' This gives a better error message when trying to move a directory into some subdirectory of itself; ie. no real bug fix: renaming already failed before, but with a strange "invalid argument". Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 November 2005, 22:40:29 UTC |
| f6bc189 | Josef Weidendorfer | 27 November 2005, 21:04:14 UTC | git-mv: keep git index consistent with file system on failed rename When doing multiple renames, and a rename in the middle fails, git-mv did not store the successful renames in the git index; this is fixed by delaying the error message on a failed rename to after the git updating. Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 November 2005, 22:40:28 UTC |
| 3ae64df | Josef Weidendorfer | 27 November 2005, 20:58:52 UTC | git-mv: shrink usage, no usage on error Small fixes to be consistent with other git scripts: - usage message is only about options and arguments - on error, exit(1) without the usage message Additionally, "beautifies" output with -n a little bit Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 November 2005, 22:40:28 UTC |
| 22752e4 | Junio C Hamano | 26 November 2005, 00:08:48 UTC | setup_git_directory(): check repository format version. After figuring out the GIT_DIR location, make sure the repository is of the right vintage, by calling check_repository_format(). . Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 November 2005, 09:32:59 UTC |
| 4f62953 | Junio C Hamano | 26 November 2005, 00:03:56 UTC | init-db: check template and repository format. This makes init-db repository version aware. It checks if an existing config file says the repository being reinitialized is of a wrong version and aborts before doing further harm. When copying the templates, it makes sure the they are of the right repository format version. Otherwise the templates are ignored with an warning message. It copies the templates before creating the HEAD, and if the config file is copied from the template directory, reads it, primarily to pick up the value of core.symrefsonly. It changes the way the result of the filemode reliability test is written to the configuration file using git_config_set(). The test is done even if the config file was copied from the templates. And finally, our own repository format version is written to the config file. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 November 2005, 09:32:59 UTC |
| 1644162 | Junio C Hamano | 25 November 2005, 18:48:26 UTC | Check repository format version in enter_repo(). After daemon, upload-pack and receive-pack find out where the git directory is and chdir() there, make sure that repository is in a format we understand, after putenv("GIT_DIR=.") so that it knows to pick up the configuration file from there. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 November 2005, 09:32:59 UTC |
| ab9cb76 | Junio C Hamano | 25 November 2005, 23:59:09 UTC | Repository format version check. This adds the repository format version code, first done by Martin Atukunda. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 November 2005, 09:32:59 UTC |
| 51b3c00 | Junio C Hamano | 26 November 2005, 20:09:07 UTC | format-patch: output filename reported to stdout verbatim. Prepending asterisk to the output was just adding noise, and making scripts like proposed git-send-mail by Andreas Ericsson do unnecessary work. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 November 2005, 20:09:07 UTC |
| 2d76d0d | Junio C Hamano | 26 November 2005, 07:36:58 UTC | name-rev: fix off-by-one error in --stdin. It dropped the last hexdigit in the object name. [jc: Noticed and patch supplied by ALASCM, reworked to apply at the right place by me] Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 November 2005, 07:36:58 UTC |
| f359ae4 | Alexander Litvinov | 23 November 2005, 10:19:41 UTC | git-mv is not able to handle big directories Use update-index --stdin to handle large number of files without breaking exec() argument storage limit. [jc: with minor cleanup from the version posted on the list] Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 November 2005, 06:19:23 UTC |
| ab5f862 | Junio C Hamano | 26 November 2005, 04:57:02 UTC | shell.c: complain on insufficient arguments. Originally noticed by Tommi Virtanen, but done slightly differently. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 November 2005, 04:57:02 UTC |
| 93dcab2 | Junio C Hamano | 26 November 2005, 00:35:20 UTC | GIT 0.99.9k This is not 1.0rc4 yet, but to push the recent fixes out. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 November 2005, 00:35:20 UTC |
