| 78d553b | Junio C Hamano | 10 October 2009, 07:05:19 UTC | GIT 1.6.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 October 2009, 07:05:19 UTC |
| 8588616 | Simon Arlott | 09 October 2009, 12:21:13 UTC | git-svn: hide find_parent_branch output in double quiet mode Hide find_parent_branch logging when -qq is specified. This eliminates more unnecessary output when run from cron, e.g.: Found possible branch point: http://undernet-ircu.svn.sourceforge.net/svnroot/undernet-ircu/ircu2/trunk => http://undernet-ircu.svn.sourceforge.net/svnroot/undernet-ircu/ircu2/branches/authz, 1919 Found branch parent: (authz) ea061d76aea985dc0208d36fa5e0b2249b698557 Following parent with do_switch Successfully followed parent Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 October 2009, 07:00:40 UTC |
| 33405be | Jonathan Nieder | 09 October 2009, 23:07:39 UTC | Documentation: clone: clarify discussion of initial branch When saying the initial branch is equal to the currently active remote branch, it is probably intended that the branch heads point to the same commit. Maybe it would be more useful to a new user to emphasize that the tree contents and history are the same. More important, probably, is that this new branch is set up so that "git pull" merges changes from the corresponding remote branch. The next paragraph addresses that directly. What the reader needs to know to begin with is that (1) the initial branch is your own; if you do not pull, it won't get updated, and that (2) the initial branch starts out at the same commit as the upstream. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 October 2009, 00:21:46 UTC |
| a17a960 | Junio C Hamano | 09 October 2009, 23:27:16 UTC | Merge branch 'rs/maint-archive-prefix' * rs/maint-archive-prefix: Git archive and trailing "/" in prefix | 09 October 2009, 23:27:16 UTC |
| e12bfd8 | Junio C Hamano | 09 October 2009, 23:26:49 UTC | Merge branch 'fc/mutt-alias' * fc/mutt-alias: send-email: fix mutt regex for grouped aliases | 09 October 2009, 23:26:49 UTC |
| c2c8656 | Junio C Hamano | 09 October 2009, 23:26:35 UTC | Merge branch 'ef/msvc-noreturn' * ef/msvc-noreturn: add NORETURN_PTR for function pointers increase portability of NORETURN declarations | 09 October 2009, 23:26:35 UTC |
| 302e99b | Junio C Hamano | 09 October 2009, 23:26:11 UTC | Merge branch 'jk/reflog-date' * jk/reflog-date: improve reflog date/number heuristic | 09 October 2009, 23:26:11 UTC |
| 170a481 | Junio C Hamano | 09 October 2009, 23:25:40 UTC | Merge branch 'ch/am-header' * ch/am-header: git-am: force egrep to use correct characters set git-am: fixed patch_format detection according to RFC2822 | 09 October 2009, 23:25:40 UTC |
| e1c1a06 | Björn Gustavsson | 09 October 2009, 20:49:06 UTC | bash: add support for 'git replace' Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 22:36:41 UTC |
| e0d7805 | Stephen Boyd | 09 October 2009, 06:21:44 UTC | completion: fix alias listings with newlines Aliases with newlines have been a problem since commit 56fc25f (Bash completion support for remotes in .git/config., 2006-11-05). The chance of the problem occurring has been slim at best, until commit 518ef8f (completion: Replace config --list with --get-regexp, 2009-09-11) removed the case statement introduced by commit 56fc25f. Before removing the case statement, most aliases with newlines would work unless they were specially crafted as follows [alias] foo = "log -1 --pretty='format:%s\nalias.error=broken'" After removing the case statement, a more benign alias like [alias] whowhat = "log -1 --pretty='format:%an <%ae>\n%s'" wont-complete = ... would cause the completion to break badly. For now, revert the removal of the case statement until someone comes up with a better way to get keys from git-config. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 22:00:40 UTC |
| 427e586 | Stephen Boyd | 09 October 2009, 06:21:43 UTC | completion: fix completion of git <TAB><TAB> After commit 511a3fc (wrap git's main usage string., 2009-09-12), the bash completion for git commands includes COMMAND and [ARGS] when it shouldn't. Fix this by grepping more strictly for a line with git commands. It's doubtful whether git will ever have commands starting with anything besides numbers and letters so this should be fine. At least by being stricter we'll know when we break the completion earlier. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 22:00:24 UTC |
| b6aaaa4 | Ingmar Vanhassel | 09 October 2009, 12:08:31 UTC | import-tars: Add missing closing bracket This fixes an obvious syntax error that snuck in commit 7e787953: syntax error at /home/ingmar/bin//git-import-tars line 143, near "/^$/ { " syntax error at /home/ingmar/bin//git-import-tars line 145, near "} else" syntax error at /home/ingmar/bin//git-import-tars line 152, near "}" Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org> Acked-and-Tested-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 21:58:13 UTC |
| 989c530 | Jonathan Nieder | 09 October 2009, 10:25:54 UTC | racy-git.txt: explain nsec problem in more detail Idealists may want USE_NSEC to be the default on Linux some day. Point to a patch to better explain the requirements on filesystem code for that to happen. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 21:56:32 UTC |
| 580cbb5 | Jonathan Nieder | 09 October 2009, 10:20:19 UTC | Documentation: clarify "working tree" definition It is not necessarily obvious to a git novice what it means for a filesystem tree to be equal to the HEAD. Spell it out. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 21:54:55 UTC |
| bb35f35 | Jonathan Nieder | 09 October 2009, 18:34:08 UTC | Documentation: clarify branch creation The documentation seems to assume that the starting point for a new branch is the tip of an existing (ordinary) branch, but that is not the most common case. More often, "git branch" is used to begin a branch from a remote-tracking branch, a tag, or an interesting commit (e.g. origin/pu^2). Clarify the language so it can apply to these cases. Thanks to Sean Estabrooks for the wording. Also add a pointer to the user's manual for the bewildered. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 21:54:15 UTC |
| 58d2c96 | Jonathan Nieder | 09 October 2009, 10:18:58 UTC | Documentation: branch: update --merged description Update the documentation for --merged and --no-merged to explain the meaning of the optional parameter introduced in commit 049716b (branch --merged/--no-merged: allow specifying arbitrary commit, 2008-07-08). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 21:50:21 UTC |
| 25dcc0d | Jonathan Nieder | 09 October 2009, 18:51:14 UTC | Documentation: clarify mergeoptions description Sounds better this way, at least to my ears. ("The syntax and supported options of git merge" is a plural noun. "the same" instead of "equal" sounds less technical and seems to convey the meaning better here.) Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 21:43:04 UTC |
| 0f8a02c | Jonathan Nieder | 09 October 2009, 10:16:15 UTC | Documentation: git fmt-merge-msg does not have to be a script The fmt-merge-message builtin can be invoked as "git fmt-merge-msg" rather than through the hard link in GIT_EXEC_PATH. Although this is unlikely to confuse most script writers, it should not hurt to make the documentation a little clearer anyway. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 21:40:25 UTC |
| 162213d | Jonathan Nieder | 09 October 2009, 10:15:29 UTC | Describe DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF options in Makefile There is excellent documentation for these options in Documentation/Makefile, but some users may never find it. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 21:38:14 UTC |
| a8c9bef | Jeff King | 05 October 2009, 19:35:16 UTC | pull: improve advice for unconfigured error case There are several reasons a git-pull invocation might not have anything marked for merge: 1. We're not on a branch, so there is no branch configuration. 2. We're on a branch, but there is no configuration for this branch. 3. We fetched from the configured remote, but the configured branch to merge didn't get fetched (either it doesn't exist, or wasn't part of the fetch refspec). 4. We fetched from the non-default remote, but didn't specify a branch to merge. We can't use the configured one because it applies to the default remote. 5. We fetched from a specified remote, and a refspec was given, but it ended up not fetching anything (this is actually hard to do; if the refspec points to a remote branch and it doesn't exist, then fetch will fail and we never make it to this code path. But if you provide a wildcard refspec like refs/bogus/*:refs/remotes/origin/* then you can see this failure). We have handled (1) and (2) for some time. Recently, commit a6dbf88 added code to handle case (3). This patch handles cases (4) and (5), which previously just fell under other cases, producing a confusing message. While we're at it, let's rewrap the text for case (3), which looks terribly ugly as it is. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 18:22:43 UTC |
| 63d129d | Junio C Hamano | 09 October 2009, 09:53:46 UTC | Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git-svn: Avoid spurious errors when rewriteRoot is used. | 09 October 2009, 09:53:46 UTC |
| c03c1f7 | Alexander Gavrilov | 09 October 2009, 07:01:04 UTC | git-svn: Avoid spurious errors when rewriteRoot is used. After doing a rebase, git-svn checks that the SVN URL is what it expects. However, it does not account for rewriteRoot, which is a legitimate way for the URL to change. This produces a lot of spurious errors. [ew: fixed line wrapping] Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 09 October 2009, 08:31:05 UTC |
| 8ba5eff | Junio C Hamano | 09 October 2009, 07:02:23 UTC | Merge branch 'ms/msvc' * ms/msvc: Fix the exit code of MSVC build scripts on cygwin Fix MSVC build on cygwin | 09 October 2009, 07:02:23 UTC |
| dc3c7a7 | Junio C Hamano | 09 October 2009, 06:59:15 UTC | Update draft release notes to 1.6.5 | 09 October 2009, 06:59:15 UTC |
| bf8fc21 | Junio C Hamano | 09 October 2009, 06:51:38 UTC | Merge branch 'maint' * maint: ls-files: die instead of fprintf/exit in -i error | 09 October 2009, 06:51:38 UTC |
| 651aef3 | Brandon Casey | 09 October 2009, 00:09:37 UTC | Makefile: add a note about the NO_MMAP setting on IRIX and IRIX64 When git is compiled with the MIPSpro 7.4.4m compiler, and NO_PTHREADS is set, and NO_MMAP is _not_ set, then git segfaults when trying to access the first entry in a reflog. If NO_PTHREADS is not set (which implies that the pthread library is linked in), or NO_MMAP _is_ set, then the segfault is not encountered. The conservative choice has been made to set NO_MMAP in the Makefile to avoid this flaw. The GNU C compiler does not produce this behavior. The segfault happens in refs.c:read_ref_at(). The mmap succeeds, and the loop is executed properly until rec is rewound into the first line (reflog entry) of the file. The segfault is caught by test 28 of t1400-update-ref.sh which fails when 'git rev-parse --verify "master@{May 25 2005}"' is called. So, add a comment in the Makefile to describe why NO_MMAP is set and as a hint to those who may be interested in unsetting it. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 05:55:25 UTC |
| ac78b00 | Ben Walton | 09 October 2009, 01:53:35 UTC | ls-files: die instead of fprintf/exit in -i error When ls-files was called with -i but no exclude pattern, it was calling fprintf(stderr, "...", NULL) and then exiting. On Solaris, passing NULL into fprintf was causing a segfault. On glibc systems, it was simply producing incorrect output (eg: "(null)": ...). The NULL pointer was a result of argv[0] not being preserved by the option parser. Instead of requesting that the option parser preserve argv[0], use die() with a constant string. A trigger for this bug was: `git ls-files -i` Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 05:54:34 UTC |
| 817350d | Brandon Casey | 08 October 2009, 23:07:41 UTC | Makefile: enable THREADED_DELTA_SEARCH on IRIX and IRIX64 Since commit dcda3614 removed the use of a variable length array from builtin-pack-objects.c, it is now safe to compile with the threaded delta search feature enabled. Formerly, the MIPSpro 7.4.4m compiler warned that variable length arrays should not be used with pthreads. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 05:54:09 UTC |
| b5d18b8 | Ramsay Jones | 08 October 2009, 15:33:31 UTC | Fix the exit code of MSVC build scripts on cygwin During an MSVC build on cygwin, the make program did not notice when the compiler or linker exited with an error. This was caused by the scripts exiting with the value returned by system() directly. On POSIX-like systems, such as cygwin, the return value of system() has the exit code of the executed command encoded in the first byte (ie the value is shifted up by 8 bits). This allows the bottom 7 bits to contain the signal number of a terminated process, while the eighth bit indicates whether a core-dump was produced. (A value of -1 indicates that the command failed to execute.) The make program, however, expects the exit code to be encoded in the bottom byte. Futhermore, it apparently masks off and ignores anything in the upper bytes. However, these scripts are (naturally) intended to be used on the windows platform, where we can not assume POSIX-like semantics from a perl implementation (eg ActiveState). So, in general, we can not assume that shifting the return value right by eight will get us the exit code. In order to improve portability, we assume that a zero return from system() indicates success, whereas anything else indicates failure. Since we don't need to know the exact exit code from the compiler or linker, we simply exit with 0 (success) or 1 (failure). Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 05:53:12 UTC |
| f2d50d9 | Ramsay Jones | 08 October 2009, 15:21:44 UTC | Fix MSVC build on cygwin In the MSVC section of the Makefile, BASIC_CFLAGS is set to a value which contains the string "-DWIN32-D_CONSOLE". This results in a (single) malformed -Define being passed to the compiler. At least on my cygwin installation, the msvc compiler seems to ignore this parameter, without issuing an error or warning, and results in the WIN32 and _CONSOLE macros being undefined. This breaks the build. In order to fix the build, we simply insert a space between the two -Define parameters, "-DWIN32" and "-D_CONSOLE", as originally intended. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 05:50:58 UTC |
| ebfbdb3 | René Scharfe | 08 October 2009, 16:46:54 UTC | Git archive and trailing "/" in prefix With --prefix=string that does not end with a slash, the top-level entries are written out with the specified prefix as expected, but no paths in the directories are added. Fix this by adding the prefix in write_archive_entry() instead of letting get_pathspec() and read_tree_recursive() pair; they are designed to only handle prefixes that are path components. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2009, 05:17:07 UTC |
| 8fd2cfa | Stephen Boyd | 07 October 2009, 08:48:51 UTC | completion: add dirstat and friends to diff options Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2009, 05:04:26 UTC |
| af4e9e8 | Stephen Boyd | 07 October 2009, 08:48:50 UTC | completion: update am, commit, and log git am learned --scissors, git commit learned --dry-run and git log learned --decorate=long|short recently. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2009, 05:04:25 UTC |
| 294ac78 | Brandon Casey | 07 October 2009, 01:02:22 UTC | Makefile: enable THREADED_DELTA_SEARCH on SunOS Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2009, 05:04:19 UTC |
| f539cfb | Junio C Hamano | 08 October 2009, 04:32:39 UTC | Merge branch 'maint' * maint: fast-import.c::validate_raw_date(): really validate the value | 08 October 2009, 04:32:39 UTC |
| 1cd749c | Junio C Hamano | 29 September 2009, 06:40:09 UTC | fast-import.c::validate_raw_date(): really validate the value When reading the "raw format" timestamp from the input stream, make sure that the timezone offset is a reasonable value by imitating 7122f82 (date.c: improve guess between timezone offset and year., 2006-06-08). We _might_ want to also check if the timestamp itself is reasonable, but that is left for a separate commit. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 October 2009, 20:05:03 UTC |
| f73b3af | Stefan Naewe | 07 October 2009, 12:14:24 UTC | README: git lives at http://git-scm.com these days Signed-off-by: Stefan Naewe <stefan.naewe+git@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 October 2009, 19:47:24 UTC |
| 4973aa2 | Junio C Hamano | 05 October 2009, 19:03:25 UTC | git-pull: dead code removal Back when a74b170 (git-pull: disallow implicit merging to detached HEAD, 2007-01-15) added this check, $? referred to the error status of reading HEAD as a symbolic-ref; but cd67e4d (Teach 'git pull' about --rebase, 2007-11-28) moved the command away from where the check is, and nobody noticed the breakage. Ever since, $? has always been 0 (tr at the end of the pipe to find merge_head never fails) and other case arms were never reached. These days, error_on_no_merge_candidates function is prepared to handle a detached HEAD case, which was what the code this patch removes used to handle. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 October 2009, 19:03:25 UTC |
| a7aebb9 | Junio C Hamano | 04 October 2009, 21:48:51 UTC | Merge branch 'maint' * maint: show-branch: fix segfault when showbranch.default exists | 04 October 2009, 21:48:51 UTC |
| 04ce83e | Junio C Hamano | 04 October 2009, 21:48:44 UTC | Merge branch 'jc/maint-1.6.4-show-branch-default' into maint * jc/maint-1.6.4-show-branch-default: show-branch: fix segfault when showbranch.default exists | 04 October 2009, 21:48:44 UTC |
| 3af1cae | Junio C Hamano | 09 June 2009, 06:26:44 UTC | show-branch: fix segfault when showbranch.default exists When running "git show-branch" without any parameter in a repository that has showbranch.default defined, we used to rely on the fact that our handcrafted option parsing loop never looked at av[0]. The array of default strings had the first real command line argument in default_arg[0], but the option parser wanted to look at the array starting at av[1], so we assigned the address of -1th element to av to force the loop start working from default_arg[0]. This no longer worked since 5734365 (show-branch: migrate to parse-options API, 2009-05-21), as parse_options_start() saved the incoming &av[0] in its ctx->out and later in parse_options_end() it did memmove to ctx->out (with ctx->cpidx == 0), overwriting the memory before default_arg[] array. I am not sure if this is a bug in parse_options(), or a bug in the caller, and tonight I do not have enough concentration to figure out which. In any case, this patch works the issue around. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 October 2009, 21:44:34 UTC |
| dbc1b1f | Johan Sageryd | 03 October 2009, 04:20:18 UTC | Fix '--relative-date' This fixes '--relative-date' so that it does not give '0 year, 12 months', for the interval 360 <= diff < 365. Signed-off-by: Johan Sageryd <j416@1616.se> Signed-off-by: Jeff King <peff@peff.net> | 03 October 2009, 10:04:38 UTC |
| b4ae5e2 | Mark Rada | 02 October 2009, 01:59:20 UTC | tests: make all test files executable For consistency with the rest of the test files. Signed-off-by: Mark Rada <marada@uwaterloo.ca> Signed-off-by: Jeff King <peff@peff.net> | 02 October 2009, 08:00:02 UTC |
| e3679ab | Adam Brewster | 02 October 2009, 00:52:11 UTC | filter-branch: add --prune-empty to option summary Signed-off-by: Adam Brewster <adambrewster@gmail.com> Signed-off-by: Jeff King <peff@peff.net> | 02 October 2009, 07:58:24 UTC |
| 5322ef2 | Ramsay Jones | 30 September 2009, 18:49:24 UTC | Fix some printf format warnings commit 51ea551 ("make sure byte swapping is optimal for git" 2009-08-18) introduced a "sane definition for ntohl()/htonl()" for use on some GNU C platforms. Unfortunately, for some of these platforms, this results in the introduction of a problem which is essentially the reverse of a problem that commit 6e1c234 ("Fix some warnings (on cygwin) to allow -Werror" 2008-07-3) was intended to fix. In particular, on platforms where the uint32_t type is defined to be unsigned long, the return type of the new ntohl()/htonl() is causing gcc to issue printf format warnings, such as: warning: long unsigned int format, unsigned int arg (arg 3) (nine such warnings, covering six different files). The earlier commit (6e1c234) needed to suppress these same warnings, except that the types were in the opposite direction; namely the format specifier ("%u") was 'unsigned int' and the argument type (ie the return type of ntohl()) was 'long unsigned int' (aka uint32_t). In order to suppress these warnings, the earlier commit used the (C99) PRIu32 format specifier, since the definition of this macro is suitable for use with the uint32_t type on that platform. This worked because the return type of the (original) platform ntohl()/htonl() functions was uint32_t. In order to suppress these warnings, we change the return type of the new byte swapping functions in the compat/bswap.h header file from 'unsigned int' to uint32_t. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Jeff King <peff@peff.net> | 02 October 2009, 07:32:51 UTC |
| ffc01f9 | Felipe Contreras | 30 September 2009, 14:49:36 UTC | send-email: fix mutt regex for grouped aliases For example: alias -group friends foo Foo Bar <foo@bar.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Acked(-and-tested)-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Jeff King <peff@peff.net> | 01 October 2009, 08:18:36 UTC |
| 18660bc | Erik Faye-Lund | 30 September 2009, 18:05:50 UTC | add NORETURN_PTR for function pointers Some compilers (including at least MSVC and ARM RVDS) supports NORETURN on function declarations, but not on function pointers. This patch makes it possible to define NORETURN for these compilers, by splitting the NORETURN macro into two - one for function declarations and one for function pointers. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Jeff King <peff@peff.net> | 01 October 2009, 08:12:21 UTC |
| a4f3131 | Erik Faye-Lund | 30 September 2009, 18:05:49 UTC | increase portability of NORETURN declarations Some compilers (including at least MSVC) support NORETURN on function declarations, but only before the function-name. This patch makes it possible to define NORETURN to something meaningful for those compilers. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Jeff King <peff@peff.net> | 01 October 2009, 08:12:21 UTC |
| f4ea32f | Jeff King | 24 September 2009, 08:28:15 UTC | improve reflog date/number heuristic When we show a reflog, we have two ways of naming the entry: by sequence number (e.g., HEAD@{0}) or by date (e.g., HEAD@{10 minutes ago}). There is no explicit option to set one or the other, but we guess based on whether or not the user has provided us with a date format, showing them the date version if they have done so, and the sequence number otherwise. This usually made sense if the use did something like "git log -g --date=relative". However, it didn't make much sense if the user set the date format using the log.date config variable; in that case, all of their reflogs would end up as dates. This patch records the source of the date format and only triggers the date-based view if --date= was given on the command line. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2009, 17:06:49 UTC |
| 1be224b | Junio C Hamano | 29 September 2009, 06:40:08 UTC | builtin-mailinfo.c: check error status from rewind and ftruncate A recent "cut at scissors" implementation rewinds and truncates the output file to store the message when it sees a scissors mark, but it did not check if these library calls succeeded. Signed-off-by: Junio C Hamano <gitster@pobox.com> [sp: Use fseek as rewind returns void] Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2009, 16:40:55 UTC |
| e0ab002 | Sebastian Schuberth | 28 September 2009, 11:34:21 UTC | Make just opening the generated MSVC solution file not modify it The format of the generated MSVC solution file is fixed in a way that just opening it in Visual Studio and immediately closing it again without performing any modifications does not trigger a prompt to save the solution file. This behavior was caused by several minor incompatibilities between the generated file and what Visual Studio 2008 expected, so Visual Studio transparently fixed the file format, marking it internally as modified. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Acked-by: Marius Storm-Olsen <mstormo@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2009, 15:54:37 UTC |
| 76031f1 | Sebastian Schuberth | 28 September 2009, 11:34:20 UTC | Make generated MSVC solution file open from Windows Explorer In order to be able to open the generated solution file by double- clicking it in Windows Explorer, all project files need to use DOS line-endings and a comment about the Visual Studio version needs to be added to the header of the solution file. This also fixes the icon that is displayed for the solution file in Windows Explorer. Note that opening the solution file from a running instance of Visual Studio already worked before. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Acked-by: Marius Storm-Olsen <mstormo@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2009, 15:54:37 UTC |
| 6f798b9 | Michael Wookey | 28 September 2009, 10:46:52 UTC | generators/vcproj.pm: remove UNICODE from build Defining UNICODE for MSVC IDE builds results in certain Win32 WIDE API's receiving ANSI strings. The result of which is an invalid use of the API and will end in either data corruption or an application crash. Prevent the use of WIDE API's when building with the MSVC IDE for compatibility with msysGit. Signed-off-by: Michael Wookey <michaelwookey@gmail.com> Acked-by: Marius Storm-Olsen <mstormo@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2009, 15:53:51 UTC |
| 0484682 | Jim Meyering | 29 September 2009, 05:42:25 UTC | typo fix: Directory `...' exist, ...: s/exist/exists/ Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2009, 15:30:13 UTC |
| c9486ae | Brandon Casey | 28 September 2009, 14:56:00 UTC | Documentation/git-gc.txt: default --aggressive window is 250, not 10 The default --aggressive window has been 250 since 1c192f34 "gc --aggressive: make it really aggressive", released in git v1.6.3. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2009, 15:27:45 UTC |
| 42a0ea9 | Frederik Schwarzer | 28 September 2009, 08:25:55 UTC | Correct minor typo in post-receive hook template Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2009, 15:26:43 UTC |
| 1b018fd | Miklos Vajna | 26 September 2009, 23:15:09 UTC | git branch -D: give a better error message when lockfile creation fails Previously the old error message just told the user that it was not possible to delete the ref from the packed-refs file. Give instructions on how to resolve the problem. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2009, 15:14:47 UTC |
| 6bbfd1f | Andreas Schwab | 25 September 2009, 18:44:44 UTC | parse-opt: ignore negation of OPT_NONEG for ambiguity checks parse_long_opt always matches both --opt and --no-opt for any option "opt", and only get_value checks whether --no-opt is actually valid. Since the options for git branch contains both "no-merged" and "merged" there are two matches for --no-merge, but no exact match. With this patch the negation of a NONEG option is rejected earlier, but it changes the error message from "option `no-opt' isn't available" to "unknown option `no-opt'". [jk: added test] Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 29 September 2009, 14:28:47 UTC |
| 5bdc32d | Nicolas Pitre | 26 September 2009, 03:54:42 UTC | make 'git clone' ask the remote only for objects it cares about Current behavior of 'git clone' when not using --mirror is to fetch everything from the peer, and then filter out unwanted refs just before writing them out to the cloned repository. This may become highly inefficient if the peer has an unusual ref namespace, or if it simply has "remotes" refs of its own, and those locally unwanted refs are connecting to a large set of objects which becomes unreferenced as soon as they are fetched. Let's filter out those unwanted refs from the peer _before_ asking it what refs we want to fetch instead, which is the most logical thing to do anyway. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 September 2009, 19:51:04 UTC |
| fa9d348 | Christian Himpel | 25 September 2009, 16:43:20 UTC | git-am: force egrep to use correct characters set According to egrep(1) the US-ASCII table is used when LC_ALL=C is set. We do not rely here on the LC_ALL value we get from the environment. Signed-off-by: Christian Himpel <chressie@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 September 2009, 22:35:05 UTC |
| 6900d75 | Christian Himpel | 25 September 2009, 15:14:31 UTC | git-am: fixed patch_format detection according to RFC2822 RFC2822 specifies in paragraph 3.6.8, that optional header fields are made up of any printable US-ASCII character except ' ' (space) and ':' (colon). The pattern for the egrep command is changed to match all of these characters. Signed-off-by: Christian Himpel <chressie@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 September 2009, 22:35:05 UTC |
| fb3650e | Yakov Lerner | 25 September 2009, 22:10:21 UTC | send-email: fix obscure error when encryption=tls and smtp cannot connect When encryption=tls and we cannot connect to the SMTP server, git-send-email was printing an obtuse perl error: Can't call method "command" on an undefined value at git-send-email line 927. This can occur when smtp host or port is misspelled, or the network is down, and encryption has been set to tls. Instead we expect some familiar "Cannot connect to SERVER:PORT" message. Fix it to print normal "smtp can't connect" diagnostics. Signed-off-by: Yakov Lerner <iler.ml@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 September 2009, 22:10:59 UTC |
| e648f8b | SZEDER Gábor | 24 September 2009, 12:23:15 UTC | bash: teach 'git checkout' options Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 September 2009, 21:48:35 UTC |
| efe47f8 | Brandon Casey | 24 September 2009, 18:21:03 UTC | perl/Makefile.PL: detect MakeMaker versions incompatible with DESTDIR It appears that ExtUtils::MakeMaker versions older than 6.11 do not implement the DESTDIR mechanism. So add a test to the generated perl.mak to detect when DESTDIR is used along with a too old ExtUtils::MakeMaker and abort with a message suggesting the use of NO_PERL_MAKEMAKER. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 September 2009, 21:00:04 UTC |
| a6dbf88 | Junio C Hamano | 13 September 2009, 20:38:48 UTC | pull: Clarify "helpful" message for another corner case When the remote branch we asked for merging did not exist in the set of fetched refs, we unconditionally hinted that it was because of lack of configuration. It is not necessarily so, and risks sending users for a wild goose chase. Make sure to check if that is indeed the case before telling a wild guess to the user. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 September 2009, 05:26:27 UTC |
| 3ddcb19 | Thiago Farina | 22 September 2009, 23:48:06 UTC | Update "describe" documentation to match reality A sample "git describe -h" did not match what the program actually says. Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 September 2009, 02:40:05 UTC |
| 9f040e9 | SZEDER Gábor | 15 September 2009, 10:21:45 UTC | bash: teach 'git reset --patch' Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2009, 19:47:27 UTC |
| 59d5eee | SZEDER Gábor | 15 September 2009, 10:21:44 UTC | bash: update 'git stash' completion This update adds 'git stash (apply|pop) --quiet' and all options known to 'git stash save', and handles the DWIMery from 3c2eb80f (stash: simplify defaulting to "save" and reject unknown options, 2009-08-18). Care is taken to avoid offering subcommands in the DWIM case. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2009, 19:47:26 UTC |
| 918c03c | SZEDER Gábor | 15 September 2009, 10:21:43 UTC | bash: rename __git_find_subcommand() to __git_find_on_cmdline() __git_find_subcommand() was originally meant to check whether subcommands are already present on the command line. But the code is general enough to be used for checking the presence of command line options as well, and the next commit will use it for that purpose, so let's give it a more general name. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2009, 19:47:26 UTC |
| 3696c4c | Junio C Hamano | 21 September 2009, 19:44:05 UTC | pay attention to DESTDIR when building with NO_PERL_MAKEMAKER Building with prefix=/some/where and temporarily installing it to elsewhere for tar'ing up is done with: make prefix=/some/where make prefix=/some/where DESTDIR=/else/where install Make handcrafted perl/perl.mak without NO_PERL_MAKEMAKER honour DESTDIR. Ancient ExtUtils::MakeMaker (pre 6.11?) has the same issue, but recent versions of Perl ships with at leat 6.17; this patch does not address that issue. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2009, 19:20:40 UTC |
| f1e3156 | Jim Meyering | 21 September 2009, 11:00:34 UTC | pre-commit.sample: add comment re tr portability; fix grammar Add a comment explaining why square brackets around a tr range are not only ok, but actually required in this case. Correct spelling and grammar. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2009, 19:15:42 UTC |
| 6426ee6 | Junio C Hamano | 22 September 2009, 01:14:12 UTC | Update Release Notes to 1.6.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2009, 01:14:12 UTC |
| a16753d | Johannes Sixt | 21 September 2009, 07:34:58 UTC | test-genrandom: ensure stdout is set to _O_BINARY on Windows Commit a6ca8c62 (Set _O_BINARY as default fmode for both MinGW and MSVC) removed the definition of _CRT_fmode from mingw.c. Before this commit, since test-genrandom is linked against libgit.a, the MinGW process initialization code would pick up that definition of _CRT_fmode, which was initialized to _O_BINARY. After this commit, however, text mode is used for std(in|out|err) because it is the default in absence of _CRT_fmode. In order to fix that, we must use git-compat-util.h, which overrides main() to set the mode to binary. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2009, 07:36:12 UTC |
| 0984e3a | Junio C Hamano | 21 September 2009, 06:47:52 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Work around leftover temporary save file gitk: Show diff of commits at end of compare-commits output gitk: Update Swedish translation (280t0f0u) | 21 September 2009, 06:47:52 UTC |
| 9bedb0e | Pat Thoyts | 15 September 2009, 09:26:30 UTC | gitk: Work around leftover temporary save file If a file exists and is hidden on Windows the Tcl open command will fail as the attributes provided in the CREAT call fail to match those of the existing file. Forcing removal of the temporary file before we begin solves any problems caused by previous failures to save the application settings. An alternative would be to remove the hidden attribute before calling 'open'. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 September 2009, 03:04:48 UTC |
| 6e4ece6 | Junio C Hamano | 20 September 2009, 19:13:47 UTC | Merge branch 'maint' * maint: push: Correctly initialize nonfastforward in transport_push. | 20 September 2009, 19:13:47 UTC |
| bb8cccd | Matthieu Moy | 20 September 2009, 17:33:20 UTC | push: Correctly initialize nonfastforward in transport_push. The variable is assigned unconditionally in print_push_status, but print_push_status is not reached by all codepaths. In particular, this fixes a bug where "git push ... nonexisting-branch" was complaining about non-fast forward. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2009, 19:11:29 UTC |
| f5c3178 | Marius Storm-Olsen | 16 September 2009, 08:20:31 UTC | Tag GIT_VERSION when Git is built with MSVC This may help us debug issues on Windows, as we now can build Git natively on Windows with both MinGW and MSVC. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 259d87c | Marius Storm-Olsen | 16 September 2009, 08:20:30 UTC | Add scripts to generate projects for other buildsystems (MSVC vcproj, QMake) These scripts generate projects for the MSVC IDE (.vcproj files) or QMake (.pro files), based on the output of a 'make -n MSVC=1 V=1' run. This enables us to simply do the necesarry changes in the Makefile, and you can update the other buildsystems by regenerating the files. Keeping the other buildsystems up-to-date with main development. The generator system is designed to easily drop in pm's for other buildsystems as well, if someone has an itch. However, the focus has been Windows development, so the 'engine' might need patches to support any platform. Also add some .gitignore entries for MSVC files. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| a2c6bf0 | Marius Storm-Olsen | 16 September 2009, 08:20:29 UTC | Add README for MSVC build Based on original README patch from Frank Li, describe the steps to build git with VS2008 (aka MSVC). Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 164a5e3 | Marius Storm-Olsen | 16 September 2009, 08:20:28 UTC | Add MSVC to Makefile Enable MSVC builds with GNU Make by simply calling make MSVC=1 (Debug build possible by adding DEBUG=1 as well) Two scripts, clink.pl and lib.pl, are used to convert certain GCC specific command line options into something MSVC understands. By building for MSVC with GNU Make, we can ensure that the MSVC port always follows the latest code, and does not lag behind due to unmaintained NMake Makefile or IDE projects. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 386ac45 | Marius Storm-Olsen | 16 September 2009, 08:20:27 UTC | Define strncasecmp and ftruncate for MSVC Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 435bdf8 | Marius Storm-Olsen | 16 September 2009, 08:20:26 UTC | Make usage of windows.h lean and mean Centralize the include of windows.h in git-compat-util.h, turn on WIN32_LEAN_AND_MEAN to avoid including plenty of other header files which is not needed in Git. Also ensure we load winsock2.h first, so we don't load the older winsock definitions at a later stage, since they contain duplicate definitions. When moving windows.h into git-compat-util.h, we need to protect the definition of struct pollfd in mingw.h, since this file is used by both MinGW and MSVC, and the latter defines this struct in winsock2.h. We need to keep the windows.h include in compat/win32.h, since its shared by both MinGW and Cygwin, and we're not touching Cygwin in this commit. The include in git-compat-util.h is protected with an ifdef WIN32, which is not the case when compiling for Cygwin. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| d75f8e6 | Frank Li | 16 September 2009, 08:20:25 UTC | Add platform files for porting to MSVC Add msvc.c and msvc.h to build git under MSVC. Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 16fe1e0 | Frank Li | 16 September 2009, 08:20:24 UTC | Add MinGW header files to build git with MSVC Added the header files dirent.h, unistd.h and utime.h Add alloca.h, which simply includes malloc.h, which defines alloca(). Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 55fcb06 | Marius Storm-Olsen | 16 September 2009, 08:20:23 UTC | Add empty header files for MSVC port MSVC lacks many of the header files included by git-compat-util.h; add blank header files for these instead of going ifdef crazy. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 71064e3 | Frank Li | 16 September 2009, 08:20:22 UTC | Test for WIN32 instead of __MINGW32_ The code which is conditional on MinGW32 is actually conditional on Windows. Use the WIN32 symbol, which is defined by the MINGW32 and MSVC environments, but not by Cygwin. Define SNPRINTF_SIZE_CORR=1 for MSVC too, as its vsnprintf function does not add NUL at the end of the buffer if the result fits the buffer size exactly. Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| d7fa500 | Frank Li | 16 September 2009, 08:20:21 UTC | Fix __stdcall placement and function prototype MSVC requires __stdcall to be between the functions return value and the function name, and that the function pointer type is in the form of return_type (WINAPI *function_name)(arguments...) Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| a6ca8c6 | Marius Storm-Olsen | 16 September 2009, 08:20:20 UTC | Set _O_BINARY as default fmode for both MinGW and MSVC MinGW set the _CRT_fmode to set both the default fmode and _O_BINARY on stdin/stdout/stderr. Rather use the main() define in mingw.h to set this for both MinGW and MSVC. This will ensure that a MinGW and MSVC build will handle input and output identically. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 3f83bf3 | Frank Li | 16 September 2009, 08:20:19 UTC | Change regerror() declaration from K&R style to ANSI C (C89) The MSVC headers typedef errcode as int, and thus confused the compiler in the K&R style definition. ANSI style deconfuses it. Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 627735f | Marius Storm-Olsen | 16 September 2009, 08:20:18 UTC | Add include guards to compat/win32.h Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:42 UTC |
| 0d30ad7 | Frank Li | 16 September 2009, 08:20:17 UTC | Avoid declaration after statement MSVC does not understand this C99 style. Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 03:00:41 UTC |
| 812bdbc | Thiago Farina | 18 September 2009, 19:11:52 UTC | pack-objects: remove SP at the end of usage string These spaces immediately before the end of lines are unnecessary. While at it, instead of using a single string literal with backslashes at end of each line, split the lines into individual string literals and tell the compiler to concatenate them. Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 02:48:48 UTC |
| 1f986c4 | Thiago Farina | 17 September 2009, 17:20:53 UTC | Update the usage bundle string. "git bundle -h" gives a single long line that is hard to read. Rewrite it into a multi-line format similar to the one used by other commands, e.g "git stash -h". Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 September 2009, 02:47:15 UTC |
| e481b1d | Clemens Buchacher | 17 September 2009, 07:21:02 UTC | cvs: initialize empty password If we do not read a password from the command line, and there are no passwords stored in .cvspass, we have to initialize the password with just "A". This fixes a regression introduced by 3fb9d582 (Do not scramble password read from .cvspass). Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 September 2009, 07:38:49 UTC |
| 8426f67 | Junio C Hamano | 16 September 2009, 22:04:21 UTC | Merge 1.6.4.4 in Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2009, 22:04:21 UTC |
| cb57220 | Junio C Hamano | 16 September 2009, 21:53:26 UTC | GIT 1.6.4.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2009, 21:53:26 UTC |
| af4f640 | Junio C Hamano | 16 September 2009, 21:45:18 UTC | Merge branch 'jc/maint-unpack-objects-strict' into maint * jc/maint-unpack-objects-strict: Fix "unpack-objects --strict" Conflicts: builtin-unpack-objects.c | 16 September 2009, 21:45:18 UTC |
| 6674d31 | Junio C Hamano | 16 September 2009, 21:27:08 UTC | Merge branch 'tf/diff-whitespace-incomplete-line' into maint * tf/diff-whitespace-incomplete-line: xutils: Fix xdl_recmatch() on incomplete lines xutils: Fix hashing an incomplete line with whitespaces at the end | 16 September 2009, 21:27:08 UTC |
| bd91890 | Junio C Hamano | 16 September 2009, 21:26:56 UTC | Merge branch 'jk/maint-1.6.3-checkout-unborn' into maint * jk/maint-1.6.3-checkout-unborn: checkout: do not imply "-f" on unborn branches | 16 September 2009, 21:26:56 UTC |
