aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* git-svn: quiet some warnings when run only with --version/--helpEric Wong2007-04-17
| | | | | | | | These are harmless but annoying. They were introduced in 512b620bd9fef7f170562ecad835e37479f051ce Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svn: respect lower bound of -r/--revision when following parentEric Wong2007-04-17
| | | | | | | | When an explicit --revision argument is specified, do not fetch past the specified range into the beginning of history. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Have sample update hook not refuse deleting a branch through push.Gerrit Pape2007-04-16
| | | | | | | | source ref might be 0000...0000 to delete a branch through git-push, 'git <remote> push :<branch>'. The update hook should not decline this. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* variable $projectdesc needs to be set before checking against unchanged default.Gerrit Pape2007-04-16
| | | | | Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update git-annotate/git-blame documentationAndrew Ruder2007-04-16
| | | | | | | | | | | | | | | | | | | | | | | Moved options that pertained to both git-blame and git-annotate to a common file blame-options.txt. builtin-blame.c: Removed --compatibility, --long, --time from the short usage as they are not handled in the code. Documentation/git-blame.txt: Removed common options to git-annotate. Added documentation for --score-debug. Removed --compatibility. Adjusted usage at top to not wrap on 80 columns. Documentation/git-annotate.txt: Using common options blame-options.txt. Documentation/blame-options.txt: Added -b note about associated config option, added --root note about associated config option, added documentation for --show-stats. Removed --long, --time, --rev-file as those options do not really exist. Added documentation for -M/-C taking an optional score argument for detection of moved lines. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update git-apply documentationAndrew Ruder2007-04-16
| | | | | | | | | Document -v (short form of --verbose). Redo usage to not wrap on 80 column terminal with typical settings. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update git-applymbox documentationAndrew Ruder2007-04-16
| | | | | | | | | Documentation/git-applymbox.txt: updating -u documentation to include fact that it encodes to the i18n.commitencoding setting, not just utf-8. Added documentation of -n option to pass -n to git-mailinfo. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update git-am documentationAndrew Ruder2007-04-16
| | | | | | | | | Documentation/git-am.txt missing several short versions of options. Added documentation for --resolvemsg=<msg> command-line option. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* user-manual: use detached head when rewriting historyJ. Bruce Fields2007-04-16
| | | | | | | | This is slightly simpler if we use a detached head. And it's probably good to have another example that uses this feature. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* user-manual: start revising "internals" chapterJ. Bruce Fields2007-04-16
| | | | | | | Minor revisions, cross-references. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* user-manual: detached HEADJ. Bruce Fields2007-04-16
| | | | | | | Add a brief mention of detached HEADs and .git/HEAD. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* user-manual: fix discussion of default cloneJ. Bruce Fields2007-04-16
| | | | | | | | The name "master" isn't actually quite so special. Also, fix some bad grammar. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: clarify track/no-track option.J. Bruce Fields2007-04-16
| | | | | | | | | Fix the description of the --no-track option so it no longer says the opposite of what was intended. Also mention branch.autosetupmerge explicitly. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: clarify git-checkout -f, minor editingJ. Bruce Fields2007-04-16
| | | | | | | | | "Force a re-read of everything" doesn't mean much to me. Also some minor grammar fixes. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: minor edits of git-lost-found manpageJ. Bruce Fields2007-04-16
| | | | | | | Minor improvements to grammar and clarity of lost-found manpage. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document -g (--walk-reflogs) option of git-logAlex Riesen2007-04-15
| | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* sscanf/strtoul: parse integers robustlyJim Meyering2007-04-14
| | | | | | | | | | | | | * builtin-grep.c (strtoul_ui): Move function definition from here, to... * git-compat-util.h (strtoul_ui): ...here, with an added "base" parameter. * builtin-grep.c (cmd_grep): Update use of strtoul_ui to include base, "10". * builtin-update-index.c (read_index_info): Diagnose an invalid mode integer that is out of range or merely larger than INT_MAX. (cmd_update_index): Use strtoul_ui, not sscanf. * convert-objects.c (write_subdirectory): Likewise. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge git://git2.kernel.org/pub/scm/gitk/gitk into maintJunio C Hamano2007-04-14
|\ | | | | | | | | | | * git://git2.kernel.org/pub/scm/gitk/gitk: [PATCH] Improve look-and-feel of the gitk tool. [PATCH] Teach gitk to use the user-defined UI font everywhere.
| * [PATCH] Improve look-and-feel of the gitk tool.Eygene Ryabinkin2007-04-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Made the default buttons on the dialog active and focused upon the dialog appearence. Bound 'Escape' and 'Return' keys to the dialog dismissal where it was appropriate: mainly for dialogs with only one button and no editable fields. Unified the look of the "About gitk" and "Key bindings" dialogs. Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] Teach gitk to use the user-defined UI font everywhere.Eygene Ryabinkin2007-04-01
| | | | | | | | | | | | | | | | Some parts of gitk were not respecting the default GUI font. Most of them were catched and fixed. Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | git-blame: Fix overrun in fake_working_tree_commit()Michael Spang2007-04-14
| | | | | | | | | | | | | | git-blame would overflow commit->buffer when annotating files with long paths. Signed-off-by: Michael Spang <mspang@uwaterloo.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-quiltimport complaining yet still workingLinus Torvalds2007-04-14
| | | | | | | | | | | | | | | | | | | | | | There were two bugs: "stop_here" doesn't exist, but the bug that causes this code to trigger in the *first* place is the wrong use of "$dotest". It should be ".dotest" This is essentially the same bug introduced by 87ab7992, one was fixed with 0d38ab25 but this was somehow left behind. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | config.txt: Fix grammatical error in description of http.noEPSVFrank Lichtenheld2007-04-13
| | | | | | | | | | | | | | s/doesn't/don't/ since "ftp servers" is plural Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | config.txt: Change pserver to server in description of gitcvs.*Frank Lichtenheld2007-04-13
| | | | | | | | | | | | | | | | These variables apply to the SSH access as well, so don't use pserver here which might confuse users. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | config.txt: Document core.autocrlfFrank Lichtenheld2007-04-13
| | | | | | | | | | | | | | Text shamelessly stolen from the 1.5.1 release notes. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | config.txt: Document gitcvs.allbinaryFrank Lichtenheld2007-04-13
| | | | | | | | | | Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Do not default to --no-index when given two directories.Junio C Hamano2007-04-13
| | | | | | | | | | | | | | | | | | | | | | | | git-diff -- a/ b/ always defaulted to --no-index, primarily because the function is_in_index() was implemented quite incorrectly. Noticed by Patrick Maaß and Simon Schubert independently, initial patch was provided by Patrick but I fixed it differently. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Use rev-list --reverse in git-rebase.shAlex Riesen2007-04-13
| | | | | | | | | | | | | | ...and drop the last perl dependency in the script. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | handle_options in git wrapper miscounts the options it handled.Matthias Lederhofer2007-04-12
| | | | | | | | | | | | | | | | | | handle_options did not count the number of used arguments correctly. When --git-dir was used the extra argument was not added to the number of handled arguments. Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 1.5.1.1v1.5.1.1Junio C Hamano2007-04-11
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | cvsserver: Fix handling of diappeared files on updateFrank Lichtenheld2007-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only send a modified response if the client sent a "Modified" entry. This fixes the case where the file was locally deleted on the client without being removed from CVS. In this case the client will only have sent the Entry for the file but nothing else. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Acked-by: Martin Langhoff <martin@catalyst.net.nz> Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | fsck: do not complain on detached HEAD.Junio C Hamano2007-04-11
| | | | | | | | | | | | | | | | | | | | | | | | Detached HEAD is just a normal state of a repository. Do not say anything about it. Do not give worrying "error:" messages when we let the user know that the HEAD points at nothing (i.e. yet to be born branch), nor we do not have any default refs to start following the objects chain. Reword them as "notice:". Signed-off-by: Junio C Hamano <junkio@cox.net>
* | (encode_85, decode_85): Mark source buffer pointer as "const".Jim Meyering2007-04-11
| | | | | | | | | | Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: show-ref: document --exclude-existingJulian Phillips2007-04-09
| | | | | | | | | | | | | | | | Use the comment in the code to document the --exclude-existing function to git-show-ref. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | cvsexportcommit -p : fix the usage of git-apply -C.Tomash Brechko2007-04-09
| | | | | | | | | | | | | | | | | | Unlike 'patch --fuzz=NUM', which specifies the number of lines allowed to mismatch, 'git-apply -CNUM' requests the match of NUM lines of context. Omitting -C requests full context match, and that's what should be used for cvsexportcommit -p. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add Documentation/cmd-list.made to .gitignoreJunio C Hamano2007-04-08
| | | | | | | | | | | | Noticed by Randal L. Schwartz. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-svn: fix log command to avoid infinite loop on long commit messagesEric Wong2007-04-08
| | | | | | | | | | | | | | | | | | | | This bug has been around since the the conversion to use the Git.pm library back in October or November. Eventually I'd like "git rev-list/log" to have the option to not truncate overly long messages. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-svn: dcommit/rebase confused by patches with git-svn-id: linesEric Wong2007-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When patches are merged from another git-svn managed branch, they will have the git-svn-id: metadata line in them (generated by git-format-patch). When doing rebase or dcommit via git-svn, this would cause git-svn to find the wrong upstream branch. We now verify that the commit is consistent with the value in the .rev_db file. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-svn: bail out on incorrect command-line optionsEric Wong2007-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | | "git svn log" is the only command that needs the pass-through option in Getopt::Long; otherwise we will bail out and let the user know something is wrong. Also, avoid printing out unaccepted mixed-case options (that are reserved for the command-line) such as --useSvmProps in the usage() function. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Prepare for 1.5.1.1Junio C Hamano2007-04-07
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | cvsserver: small corrections to asciidoc documentationFrank Lichtenheld2007-04-07
| | | | | | | | | | | | | | | | | | | | Fix a typo: s/Not/Note/ Some formating fixes: Use ` ` syntax for all filenames and ' ' syntax for all commandline switches. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: tighten dependency for git.{html,txt}Junio C Hamano2007-04-06
| | | | | | | | | | | | | | | | | | Every time _any_ documentation page changed, cmds-*.txt files were regenerated, which caused git.{html,txt} to be remade. Try not to update cmds-*.txt files if their new contents match the old ones. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Makefile: iconv() on Darwin has the old interfaceArjen Laarhoven2007-04-06
| | | | | | | | | | | | | | | | | | | | The libiconv on Darwin uses the old iconv() interface (2nd argument is a const char **, instead of a char **). Add OLD_ICONV to the Darwin variable definitions to handle this. Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Acked-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | t5300-pack-object.sh: portability issue using /usr/bin/statArjen Laarhoven2007-04-06
| | | | | | | | | | | | | | | | | | In the test 'compare delta flavors', /usr/bin/stat is used to get file size. This isn't portable. There already is a dependency on Perl, use its '-s' operator to get the file size. Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | t3200-branch.sh: small language nitArjen Laarhoven2007-04-06
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | usermanual.txt: some capitalization nitsArjen Laarhoven2007-04-06
| | | | | | | | | | Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Make builtin-branch.c handle the git config fileLars Hjemli2007-04-06
| | | | | | | | | | | | | | | | | | | | | | This moves the knowledge about .git/config usage out of refs.c and into builtin-branch.c instead, which allows git-branch to update HEAD to point at the moved branch before attempting to update the config file. It also allows git-branch to exit with an error code if updating the config file should fail. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | rename_ref(): only print a warning when config-file update failsLars Hjemli2007-04-06
| | | | | | | | | | | | | | | | | | If git_config_rename_section() fails, rename_ref() used to return 1, which left HEAD pointing to an absent refs/heads file (since the actual renaming had already occurred). Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Distinguish branches by more than case in tests.Brian Gernhardt2007-04-06
| | | | | | | | | | | | | | | | The renaming without config test changed a branch from q to Q, which fails on non-case sensitive file systems. Change the test to use q and q2. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Avoid composing too long "References" header.YOSHIFUJI Hideaki / 吉藤英明2007-04-06
| | | | | | | | | | | | | | | | | | The number of characters in a line MUST be no more than 998 characters, and SHOULD be no more than 78 characters (RFC2822). It is much safer to fold the header by ourselves. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-08 18:50:00 +0000