AgeCommit message (Collapse)Author
2005-12-08Make sure we use compat/ with Python 2.3 while running tests.Junio C Hamano
Otherwise the test will not succeed without installing. Signed-off-by: Junio C Hamano <>
2005-12-08Clean up file descriptors when calling hooks.Daniel Barkalow
When calling post-update hook, don't leave stdin and stdout connected to the pushing connection. Signed-off-by: Daniel Barkalow <> Signed-off-by: Junio C Hamano <>
2005-12-08refs.c: make sure leading directories exist before writing a ref.Junio C Hamano
Otherwise cloning a repository with hierarchical branch/tag over http would fail. Signed-off-by: Junio C Hamano <>
2005-12-08Documentation(tutorial): adjust merge example to the new merge world order.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-12-08Documentation(cvs-migration): minor cleanups.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-12-08Documentation(glossary): minor formatting clean-ups.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-12-08Documentation: git.html/git.7Junio C Hamano
Finish each sentence with a full stop. Instead of saying 'directory index' 'directory cache' etc, consistently say 'index'. Signed-off-by: Junio C Hamano <>
2005-12-07Merge C Hamano
2005-12-07gitk: Work around Tcl's non-standard names for encodingsPaul Mackerras
This uses a table of encoding names and aliases distilled from plus some heuristics to convert standard encoding names to ones that Tcl recognizes. Signed-off-by: Paul Mackerras <>
2005-12-07update-index: allow --index-info to add higher stages.Junio C Hamano
The new merge world order tells the merge strategies to leave the cache unmerged and store the automerge result in the working tree if automerge is not clean. This was done for the resolve strategy and recursive strategy when no rename is involved, but recording a conflicting merge in the rename case could not easily be done by the recursive strategy. This commit adds a new input format, in addition to the exsting two, to "update-index --index-info". (1) mode SP sha1 TAB path The first format is what "git-apply --index-info" reports, and used to reconstruct a partial tree that is used for phony merge base tree when falling back on 3-way merge. (2) mode SP type SP sha1 TAB path The second format is to stuff git-ls-tree output into the index file. (3) mode SP sha1 SP stage TAB path This format is to put higher order stages into the index file and matches git-ls-files --stage output. To place a higher stage entry to the index, the path should first be removed by feeding a mode=0 entry for the path, and then feeding necessary input lines in the (3) format. For example, starting with this index: $ git ls-files -s 100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0 frotz $ git update-index --index-info ;# interactive session -- input follows... 0 0000000000000000000000000000000000000000 frotz 100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz 100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz The first line of the input feeds 0 as the mode to remove the path; the SHA1 does not matter as long as it is well formatted. Then the second and third line feeds stage 1 and stage 2 entries for that path. After the above, we would end up with this: $ git ls-files -s 100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz 100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz This completes the groundwork for the new merge world order. Signed-off-by: Junio C Hamano <>
2005-12-07git-merge-one: new merge world order.Junio C Hamano
This does two things: - Use new --stage=2 option to create the working tree file with leading paths and correct permission bits using checkout-index, as before. - Make sure we do not confuse "merge" program when the file being merged has an unfortunate name, '-L'. Signed-off-by: Junio C Hamano <>
2005-12-07checkout-index: allow checking out from higher stages.Junio C Hamano
The new option, --stage=<n>, lets you copy out from an unmerged, higher stage. This is to help the new merge world order during a nontrivial merge. Signed-off-by: Junio C Hamano <>
2005-12-07Use printf rather than echo -n.Jason Riedy
On AIX, there is no -n option to the system's echo. Instead, it needs the '\c' control character. We could replace echo -n "foo" with echo -e "foo\c" but printf is recommended by most man pages. Tested on AIX 5.3, Solaris 8, and Debian. [jc: futureproofed two instances that uses variable with '%s' so later feeding different messages would not break things too easily; others are emitting literal so whoever changes the literal ought to notice more easily so they are safe.] Signed-off-by: E. Jason Riedy <> Signed-off-by: Junio C Hamano <>
2005-12-07qsort() ptrdiff_t may be larger than intJunio C Hamano
Morten Welinder <> writes: > The code looks wrong. It assumes that pointers are no larger than ints. > If pointers are larger than ints, the code does not necessarily compute > a consistent ordering and qsort is allowed to do whatever it wants. > > Morten > > static int compare_object_pointers(const void *a, const void *b) > { > const struct object * const *pa = a; > const struct object * const *pb = b; > return *pa - *pb; > } Signed-off-by: Junio C Hamano <>
2005-12-07[PATCH] Initial AIX portability fixes.Jason Riedy
Added an AIX clause in the Makefile; that clause likely will be wrong for any AIX pre-5.2, but I can only test on 5.3. mailinfo.c was missing the compat header file, and convert-objects.c needs to define a specific _XOPEN_SOURCE as well as _XOPEN_SOURCE_EXTENDED. Signed-off-by: E. Jason Riedy <> Signed-off-by: Junio C Hamano <>
2005-12-06git-merge-one-file: resurrect leading path creation.Junio C Hamano
Since we do not use git-update-index followed by git-checkout-index -u to create the half-merged file on conflicting case anymore, we need to make sure the leading directories are created here. Maybe a better solution would be to allow update-index to add to higher stage, and checkout-index to extract from such, but that is a change slightly bigger than I would like to have so close to 1.0, so this should do for now. Signed-off-by: Junio C Hamano <>
2005-12-06Documentaiton (read-tree): update description of 3-wayJunio C Hamano
The merge-one-file used to leave the working tree intact, but it has long been changed to leave the merge result there since 2a68a8659f7dc55fd285d235ae2d19e7a8116c30 commit. Signed-off-by: Junio C Hamano <>
2005-12-06Documentation: hash-object.Junio C Hamano
The file parameter is better spelled just "file", not "any file on the filesystem". We stress that in the description text later anyway. Signed-off-by: Junio C Hamano <>
2005-12-06write-tree: check extra arguments and die but be a bit more helpful.Junio C Hamano
"git-write-tree junk" complains and dies, but it does not say what option it supports. Die with the usage string in such a case. Signed-off-by: Junio C Hamano <>
2005-12-06init-db: check extra arguments and complain.Junio C Hamano
"git-init-db junk" does not complain but just ignores "junk". Die with the usage string in such a case. Signed-off-by: Junio C Hamano <>
2005-12-06hash-object: -- and --helpJunio C Hamano
It was cumbersome to feed hash-object the file '-t' (you could have said "./-t", though). Teach it '--' that terminates the option list, like everybody else. There is no way to extract usage string from the command either, so teach it "--help" as well. Signed-off-by: Junio C Hamano <>
2005-12-06Added documentation for few missing options.Jon Loeliger
More $ shell prompts in examples. Minor English grammar improvements. Added a few "See Also"s. Use back-ticks on more command examples. Signed-off-by: Jon Loeliger <> Signed-off-by: Junio C Hamano <>
2005-12-06git-mv to work with Perl 5.6Junio C Hamano
List form of pipe open is 5.8 invention. Signed-off-by: Junio C Hamano <>
2005-12-06Fix 5501 testJunio C Hamano
Not everybody can rely on /bin/sh to be sane, and we support SHELL_PATH for that. Use it. mktemp(1) is not used anywhere else in the core git. Do not introduce dependency on it. Not everybody's "which" gives a sane return value. For example, on Solaris 'which XXX' says "no XXX in /usr/bin /bin ..." and exits with zero status. The lesson here is to never use 'which' in your scripts. Signed-off-by: Junio C Hamano <> Signed-off-by: Junio C Hamano <>
2005-12-05Clean up compatibility definitions.Junio C Hamano
This attempts to clean up the way various compatibility functions are defined and used. - A new header file, git-compat-util.h, is introduced. This looks at various NO_XXX and does necessary function name replacements, equivalent of -Dstrcasestr=gitstrcasestr in the Makefile. - Those function name replacements are removed from the Makefile. - Common features such as usage(), die(), xmalloc() are moved from cache.h to git-compat-util.h; cache.h includes git-compat-util.h itself. Signed-off-by: Junio C Hamano <>
2005-12-05gitk: Some improvements for the code for updating the displayPaul Mackerras
This should be more robust in the case that some does "Update" before the initial drawing is finished. It also avoids having to reset the list of children for each commit and reconstruct it. Signed-off-by: Paul Mackerras <>
2005-12-05[PATCH] Document config.mak in INSTALL.Jason Riedy
The existing config.mak should satisfy almost everyone... You can change the prefix and other vars catch the new setting anyways. I had forgotten that ?= acts as = (lazy value binding) and as not := (immediate value binding). Signed-off-by: E. Jason Riedy <> Signed-off-by: Junio C Hamano <>
2005-12-05config.c: remove unnecessary header in minimum configuration file.Junio C Hamano
It is just silly to start the file called "config" with a comment that says "This is the config file." Signed-off-by: Junio C Hamano <>
2005-12-05server-info.c: and two functions are not used anymore.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-12-05server-info.c: use pack_local like everybody else.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-12-05Documentation: shared repository management in tutorial.Junio C Hamano
The branch policy script I outlined was improved and polished by Carl and posted on the list twice since then. It is a shame not to pick it up, so replace the original outline in howto/update-hook-example.txt with the latest from Carl. Also talk about setting up git-shell to allow git-push/git-fetch only SSH access to a shared repository host in the tutorial. Signed-off-by: Junio C Hamano <>
2005-12-05Documentation: push/receive hook references.Junio C Hamano
Mention documentation pages that talk about update and post-update hooks from git-push, because a frequently asked question is "I want X to happen when I push" and people would not know to look at git-receive-pack documentation until they understand that is what runs on the other end. Signed-off-by: Junio C Hamano <>
2005-12-05Documentation: git-diff asciidoc table workaround.Junio C Hamano
The table facility was nice in rendering HTML but was disastrous for man page. Reword the text and do not use table for now. Signed-off-by: Junio C Hamano <>
2005-12-05Documentation: git-mv manpage workaround.Junio C Hamano
Work-around asciidoc manpage trouble that does not seem to allow more than one line in the SYNOPSIS section. Signed-off-by: Junio C Hamano <>
2005-12-05Documentation: talk about pathspec in bisect.Junio C Hamano
Also work-around asciidoc manpage trouble that does not seem to allow more than one line in the SYNOPSIS section. Signed-off-by: Junio C Hamano <>
2005-12-05server-info: throw away T computation as well.Junio C Hamano
Again, dumb transport clients are too dumb to make use of the top objects information to make a choice among multiple packs, so computing these lines are useless for now. We could resurrect them if needed later. Also dumb transport clients presumably can do their own approximation by downloading idx files to see how relevant each pack is for their fetch. Signed-off-by: Junio C Hamano <>
2005-12-05server-info: stop sorting packs by latest date.Junio C Hamano
This does not seem to buy us much, for the same reason as the previous change. Dumb clients are still too dumb. Signed-off-by: Junio C Hamano <>
2005-12-05server-info.c: drop unused D lines.Junio C Hamano
We tried to compute pack interdependency information in $GIT_DIR/objects/info/packs, hoping that dumb transports would make use of it when choosing from multiple choice, but that has never materialized, so stop computing D lines for now. Signed-off-by: Junio C Hamano <>
2005-12-05sha1_file.c: make sure packs in an alternate odb is named properly.Junio C Hamano
We somehow ended up registering packs in alternate object directories as "dir/object//pack/pack-*", which confusd the update-server-info code very badly. Also we did not attempt to detect a mistake of listing the object directory itself as one of the alternates. This does not lead to incorrect behaviour, but is simply wasteful, so try to do so when we are trivially able to. Signed-off-by: Junio C Hamano <>
2005-12-05git.c: remove excess output for debugging when command is too long.Junio C Hamano
When the given command name was too long, we exited with a message with the number of bytes of the final command name inside parentheses, without saying what that number is. It was only meant as a debugging aid while development, so remove it. Signed-off-by: Junio C Hamano <>
2005-12-05struct tree: remove unused field "parent"Junio C Hamano
The field is not used anymore, after the recent ls-tree rewrite. Signed-off-by: Junio C Hamano <>
2005-12-05Documentation: rebase does not use cherry-pick anymore.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-12-05Document the --(no-)edit switch of git-revert and git-cherry-pickPetr Baudis
This switch was not documented properly. I decided not to mention the --no-edit switch in the git-cherry-pick documentation since we always default to no editing. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2005-12-05show-branch: allow glob pattern to name branches to show.Junio C Hamano
With this, you can say "git-show-branch topic/* master" to show all the topic branches you have under .git/refs/heads/topic/ and your master branch. Another example is "git-show-branch --list v1.0*" to show all the v1.0 tags. You can disambiguate by saying "heads/topic/*" to show only topic branches if you have tags under .git/refs/tags/topic/ as well. Signed-off-by: Junio C Hamano <>
2005-12-05Update the git-ls-tree documentationPetr Baudis
This patch aims to freshen up a bit the git-ls-tree documentation. It hints that the list of paths are in fact patterns to be matched, explains the new -t, --name-only and --name-status options, corrects the original autorship information to refer to yours sincerely, corrects several grammar mistakes, etc. Since the documentation still deserves some significant work (at least proper description of the pattern matching), I also added the stub notice. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2005-12-04git.c: two fixes, gitsetenv type and off-by-one error.Junio C Hamano
gitsetenv as implemented in compat/setenv.c takes two const char* and int; match that. Also fix an incorrect attempt in prepend_to_path() to NUL-terminate the string which stuffed the NUL character at one past the end of allocation, and was not needed to begin with (we copy the old_path string including the NUL which terminates it). Signed-off-by: Junio C Hamano <>
2005-12-04compat/setenv: do not free what we fed putenv(3).Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-12-04Warn when send-pack does nothingDaniel Barkalow
If you try to push into an empty repository with no ref arguments to git push, it doesn't do anything and doesn't say anything. This adds a warning when send-pack isn't going to push anything, so you don't assume that it silently did what you wanted. Signed-off-by: Daniel Barkalow <> Signed-off-by: Junio C Hamano <>
2005-12-04[PATCH] daemon.c and path.enter_repo(): revamp path validation.Junio C Hamano
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 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 <>
2005-12-04A few more options for git-cat-fileH. Peter Anvin
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 <> Signed-off-by: Junio C Hamano <>