aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* git-prune: never lose objects reachable from our refs.Junio C Hamano2005-12-08
| | | | | | | | | | | | | Explicit <head> arguments to git-prune replaces, instead of extends, the list of heads used for reachability analysis by fsck-objects. By giving a subset of heads by mistake, objects reachable only from other heads can be removed, resulting in a corrupted repository. This commit stops replacing the list of heads, and makes the command line arguments to add to them instead for safety. Signed-off-by: Junio C Hamano <junkio@cox.net>
* qsort(): ptrdiff_t may be larger than intJunio C Hamano2005-12-08
| | | | | | | | | This is a companion patch to e23eff8be92a2a2cb66b53deef020063cff285ed commit. The same logic, the same rationale that a comparison function that returns an int should not just compute a ptrdiff_t and return it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: git-pruneJunio C Hamano2005-12-08
| | | | | | | | | Not replacing but always including our own refs may be more desirable (and unarguably much safer), but at the same time I have a suspicion that that might be forbidding a useful usage I haven't thought of, so... Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-read-tree.txt: Add --reset to SYNOPSIS.Nikolai Weibull2005-12-08
| | | | | Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-tag.txt: Fix the order of sections (DESCRIPTION should ↵Nikolai Weibull2005-12-08
| | | | | | | come before OPTIONS). Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-update-server-info.txt: Add -f alias for --force to ↵Nikolai Weibull2005-12-08
| | | | | | | documentation. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-http-fetch.txt: Document the commit-id argument.Nikolai Weibull2005-12-08
| | | | | Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-repack.txt: Add -l and -n.Nikolai Weibull2005-12-08
| | | | | | | This adds documentation for the -l and -n options to git-repack. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-ls-remote.txt: Add -h and -t.Nikolai Weibull2005-12-08
| | | | | | | -h and -t are aliases for --heads and --tags to git-ls-remote. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-format-patch.txt: Add --signoff, --check, and long ↵Nikolai Weibull2005-12-08
| | | | | | | | | | | | option-names. The documentation was lacking descriptions for the --signoff and --check options to git-format-patch. It was also missing the following long option-names: --output-directory (-o), --numbered (-n), --keep-subject (-k), --author (-a), --date (-d), and --mbox (-m). Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add documentation for the --topo-order option to git-show-branch.Nikolai Weibull2005-12-08
| | | | | Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add documentation for git-revert and git-cherry-pick.Nikolai Weibull2005-12-08
| | | | | | | | | | * Added the -e option to the documentation of git-cherry-pick. * Added the -e and --no-commit option to git-revert. * Removed redundant case expression for -n as --no-edit (already taken by --no-commit). Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-cherry-pick: Add --replay and --no-commit.Nikolai Weibull2005-12-08
| | | | | Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-cvsimport.txt: Fix a slight glitch in description heading.Nikolai Weibull2005-12-08
| | | | | Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-verify-pack.txt: added documentation for --.Nikolai Weibull2005-12-08
| | | | | | | The -- option has been added to the documentation of git-verify-pack. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-commit.txt: Add long options and -- to documentation.Nikolai Weibull2005-12-08
| | | | | | | | | | | | | | | Added the following long options to documentation: * --all * --signoff * --verify * --no-verify * --edit Also added documentation for the -- option for terminating option parsing. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use uniform description for the '--' option.Nikolai Weibull2005-12-08
| | | | | | | | All descriptions of the '--' option were the same except for that in Documentation/git-merge-index.txt. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix the description of --utf8 and --keep to git-am.Nikolai Weibull2005-12-08
| | | | | | | | The git-am script actually transform --utf8 and --keep to -u and -k when sent to git-mailinfo. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document the --non-empty command-line option to git-pack-objects.Nikolai Weibull2005-12-08
| | | | | | | | This provides (minimal) documentation for the --non-empty command-line option to the pack-objects command. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* show-branch: comment typoJunio C Hamano2005-12-08
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: recursive is the default strategy these days.Junio C Hamano2005-12-08
| | | | | | We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make sure we use compat/subprocess.py with Python 2.3 while running tests.Junio C Hamano2005-12-07
| | | | | | Otherwise the test will not succeed without installing. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Clean up file descriptors when calling hooks.Daniel Barkalow2005-12-07
| | | | | | | | When calling post-update hook, don't leave stdin and stdout connected to the pushing connection. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* refs.c: make sure leading directories exist before writing a ref.Junio C Hamano2005-12-07
| | | | | | | Otherwise cloning a repository with hierarchical branch/tag over http would fail. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation(tutorial): adjust merge example to the new merge world order.Junio C Hamano2005-12-07
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation(cvs-migration): minor cleanups.Junio C Hamano2005-12-07
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation(glossary): minor formatting clean-ups.Junio C Hamano2005-12-07
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: git.html/git.7Junio C Hamano2005-12-07
| | | | | | | | | Finish each sentence with a full stop. Instead of saying 'directory index' 'directory cache' etc, consistently say 'index'. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge http://www.kernel.org/pub/scm/gitk/gitkJunio C Hamano2005-12-07
|\
| * gitk: Work around Tcl's non-standard names for encodingsPaul Mackerras2005-12-07
| | | | | | | | | | | | | | | | This uses a table of encoding names and aliases distilled from http://www.iana.org/assignments/character-sets plus some heuristics to convert standard encoding names to ones that Tcl recognizes. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * gitk: Some improvements for the code for updating the displayPaul Mackerras2005-12-06
| | | | | | | | | | | | | | | | 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 <paulus@samba.org>
| * gitk: Factored out some common code into a new start_rev_list procedurePaul Mackerras2005-12-01
| | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] gitk: add Update menu item.Sven Verdoolaege2005-12-01
| | | | | | | | | | | | | | | | Update will redraw the commits if any commits have been added to any of the selected heads. The new commits appear on the top. Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | update-index: allow --index-info to add higher stages.Junio C Hamano2005-12-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <junkio@cox.net>
* | git-merge-one: new merge world order.Junio C Hamano2005-12-07
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 <junkio@cox.net>
* | checkout-index: allow checking out from higher stages.Junio C Hamano2005-12-07
| | | | | | | | | | | | | | | | 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 <junkio@cox.net>
* | Use printf rather than echo -n.Jason Riedy2005-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | qsort() ptrdiff_t may be larger than intJunio C Hamano2005-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Morten Welinder <mwelinder@gmail.com> 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 <junkio@cox.net>
* | [PATCH] Initial AIX portability fixes.Jason Riedy2005-12-06
| | | | | | | | | | | | | | | | | | | | | | 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 <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-merge-one-file: resurrect leading path creation.Junio C Hamano2005-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <junkio@cox.net>
* | Documentaiton (read-tree): update description of 3-wayJunio C Hamano2005-12-05
| | | | | | | | | | | | | | | | 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 <junkio@cox.net>
* | Documentation: hash-object.Junio C Hamano2005-12-05
| | | | | | | | | | | | | | | | 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 <junkio@cox.net>
* | write-tree: check extra arguments and die but be a bit more helpful.Junio C Hamano2005-12-05
| | | | | | | | | | | | | | | | "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 <junkio@cox.net>
* | init-db: check extra arguments and complain.Junio C Hamano2005-12-05
| | | | | | | | | | | | | | "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 <junkio@cox.net>
* | hash-object: -- and --helpJunio C Hamano2005-12-05
| | | | | | | | | | | | | | | | | | | | 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 <junkio@cox.net>
* | Added documentation for few missing options.Jon Loeliger2005-12-05
| | | | | | | | | | | | | | | | | | | | 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 <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-mv to work with Perl 5.6Junio C Hamano2005-12-05
| | | | | | | | | | | | List form of pipe open is 5.8 invention. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix 5501 testJunio C Hamano2005-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <junkio@twinsun.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Clean up compatibility definitions.Junio C Hamano2005-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <junkio@cox.net>
* | [PATCH] Document config.mak in INSTALL.Jason Riedy2005-12-05
| | | | | | | | | | | | | | | | | | | | 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 <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 19:25:45 +0000