summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove unsupported C99 style struct initializers in git-archive.v1.4.3.4Shawn O. Pearce2006-11-042-13/+12
| | | | | | | | | | | | | At least one older version of the Solaris C compiler doesn't support the newer C99 style struct initializers. To allow Git to compile on those systems use an archive description struct which is easier to initialize without the C99 struct initializer syntax. Also since the archives array is not used by anyone other than archive.c we can make it static. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove SIMPLE_PROGRAMS and make git-daemon a normal program.Shawn O. Pearce2006-11-041-12/+2
| | | | | | | | | | | | | Some platforms (Solaris in particular) appear to require -lz as part of the link line for git-daemon, due to it linking against sha1_file.o and that module requiring inflate/deflate support. So its time to retire SIMPLE_PROGRAMS and move its last remaining member into the standard PROGRAMS list, allowing it to link against all libraries used by the rest of Git. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use ULONG_MAX rather than implicit cast of -1.Shawn O. Pearce2006-11-041-1/+1
| | | | | | | | | | At least one (older) version of the Solaris C compiler won't allow 'unsigned long x = -1' without explicitly casting -1 to a type of unsigned long. So instead use ULONG_MAX, which is really the correct constant anyway. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* apply: handle "traditional" creation/deletion diff correctly.Junio C Hamano2006-11-041-2/+6
| | | | | | | | | | | We deduced a GNU diff output that does not use /dev/null convention as creation (deletion) diff correctly by looking at the lack of context and deleted lines (added lines), but forgot to reset the new (old) name field properly. This was a regression when we added a workaround for --unified=0 insanity. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-clone documentation didn't mention --origin as equivalent of -oAndy Parkins2006-11-021-0/+1
| | | | | Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Minor grammar fixes for git-diff-index.txtAndy Parkins2006-11-021-2/+2
| | | | | | | | | | "what you are going to commit is" doesn't need the "is" and does need a comma. "can trivially see" is an unecessary split infinitive and "easily" is a more appropriate adverb. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* link_temp_to_file: call adjust_shared_perm() only when we created the directoryJohannes Schindelin2006-11-021-2/+1
|
* pack-objects doesn't create random pack namesNicolas Pitre2006-11-011-3/+2
| | | | | | | Documentation for pack-objects seems to be out of date in this regard. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* link_temp_to_file: don't leave the path truncated on adjust_shared_perm failureJunio C Hamano2006-10-311-1/+3
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* revision traversal: --unpacked does not limit commit list anymore.Junio C Hamano2006-10-301-1/+1
| | | | | | This is needed to gain smaller latency back. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Continue traversal when rev-list --unpacked finds a packed commit.Jan Harkes2006-10-301-8/+6
| | | | | | | | | | | When getting the list of all unpacked objects by walking the commit history, we would stop traversal whenever we hit a packed commit. However the fact that we found a packed commit does not guarantee that all previous commits are also packed. As a result the commit walkers did not show all reachable unpacked objects. Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use memmove instead of memcpy for overlapping areasEdgar Toernig2006-10-301-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* quote.c: ensure the same quoting across platforms.Junio C Hamano2006-10-301-1/+1
| | | | | | | | We read a byte from "char *" and compared it with ' ' to decide if it needs quoting to protect textual output. With a platform where char is unsigned char that would give different result. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"Junio C Hamano2006-10-302-0/+7
| | | | | | Otherwise "make CFLAGS=-DDEBUG=1" is cumbersome to run. Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitweb: Check git base URLs before generating URL from itJakub Narebski2006-10-271-1/+1
| | | | | | | | | | | | Check if each of git base URLs in @git_base_url_list is true before appending "/$project" to it to generate project URL. This fixes the error that for default configuration for gitweb in Makefile, with GITWEB_BASE_URL empty (and "++GITWEB_BASE_URL++" being "" in gitweb.cgi), we had URL of "/$project" in the summary view. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: add git in /etc/services.Christian Couder2006-10-272-0/+14
| | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: add upload-archive service to git-daemon.Christian Couder2006-10-271-0/+5
| | | | | | | | This patch minimaly documents the upload-archive service, hoping that someone with better knowledge will improve upon. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-cherry: document limit and add diagramRene Scharfe2006-10-261-2/+17
| | | | | | | | | | This patch adds the diagram from the long usage string of git-cherry to its documentation, and documents the third option. I changed some of the + to - in order to save the reader from wondering where they might fit into the picture. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'jc/combined' into maintJunio C Hamano2006-10-262-11/+53
|\ | | | | | | | | | | | | * jc/combined: combine-diff: honour --no-commit-id combine-diff: fix hunk_comment_line logic. combine-diff: a few more finishing touches.
| * combine-diff: honour --no-commit-idJunio C Hamano2006-10-261-3/+3
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * combine-diff: fix hunk_comment_line logic.Junio C Hamano2006-10-261-1/+5
| | | | | | | | | | | | | | We forgot that the last element of sline[] is a sentinel without the actual line. *BLUSH* Signed-off-by: Junio C Hamano <junkio@cox.net>
| * combine-diff: a few more finishing touches.Junio C Hamano2006-10-262-8/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "new file" and "deleted file" were already reported in the original code, but the logic was not as transparent as it could have. This uses a few variables and more comments to clarify the flow. The rule is: (1) if a path exists in the merge result when no parent had it, we report "new" (otherwise it came from the parents, as opposed to have added by the evil merge). (2) if the path does not exist in the merge result, it is "deleted". Since we can say "new" and "deleted", there is no reason not to follow the /dev/null convention. This fixes it. Appending function name after @@@ ... @@@ is trivial, so implement it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | diff-format.txt: Correct information about pathnames quoting in patch formatJakub Narebski2006-10-261-2/+4
|/ | | | | Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: clarify refname disambiguation rules.Junio C Hamano2006-10-261-4/+21
| | | | | | | | Nobody should create ambiguous refs (i.e. have tag "foobar" and branch "foobar" at the same time) that need to be disambiguated with these rules to keep sanity, but the rules are there so document them. Signed-off-by: Junio C Hamano <junkio@cox.net>
* diff-format.txt: Combined diff format documentation supplementJakub Narebski2006-10-261-8/+68
| | | | | | | | | | | | | | | | | | | | | Update example combined diff format to the current version $ git diff-tree -p -c fec9ebf16c948bcb4a8b88d0173ee63584bcde76 and provide complete first chunk in example. Document combined diff format headers: how "diff header" look like, which of "extended diff headers" are used with combined diff and how they look like, differences in two-line from-file/to-file header from non-combined diff format, chunk header format. It should be noted that combined diff format was designed for quick _content_ inspection and renames would work correctly to pick which blobs from each tree to compare but otherwise not reflected in the output (the pathnames are not shown). [jc: with minimum copyediting] Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove --syslog in git-daemon inetd documentation examples.Christian Couder2006-10-252-6/+4
| | | | | | | It is useless because --inetd implies --syslog. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: updates to "Everyday GIT"J. Bruce Fields2006-10-251-31/+12
| | | | | | | | | | | | | Remove the introduction: I think it should be obvious why we have this. (And if it isn't obvious then we've got other problems.) Replace reference to git whatchanged by git log. Miscellaneous style and grammar fixes. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/SubmittingPatches: 3+1 != 6v1.4.3.3Junio C Hamano2006-10-251-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of linesPetr Baudis2006-10-251-2/+1
| | | | | | | | | | This removes the '#' and '(' tests and adds a '$' test instead although I have no idea what it is actually good for - but hey, if that's what GNU diff does... Pasky only went and did as Junio sayeth. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update cherry documentation.Junio C Hamano2006-10-252-4/+5
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Refer to git-rev-parse:Specifying Revisions from git.txtJunio C Hamano2006-10-251-0/+3
| | | | | | | | The brief list given in "Symbolic Identifiers" section of the main documentation is good enough for overview, but help the reader to find a more comrehensive list as needed. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-fetch.sh printed protocol fixTuncer Ayaz2006-10-251-1/+2
| | | | | | | | | | | | | We have supported https:// protocol for some time and in 1.4.3 added ftp:// protocol. The transfer were still reported to be over http. [jc: Tuncer used substring parameter substitution ${remote%%:*} but I am deferring it to a later day. We should replace colon-expr with substring substitution after everybody's shell can grok it someday, but we are not in a hurry. ] Signed-off-by: Junio C Hamano <junkio@cox.net>
* RPM package re-classification.Junio C Hamano2006-10-251-6/+6
| | | | | | | | Grabbing anything that had *arch* in its name into git-arch package was a wrong idea and we lost git-archive from git-core by mistake. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: note about contrib/.Junio C Hamano2006-10-241-0/+5
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svn: fix symlink-to-file changes when using command-line svn 1.4.0Eric Wong2006-10-241-3/+6
| | | | | | | | | | | | | I incorrectly thought this was hopelessly broken in svn 1.4.0, but now it's just broken in that the old method didn't work. It looks like svn propdel and svn propset must be used now and the (imho) more obvious svn rm --force && svn add no longer works. "make -C t full-svn-test" should now work. Signed-off-by: Eric Wong <normalperson@yhbt.net> Acked-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Set $HOME for selftestsGerrit Pape2006-10-241-1/+2
| | | | | | | | | | | Set HOME environment variable to test trash directory and export for selftests. This fixes the git-svn selftests with nonexistent or not readable home, as found in at least one automated build system: http://buildd.debian.org/fetch.cgi?&pkg=git-core&ver=1%3A1.4.2.3-2&arch=alpha&stamp=1161537466&file=log Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitweb: Fix setting $/ in parse_commit()v1.4.3.2Petr Baudis2006-10-231-2/+1
| | | | | | | | | | | | If the commit couldn't have been read, $/ wasn't restored to \n properly, causing random havoc like git_get_ref_list() returning the ref names with trailing \n. Aside of potential confusion in the body of git_search(), no other $/ surprises are hopefully hidden in the code. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* daemon: do not die on older clients.Junio C Hamano2006-10-231-1/+5
| | | | | | | | | | In the older times, the clients did not say which host they were trying to connect, and the code we recently added did not quite handle the older clients correctly. Noticed by Simon Arlott. Signed-off-by: Junio C Hamano <junkio@cox.net>
* xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.Jim Meyering2006-10-231-1/+1
| | | | | | | | | | | | | This removes trailing blanks from git-generated diff headers the same way a similar patch did that for GNU diff: http://article.gmane.org/gmane.comp.gnu.utils.bugs/13839 That is, it removes trailing blanks on the hunk header line that shows the function name. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-clone: honor --quietJim Meyering2006-10-231-1/+2
| | | | | | | | | | | I noticed that a cron-launched "git-clone --quiet" was generating progress output to standard error -- and thus always spamming me. The offending output was due to git-clone invoking git-read-tree with its undocumented -v option. This change turns off "-v" for --quiet. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation for the [remote] configSanti Béjar2006-10-232-0/+20
| | | | | Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* prune-packed: Fix uninitialized variable.Alexandre Julliard2006-10-231-1/+1
| | | | | | | | The dryrun variable was made local instead of static by the previous commit, and local variables aren't initialized to zero. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* pager: default to LESS=FRSX not LESS=FRSJunio C Hamano2006-10-221-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make prune also run prune-packedJ. Bruce Fields2006-10-223-6/+8
| | | | | | | | | | | Both the git-prune manpage and everday.txt say that git-prune should also prune unpacked objects that are also found in packs, by running git prune-packed. Junio thought this was "a regression when prune was rewritten as a built-in." So modify prune to call prune-packed again. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
* git-vc: better installation instructionsKarl Hasselström2006-10-221-1/+4
| | | | | | | | Provide some more detailed installation instructions, for the elisp-challenged among us. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitweb: Do not esc_html $basedir argument to git_print_tree_entryJakub Narebski2006-10-221-3/+6
| | | | | | | | | | | In git_tree, rename $base variable (which is passed as $basedir argument to git_print_tree_entry) to $basedir. Do not esc_html $basedir, as it is part of file_name ('f') argument in link and not printed. Add '/' at the end only if $basedir is not empty (it is empty for top directory) and doesn't end in '/' already. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2)Jakub Narebski2006-10-221-30/+30
| | | | | | | | Code should be aligned the same way, regardless of tab size. Use tabs for indent, but spaces for align. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix usagestring for git-branchLars Hjemli2006-10-221-1/+1
| | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-merge: show usage if run without argumentsRene Scharfe2006-10-221-0/+2
| | | | | Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix typo in show-index.cv1.4.3.1Lars Hjemli2006-10-201-1/+1
| | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status