9731706 | Junio C Hamano | 21 April 2007, 20:57:07 UTC | GIT 1.5.1.2 Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 April 2007, 20:57:07 UTC |
4a40cbd | Eric Wong | 21 April 2007, 07:55:00 UTC | perl: install private Error.pm if the site version is older than our own bdash (on IRC) had a problem with Git.pm (via git-svn) when his site installation of Error.pm was older than the version we package. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 April 2007, 20:06:24 UTC |
928c210 | Junio C Hamano | 21 April 2007, 00:25:27 UTC | git-clone: fix dumb protocol transport to clone from pack-pruned ref This forward-ports a fix from 2986c022 to git-clone. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 April 2007, 00:25:27 UTC |
9bc20aa | Andrew Ruder | 19 April 2007, 03:03:37 UTC | Update git-config documentation Documentation/git-config.txt: Added documentation for --system Documentation/builtin-config.c: Added --system to the short usage Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2007, 05:08:16 UTC |
c91ee27 | Andrew Ruder | 19 April 2007, 03:03:31 UTC | Fix unmatched emphasis tag in git-tutorial In asciidoc 7.1.2 and prior there is no obvious way to get: 'add'ing to emphasize only the "add", instead it treats the first apostrophe as the beginning of an emphasis, and the second apostrophe as a regular apostrophe and makes the rest of the line an emphasis since there is no closing apostrophe. In the newer asciidoc you can do it pretty easily with __add__ing but I'm not sure it would be best to make that a prereq for something as silly as this. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2007, 05:08:03 UTC |
6b04600 | Andrew Ruder | 19 April 2007, 03:03:26 UTC | Update git-cherry-pick documentation Documentation/git-cherry-pick.txt: Remove --replay as it is not handled by the code (-r is however). Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2007, 05:07:57 UTC |
27c8f8c | Andrew Ruder | 19 April 2007, 03:03:14 UTC | Update git-archive documentation Documentation/git-archive.txt: Document -v/--verbose option. Add -l as short form of --list. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2007, 05:06:21 UTC |
6e6db39 | Andy Whitcroft | 19 April 2007, 02:08:15 UTC | fix up strtoul_ui error handling Two scanf() calls were converted to strtoul_ui() but the return values were not updated to match. scanf() returns the number of matched "values" which for this usage is 1 on success. strtoul_ui() return 0 on success. Update these call sites to match. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2007, 02:26:33 UTC |
9f1beb7 | Sam Vilain | 18 April 2007, 23:51:21 UTC | git-tar-tree: complete deprecation conversion message The syntax for git-archive is different; warn about it in the deprecation message on the manual page. Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2007, 00:57:25 UTC |
0ad64fd | Frank Lichtenheld | 18 April 2007, 22:10:22 UTC | git-shortlog: Fix two formatting errors in asciidoc documentation First use [verse] in the SYNOPSIS so that the line break actually shows. Secondly drop the quotes around '.mailmap' since this exposes a bug in our toolchain (didn't bother enough yet to find out wether it is asciidoc's fault or that of the XSL templates) that leads to the dot not getting escaped correctly in the roff output and thereby swallowing the line. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 April 2007, 22:41:59 UTC |
0afa764 | Alex Riesen | 18 April 2007, 21:58:56 UTC | Fix overwriting of files when applying contextually independent diffs Noticed by applying two diffs of different contexts to the same file. The check for existence of a file was wrong: the test assumed it was a directory and reset the errno (twice: directly and by calling lstat). So if an entry existed and was _not_ a directory no attempt was made to rename into it, because the errno (expected by renaming code) was already reset to 0. This resulted in error: fatal: unable to write file file mode 100644 For Linux, removing "errno = 0" is enough, as lstat wont modify errno if it was successful. The behavior should not be depended upon, though, so modify the "if" as well. The test simulates this situation. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 April 2007, 22:33:01 UTC |
0c1ec5a | Eric Wong | 18 April 2007, 07:17:33 UTC | git-svn: don't allow globs to match regular files git only tracks the histories of full directories, not that of individual files. Sometimes, SVN users will place[1] a regular file in the directory designated for subdirectories of branches or tags. Thanks to jrockway on #git for pointing this out. [1] mistakenly or otherwise, such as a README Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 April 2007, 19:39:04 UTC |
1401f46 | Carlos Rica | 18 April 2007, 03:34:34 UTC | Use const qualifier for 'sha1' parameter in delete_ref function delete_ref function does not change the 'sha1' parameter. Non-const pointer causes a compiler warning if you call to the function using a const argument. Signed-off-by: Carlos Rica <jasampler@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 April 2007, 05:00:18 UTC |
ab60294 | Junio C Hamano | 18 April 2007, 00:32:23 UTC | Start preparing for 1.5.1.2 | 18 April 2007, 00:47:59 UTC |
0220f1e | Junio C Hamano | 18 April 2007, 00:16:41 UTC | Merge branch 'maint' of git://repo.or.cz/git-gui into maint * 'maint' of git://repo.or.cz/git-gui: git-gui: Brown paper bag fix division by 0 in blame | 18 April 2007, 00:16:41 UTC |
c284914 | Eric Wong | 17 April 2007, 09:41:43 UTC | git-svn: quiet some warnings when run only with --version/--help 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> | 17 April 2007, 10:33:22 UTC |
d627de6 | Eric Wong | 15 April 2007, 10:01:29 UTC | git-svn: respect lower bound of -r/--revision when following parent 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> | 17 April 2007, 10:33:22 UTC |
9177649 | Gerrit Pape | 16 April 2007, 08:31:35 UTC | Have sample update hook not refuse deleting a branch through push. 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> | 16 April 2007, 08:35:39 UTC |
5946d88 | Gerrit Pape | 16 April 2007, 08:30:42 UTC | variable $projectdesc needs to be set before checking against unchanged default. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:35:33 UTC |
635f4a3 | Andrew Ruder | 16 April 2007, 06:20:34 UTC | Update git-annotate/git-blame documentation 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> | 16 April 2007, 08:14:46 UTC |
0b9a9dd | Andrew Ruder | 16 April 2007, 06:20:40 UTC | Update git-apply documentation 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> | 16 April 2007, 08:14:46 UTC |
982f65a | Andrew Ruder | 16 April 2007, 06:40:06 UTC | Update git-applymbox documentation 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> | 16 April 2007, 08:14:46 UTC |
5c19f24 | Andrew Ruder | 16 April 2007, 07:21:31 UTC | Update git-am documentation 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> | 16 April 2007, 08:14:46 UTC |
25d9f3f | J. Bruce Fields | 16 April 2007, 04:37:16 UTC | user-manual: use detached head when rewriting history 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> | 16 April 2007, 08:10:29 UTC |
a536b08 | J. Bruce Fields | 16 April 2007, 04:37:15 UTC | user-manual: start revising "internals" chapter Minor revisions, cross-references. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2007, 08:10:29 UTC |
72a76c9 | J. Bruce Fields | 16 April 2007, 04:37:14 UTC | user-manual: detached HEAD 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> | 16 April 2007, 08:10:29 UTC |
4f75240 | J. Bruce Fields | 16 April 2007, 04:37:13 UTC | user-manual: fix discussion of default clone 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> | 16 April 2007, 08:10:28 UTC |
b710830 | J. Bruce Fields | 16 April 2007, 04:37:12 UTC | Documentation: clarify track/no-track option. 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> | 16 April 2007, 08:10:28 UTC |
40c8279 | J. Bruce Fields | 16 April 2007, 04:37:11 UTC | Documentation: clarify git-checkout -f, minor editing "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> | 16 April 2007, 08:10:28 UTC |
cb1881c | J. Bruce Fields | 16 April 2007, 04:37:10 UTC | Documentation: minor edits of git-lost-found manpage 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> | 16 April 2007, 08:10:28 UTC |
5f2e1df | Alex Riesen | 15 April 2007, 22:36:06 UTC | Document -g (--walk-reflogs) option of git-log Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 April 2007, 23:05:24 UTC |
61d6ed1 | Jim Meyering | 09 April 2007, 23:01:44 UTC | sscanf/strtoul: parse integers robustly * 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> | 15 April 2007, 02:47:20 UTC |
e94b4d2 | Junio C Hamano | 15 April 2007, 02:45:16 UTC | Merge git://git2.kernel.org/pub/scm/gitk/gitk into maint * 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. | 15 April 2007, 02:45:16 UTC |
1bb88be | Michael Spang | 14 April 2007, 21:26:20 UTC | git-blame: Fix overrun in fake_working_tree_commit() 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> | 15 April 2007, 00:37:28 UTC |
1fa9bf3 | Linus Torvalds | 13 April 2007, 21:34:18 UTC | git-quiltimport complaining yet still working 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> | 14 April 2007, 10:39:36 UTC |
befc9c4 | Frank Lichtenheld | 13 April 2007, 16:02:33 UTC | config.txt: Fix grammatical error in description of http.noEPSV 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> | 14 April 2007, 02:39:28 UTC |
5007af8 | Frank Lichtenheld | 13 April 2007, 16:02:32 UTC | config.txt: Change pserver to server in description of gitcvs.* 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> | 14 April 2007, 02:39:28 UTC |
5cb71f8 | Frank Lichtenheld | 13 April 2007, 16:02:31 UTC | config.txt: Document core.autocrlf 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> | 14 April 2007, 02:39:28 UTC |
eabb0bf | Frank Lichtenheld | 13 April 2007, 16:02:30 UTC | config.txt: Document gitcvs.allbinary Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2007, 02:39:28 UTC |
1ad029b | Junio C Hamano | 13 April 2007, 10:23:20 UTC | Do not default to --no-index when given two directories. 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> | 14 April 2007, 02:34:35 UTC |
dc61b10 | Alex Riesen | 13 April 2007, 22:19:05 UTC | Use rev-list --reverse in git-rebase.sh ...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> | 14 April 2007, 02:06:40 UTC |
e4b0233 | Matthias Lederhofer | 12 April 2007, 18:52:03 UTC | handle_options in git wrapper miscounts the options it handled. 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> | 13 April 2007, 00:46:51 UTC |
9b11d24 | Junio C Hamano | 11 April 2007, 21:39:07 UTC | GIT 1.5.1.1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 April 2007, 00:19:36 UTC |
cb52d9a | Frank Lichtenheld | 11 April 2007, 20:38:19 UTC | cvsserver: Fix handling of diappeared files on update 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> | 11 April 2007, 23:55:33 UTC |
8eb2d0b | Junio C Hamano | 11 April 2007, 08:28:43 UTC | fsck: do not complain on detached HEAD. 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> | 11 April 2007, 21:05:36 UTC |
f981577 | Jim Meyering | 09 April 2007, 22:56:33 UTC | (encode_85, decode_85): Mark source buffer pointer as "const". Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2007, 07:51:20 UTC |
8bd26c4 | Julian Phillips | 09 April 2007, 20:57:36 UTC | Documentation: show-ref: document --exclude-existing 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> | 10 April 2007, 01:54:52 UTC |
fc1f458 | Tomash Brechko | 09 April 2007, 11:24:02 UTC | cvsexportcommit -p : fix the usage of git-apply -C. 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> | 10 April 2007, 01:52:41 UTC |
24c64d6 | Junio C Hamano | 09 April 2007, 05:14:16 UTC | Add Documentation/cmd-list.made to .gitignore Noticed by Randal L. Schwartz. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2007, 05:14:16 UTC |
c16d087 | Eric Wong | 08 April 2007, 07:59:22 UTC | git-svn: fix log command to avoid infinite loop on long commit messages 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> | 09 April 2007, 02:54:07 UTC |
13c823f | Eric Wong | 08 April 2007, 07:59:19 UTC | git-svn: dcommit/rebase confused by patches with git-svn-id: lines 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> | 09 April 2007, 02:53:54 UTC |
512b620 | Eric Wong | 03 April 2007, 08:57:08 UTC | git-svn: bail out on incorrect command-line options "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> | 09 April 2007, 02:53:42 UTC |
732bcf9 | Junio C Hamano | 08 April 2007, 06:33:14 UTC | Prepare for 1.5.1.1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 April 2007, 06:33:38 UTC |
e94a4f6 | Frank Lichtenheld | 07 April 2007, 14:58:08 UTC | cvsserver: small corrections to asciidoc documentation 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> | 08 April 2007, 06:01:54 UTC |
d790739 | Junio C Hamano | 06 April 2007, 05:17:20 UTC | Documentation: tighten dependency for git.{html,txt} 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> | 07 April 2007, 04:29:16 UTC |
63b4b7a | Arjen Laarhoven | 06 April 2007, 23:49:17 UTC | Makefile: iconv() on Darwin has the old interface 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> | 07 April 2007, 04:29:15 UTC |
d93f7c1 | Arjen Laarhoven | 06 April 2007, 23:49:03 UTC | t5300-pack-object.sh: portability issue using /usr/bin/stat 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> | 07 April 2007, 04:19:28 UTC |
4c84f0d | Arjen Laarhoven | 06 April 2007, 23:48:54 UTC | t3200-branch.sh: small language nit Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2007, 00:21:11 UTC |
ae25c67 | Arjen Laarhoven | 06 April 2007, 23:48:36 UTC | usermanual.txt: some capitalization nits Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2007, 00:20:34 UTC |
19eba15 | Lars Hjemli | 06 April 2007, 12:13:00 UTC | Make builtin-branch.c handle the git config file 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> | 06 April 2007, 23:54:39 UTC |
d26f9fe | Lars Hjemli | 06 April 2007, 08:33:06 UTC | rename_ref(): only print a warning when config-file update fails 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> | 06 April 2007, 23:54:37 UTC |
08b984f | Brian Gernhardt | 06 April 2007, 05:42:04 UTC | Distinguish branches by more than case in tests. 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> | 06 April 2007, 23:51:46 UTC |
a925b89 | YOSHIFUJI Hideaki / 吉藤英明 | 05 April 2007, 23:50:24 UTC | Avoid composing too long "References" header. 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> | 06 April 2007, 23:49:44 UTC |
0e070f9 | Frank Lichtenheld | 06 April 2007, 21:52:43 UTC | cvsimport: Improve formating consistency Use ' ' syntax for all commandline options mentioned in text. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 April 2007, 23:46:23 UTC |
7b14b3c | Frank Lichtenheld | 06 April 2007, 21:52:42 UTC | cvsimport: Reorder options in documentation for better understanding The current order the options are documented in makes no sense at all to me. Reorder them so that similar options are grouped together and also order them somehwhat by importance. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 April 2007, 23:46:16 UTC |
7bf7764 | Frank Lichtenheld | 06 April 2007, 21:52:41 UTC | cvsimport: Improve usage error reporting Actually tell the user what he did wrong in case of usage errors instead of only printing the general usage information. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 April 2007, 23:46:11 UTC |
407049c | Frank Lichtenheld | 06 April 2007, 21:52:40 UTC | cvsimport: Improve documentation of CVSROOT and CVS module determination Document the fact that git-cvsimport tries to find out CVSROOT from CVS/Root and $ENV{CVSROOT} and CVS_module from CVS/Repository. Also use ` ` syntax for all filenames for consistency. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 April 2007, 23:46:06 UTC |
edbe446 | Frank Lichtenheld | 06 April 2007, 21:52:39 UTC | cvsimport: sync usage lines with existing options Sync both the usage lines in the code and the asciidoc documentation with the real list of options. While all options seems to be documented in the asciidoc document, not all of them were listed in the usage line. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 April 2007, 23:45:58 UTC |
b5da246 | Dana How | 05 April 2007, 19:05:57 UTC | Fix lseek(2) calls with args 2 and 3 swapped Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2007, 22:39:12 UTC |
79ee194 | Shawn O. Pearce | 04 April 2007, 15:19:14 UTC | Honor -p<n> when applying git diffs If the user is trying to apply a Git generated diff file and they have specified a -p<n> option, where <n> is not 1, the user probably has a good reason for doing this. Such as they are me, trying to apply a patch generated in git.git for the git-gui subdirectory to the git-gui.git repository, where there is no git-gui subdirectory present. Users shouldn't supply -p2 unless they mean it. But if they are supplying it, they probably have thought about how to make this patch apply to their working directory, and want to risk whatever results may come from that. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2007, 22:06:58 UTC |
766b084 | Junio C Hamano | 05 April 2007, 22:03:48 UTC | Fix dependency of common-cmds.h Say $(wildcard ...) when we mean it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2007, 22:03:48 UTC |
01ebb9d | Geert Bosch | 05 April 2007, 14:20:55 UTC | Fix renaming branch without config file Make git_config_rename_section return success if no config file exists. Otherwise, renaming a branch would abort, leaving the repository in an inconsistent state. [jc: test] Signed-off-by: Geert Bosch <bosch@gnat.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2007, 21:53:22 UTC |
1e31fbe | Ville Skyttä | 05 April 2007, 18:09:31 UTC | DESTDIR support for git/contrib/emacs make install DESTDIR=... support for git/contrib/emacs Signed-off-by: Ville Skyttä <scop@xemacs.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2007, 21:14:55 UTC |
957d6ea | Jakub Narebski | 05 April 2007, 11:45:41 UTC | gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches git_patchset_body needs patch generated with --full-index option to detect split patches, meaning two patches which corresponds to single difftree (raw diff) entry. An example of such situation is changing type (mode) of a file, e.g. from plain file to symbolic link. Add, in git_blobdiff, --full-index option to patch generating git diff invocation, for the 'html' format output ("blobdiff" view). "blobdiff_plain" still uses shortened sha1 in the extended git diff header "index <hash>..<hash>[ <mode>]" line. Noticed-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2007, 21:14:55 UTC |
b24bace | Brian Gernhardt | 05 April 2007, 14:53:07 UTC | Document --left-right option to rev-list. Explanation is paraphrased from "577ed5c... rev-list --left-right" Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2007, 21:12:41 UTC |
265d528 | René Scharfe | 05 April 2007, 20:55:43 UTC | Revert "builtin-archive: use RUN_SETUP" Commit 64edf4b2 cleaned up the initialization of git-archive, at the cost of 'git-archive --list' now requiring a git repo. This patch reverts the cleanup and documents the requirement for this particular dirtyness in a test. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2007, 21:10:10 UTC |
5850cb6 | Gerrit Pape | 04 April 2007, 11:52:12 UTC | rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email. $ git grep post-receieve-email $ git grep post-receive-email templates/hooks--post-receive:#. /usr/share/doc/git-core/contrib/hooks/post-receive-email $ Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2007, 05:17:59 UTC |
2b93edb | Junio C Hamano | 04 April 2007, 21:12:03 UTC | rerere: make sorting really stable. The earlier code does not swap hunks when the beginning of the first side is identical to the whole of the second side. In such a case, the first one should sort later. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 April 2007, 21:12:03 UTC |
364b852 | Brian Gernhardt | 04 April 2007, 19:39:05 UTC | Fix t4200-rerere for white-space from "wc -l" On OS X, wc outputs 6 spaces before the number of lines, so the test expecting the string "10" failed. Do not quote $cmd to strip away the problematic whitespace as other tests do. Also fix the grammar of the test name while making changes to it. There's only one preimage, so it's "has", not "have". Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 April 2007, 20:11:33 UTC |
f6f2aa3 | Shawn O. Pearce | 04 April 2007, 16:08:46 UTC | git-gui: Brown paper bag fix division by 0 in blame If we generate a blame status string before we have obtained any annotation data at all from the input file, or if the input file is empty, our total_lines will be 0. This causes a division by 0 error when we blindly divide by the 0 to compute the total percentage of lines loaded. Instead we should report 0% done. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 04 April 2007, 16:08:46 UTC |
89815ca | Junio C Hamano | 04 April 2007, 05:47:01 UTC | GIT 1.5.1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 April 2007, 05:47:01 UTC |
045f575 | Junio C Hamano | 04 April 2007, 04:52:14 UTC | Merge 1.5.0.7 in Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 April 2007, 04:52:14 UTC |
9694ec4 | Junio C Hamano | 03 April 2007, 18:31:21 UTC | GIT 1.5.0.7 Not that this release really matters, as we will be doing 1.5.1 tomorrow. This commit is to tie the loose ends and merge all of "maint" branch into "master" in preparation. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 April 2007, 02:27:41 UTC |
0448352 | Jakub Narebski | 03 April 2007, 16:27:28 UTC | Documentation: A few minor fixes to Git User's Manual Mainly consistent usage of "git command" and not "git-command" syntax Signed-off-by: Jakub Narebski <jnareb@gmail.com> Acked-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 April 2007, 02:04:56 UTC |
bbf4b41 | Nicolas Pitre | 03 April 2007, 16:33:46 UTC | Plug memory leak in index-pack collision checking codepath. | 04 April 2007, 02:04:56 UTC |
eb33596 | Junio C Hamano | 03 April 2007, 23:28:46 UTC | rerere should not repeat the earlier hunks in later ones When a file has more then one conflicting hunks, it repeated the contents of previous hunks in output for later ones. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 April 2007, 02:01:36 UTC |
a8f4ef7 | Junio C Hamano | 02 April 2007, 20:29:38 UTC | Hopefully final update to the draft Release Notes, preparing for 1.5.1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 April 2007, 20:29:38 UTC |
3a950e9 | Eygene Ryabinkin | 27 March 2007, 10:36:59 UTC | [PATCH] Improve look-and-feel of the gitk tool. 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> | 01 April 2007, 02:47:06 UTC |
d59c4b6 | Eygene Ryabinkin | 27 March 2007, 10:36:12 UTC | [PATCH] Teach gitk to use the user-defined UI font everywhere. 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> | 01 April 2007, 02:47:06 UTC |
d8b6a1a | Frank Lichtenheld | 31 March 2007, 13:32:13 UTC | cvsserver: Don't lie about binary mode in asciidoc documentation The git-cvsserver documentation claims that the server will set -k modes if appropriate which is not really the case. On the other hand the available gitcvs.allbinary variable is not documented at all. Fix both these issues by rewording the related paragraph. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 March 2007, 23:00:27 UTC |
d6bad66 | Eric Wong | 31 March 2007, 21:00:18 UTC | git-svn: fail on rebase if we are unable to find a ref to rebase against If we're on an invalid HEAD, we should detect this and avoid attempting to continue. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 March 2007, 22:22:59 UTC |
a97e407 | Alex Riesen | 31 March 2007, 11:49:38 UTC | Keep rename/rename conflicts of intermediate merges while doing recursive merge This patch leaves the base name in the resulting intermediate tree, to propagate the conflict from intermediate merges up to the top-level merge. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 March 2007, 20:39:15 UTC |
4f01748 | Julian Phillips | 26 March 2007, 23:15:32 UTC | contrib/workdir: add a simple script to create a working directory Add a simple script to create a working directory that uses symlinks to point at an exisiting repository. This allows having different branches in different working directories but all from the same repository. Based on a description from Junio of how he creates multiple working directories[1]. With the following caveat: "This risks confusion for an uninitiated if you update a ref that is checked out in another working tree, but modulo that caveat it works reasonably well." [1] http://article.gmane.org/gmane.comp.version-control.git/41513/ Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 March 2007, 08:26:28 UTC |
4557e0d | Andy Parkins | 30 March 2007, 19:16:26 UTC | Reimplement emailing part of hooks--update in contrib/hooks/post-receive-email The update hook is no longer the correct place to generate emails; there is now the hooks/post-receive script which is run automatically after a ref has been updated. This patch is to make use of that new location, and to address some faults in the old update hook. The primary problem in the conversion was that in the update hook, the ref has not actually been changed, but is about to be. In the post-receive hook the ref has already been updated. That meant that where we previously had lines like: git rev-list --not --all would now give the wrong list because "--all" in the post-receive hook includes the ref that we are making the email for. This made it more difficult to show only the new revisions added by this update. The solution is not pretty; however it does work and doesn't need any changes to git-rev-list itself. It also fixes (more accurately: reduces the likelihood of) a nasty race when another update occurs while this script is running. The solution, in short, looks like this (see the source code for a longer explanation) git rev-parse --not --all | grep -v $(git rev-parse $refname) | git rev-list --pretty --stdin $oldrev..$newrev This uses git-rev-parse followed by grep to filter out the revision of the ref in question before it gets to rev-list and inhibits the output of itself. By using $(git rev-parse $revname) rather than $newrev as the filter, it also takes care of the situation where another update to the same ref has been made since $refname was $newrev. The second problem that is addressed is that of tags inhibiting the correct output of an update email. Consider this, with somebranch and sometag pointing at the same revision: git push origin somebranch git push origin sometag That would work fine; the push of the branch would generate an email containing all the new commits introduced by the update, then the push of the tag would generate the shortlog formatted tag email. Now consider: git push origin sometag git push origin somebranch When some branch comes to run its "--not --all" line, it will find sometag, and filter those commits from the email - leaving nothing. That meant that those commits would not show (in full) on any email. The fix is to not use "--all", and instead use "--branches" in the git-rev-parse command. Other changes * Lose the monstrous one-giant-script layout and put things in easy to digest functions. This makes it much easier to find the place you need to change if you wanted to customise the output. I've also tried to write more verbose comments for the same reason. The hook script is big, mainly because of all the different cases that it has to handle, so being easy to navigate is important. * All uses of "git-command" changed to "git command", to cope better if a user decided not to install all the hard links to git; * Cleaned up some of the English in the email * The fact that the receive hook makes the ref available also allows me to use Shawn Pearce's fantastic suggestion that an annotated tag can be parsed with git-for-each-ref. This removes the potentially non-portable use of "<<<" heredocs and the nasty messing around with "date" to convert numbers of seconds UTC to a real date * Deletions are now caught and notified (briefly) * To help with debugging, I've retained the command line mode from the update hook; but made it so that the output is not emailed, it's just printed to the screen. This could then be redirected if the user wanted * Removed the "Hello" from the beginning of the email - it's just noise, and no one seriously has their day made happier by "friendly" programs * The fact that it doesn't rely on repository state as an indicator any more means that it's far more stable in its output; hopefully the same arguments will always generate the same email - even if the repository changes in the future. This means you can easily recreate an email should you want to. * Included Jim Meyering's envelope sender option for the sendmail call * The hook is now so big that it was inappropriate to copy it to every repository by keeping it in the templates directory. Instead, I've put a comment saying to look in contrib/hooks, and given an example of calling the script from that template hook. The advantage of calling the script residing at some fixed location is that if a future package of git included a bug fixed version of the script, that would be picked up automatically, and the user would not have to notice and manually copy the new hook to every repository that uses it. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 March 2007, 08:21:18 UTC |
a6a15a9 | Eric Wong | 31 March 2007, 00:54:48 UTC | git-svn: avoid respewing similar error messages for missing paths We ignore errors if the path we're tracking did not exist for a particular revision range, but we still print out warnings telling the user about that. As pointed out by Seth Falcon, this amounts to a lot of warnings that could confuse and worry users. I'm not entirely comfortable completely silencing the warnings, but showing one warning per path that we track should be reasonable. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 March 2007, 08:11:13 UTC |
46efd2d | Theodore Ts'o | 30 March 2007, 23:07:05 UTC | Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS This fixes a problem reported by Randal Schwartz: >I finally tracked down all the (albeit inconsequential) errors I was getting >on both OpenBSD and OSX. It's the warn() function in usage.c. There's >warn(3) in BSD-style distros. It'd take a "great rename" to change it, but if >someone with better C skills than I have could do that, my linker and I would >appreciate it. It was annoying to me, too, when I was doing some mergetool testing on Mac OS X, so here's a fix. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Cc: "Randal L. Schwartz" <merlyn@stonehenge.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 March 2007, 08:11:11 UTC |
86747c1 | Don Zickus | 30 March 2007, 16:18:45 UTC | git-mailinfo fixes for patch munging Don't translate the patch to UTF-8, instead preserve the data as is. This also reverts a test case that was included in the original patch series. Also allow overwriting the authorship and title information we gather from RFC2822 mail headers with additional in-body headers, which was pointed out by Linus. Signed-off-by: Don Zickus <dzickus@redhat.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 March 2007, 07:59:19 UTC |
5ae917a | Jakub Narebski | 30 March 2007, 21:41:26 UTC | gitweb: Support comparing blobs (files) with different names Fix the bug that caused "blobdiff" view called with new style URI for a rename with change diff to be show as new (added) file diff. New style URI for "blobdiff" for rename means with $hash_base ('hb') and $hash_parent_base ('hpb') paramaters denoting tree-ish (usually commit) of a blobs being compared, together with both $file_name ('f') and $file_parent ('fp') parameters. It is done by adding $file_parent ('fp') to the path limiter, meaning that diff command becomes: git diff-tree [options] hpb hb -- fp f Other option would be finding hash of a blob using git_get_hash_by_path subroutine and comparing blobs using git-diff, or using extended SHA-1 syntax and compare blobs using git-diff: git diff [options] hpb:fp hp:f Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 March 2007, 07:47:48 UTC |
aa45321 | Junio C Hamano | 30 March 2007, 08:03:09 UTC | Do not bother documenting fetch--tool Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 March 2007, 08:03:09 UTC |
a208362 | Junio C Hamano | 30 March 2007, 07:56:36 UTC | Update draft release notes for 1.5.1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 March 2007, 07:56:36 UTC |