| 8a90438 | Junio C Hamano | 22 October 2010, 00:14:32 UTC | Git 1.7.3.2 | 22 October 2010, 00:14:32 UTC |
| f7bff60 | Junio C Hamano | 21 October 2010, 23:26:42 UTC | Merge branch 'sn/doc-opt-notation' into maint * sn/doc-opt-notation: Fix {update,checkout}-index usage strings Put a space between `<' and argument in pack-objects usage string Remove stray quotes in --pretty and --format documentation Use parentheses and `...' where appropriate Fix odd markup in --diff-filter documentation Use angles for placeholders consistently | 21 October 2010, 23:26:42 UTC |
| 75a2f30 | Junio C Hamano | 21 October 2010, 23:26:38 UTC | Merge branch 'mg/fix-build-remote-helpers' into maint * mg/fix-build-remote-helpers: remote-helpers: build in platform independent directory | 21 October 2010, 23:26:38 UTC |
| 5b57413 | Antonio Ospite | 19 October 2010, 09:50:39 UTC | t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To' Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2010, 21:15:30 UTC |
| 9659df5 | Andreas Gruenbacher | 14 October 2010, 10:53:11 UTC | Clarify and extend the "git diff" format documentation Move the similarity and dissimilarity index header description closer to where those extended headers are described. Describe and/or clarify the format used for file modes, pathnames, and the index header. Document that all "old" files refer to the state before applying the *entire* output, and all "new" files refer to the state thereafter. Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2010, 21:15:30 UTC |
| 9fbd898 | Michael J Gruber | 18 October 2010, 11:33:32 UTC | git-show-ref.txt: clarify the pattern matching git-show-ref really does not do what one would expect under the name pattern matching, so describe it. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2010, 21:15:30 UTC |
| 9373bdc | Cliff Frey | 18 October 2010, 03:10:45 UTC | documentation: git-config minor cleanups Change push.default's description to add hyphens between values and descriptions to make the manpage easier to read. The html version is readable either way. Change status.showUntrackedFiles to make item descriptions be sentences and to use the same asciidoc format as push.default. The only visual change is the additions of "." Signed-off-by: Cliff Frey <cliff@meraki.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2010, 21:15:30 UTC |
| 27eea66 | Kevin Ballard | 16 October 2010, 11:09:20 UTC | Update test script annotate-tests.sh to handle missing/extra authors The current script used by annotate-tests.sh (used by t8001 and t8002) fails to emit a warning if any of the expected authors never show up in the output or if authors that show up in the output were never specified as expected. Update the script to fail in both of these scenarios. Helped-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2010, 21:15:30 UTC |
| 352953a | Luck, Tony | 01 October 2010, 18:57:52 UTC | Better advice on using topic branches for kernel development Linus Torvalds wrote: > The real problem is that maintainers often pick random - and not at > all stable - points for their development to begin with. They just > pick some random "this is where Linus -git tree is today", and do > their development on top of that. THAT is the problem - they are > unaware that there's some nasty bug in that version. Maybe they do this because they read it in the Git user-manual. Fix the manual to give them better guidance. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 October 2010, 02:10:56 UTC |
| 2475770 | Jonathan Nieder | 11 October 2010, 16:06:18 UTC | Documentation: update implicit "--no-index" behavior in "git diff" Originally "--no-index" mode triggered for untracked files within the tracked tree, but with v1.5.6-rc1~41 (Merge branch 'jc/diff-no-no-index, 2008-05-26) the command was fixed to only implicitly trigger when paths outside the tracked tree are mentioned. Reported-by: Yann Dirson <dirson@bertin.fr> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 October 2010, 02:10:56 UTC |
| b77134b | Jonathan Nieder | 11 October 2010, 16:05:32 UTC | Documentation: expand 'git diff' SEE ALSO section Point in many directions in the hope of helping the reader find what is needed more quickly. This commit also removes the summary attached to the SEE ALSO entry for difftool, to avoid making the SEE ALSO list too verbose. If the reader wants a summary of the commands referred to, she can always look to the top of the named pages or to the table of contents on the main git(1) page. Suggested-by: Goswin von Brederlow <goswin-v-b@web.de> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 October 2010, 02:10:56 UTC |
| ed84e6d | Jonathan Nieder | 11 October 2010, 16:04:08 UTC | Documentation: diff can compare blobs Meanwhile, there is no plumbing command to compare two blobs. Strange. Reported-by: Yann Dirson <dirson@bertin.fr> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 October 2010, 02:10:56 UTC |
| 9d83e38 | Jonathan Nieder | 11 October 2010, 16:03:32 UTC | Documentation: gitrevisions is in section 7 Fix references to gitrevisions(1) in the manual pages and HTML documentation. In practice, this will not matter much unless someone tries to use a hard copy of the git reference manual. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 October 2010, 02:10:55 UTC |
| 69ae92b | Junio C Hamano | 13 October 2010, 18:36:36 UTC | shell portability: no "export VAR=VAL" It is more portable to say "VAR=VAL && export VAR" instead. Noticed by Ævar. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 October 2010, 18:36:36 UTC |
| bc97994 | Junio C Hamano | 13 October 2010, 18:15:14 UTC | CodingGuidelines: reword parameter expansion section Group entries related to parameter substitutions together and avoid using the word "regexp" to refer to the ${parameter/pattern/string} substitution (banned), as the pattern there is a shell glob and not a regular expression. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 October 2010, 18:15:14 UTC |
| 537497b | Bert Wesarg | 08 October 2010, 06:50:20 UTC | Documentation: update-index: -z applies also to --index-info Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 October 2010, 18:13:09 UTC |
| 01f6fd4 | Jonathan Nieder | 08 October 2010, 16:46:59 UTC | Documentation: No argument of ALLOC_GROW should have side-effects The explanatory comment before the definition of ALLOC_GROW carefully lists arguments that will be used more than once and thus cannot have side-effects; a lazy reader might conclude that the arguments not listed are used only once and side effects safe. Correct it to list all three arguments, avoiding this confusion. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2010, 20:17:10 UTC |
| d0bb136 | Štěpán Němec | 08 October 2010, 17:31:20 UTC | Fix {update,checkout}-index usage strings The `<file>' argument is optional in both cases (the man pages are already correct). Signed-off-by: Štěpán Němec <stepnem@gmail.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2010, 19:31:08 UTC |
| 8842206 | Štěpán Němec | 08 October 2010, 17:31:19 UTC | Put a space between `<' and argument in pack-objects usage string This makes it cosistent with other places (including the git-pack-objects(1) manpage itself) and avoids possible confusion (I, for one, mistook `<object-list' for a `<object-list>' typo at first when preparing this series). Signed-off-by: Štěpán Němec <stepnem@gmail.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2010, 19:31:08 UTC |
| efc39d6 | Štěpán Němec | 08 October 2010, 17:31:18 UTC | Remove stray quotes in --pretty and --format documentation Quotes (for emphasis) are used in option explanations, not the headings. Signed-off-by: Štěpán Němec <stepnem@gmail.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2010, 19:31:07 UTC |
| 0adda93 | Štěpán Němec | 08 October 2010, 17:31:17 UTC | Use parentheses and `...' where appropriate Remove some stray usage of other bracket types and asterisks for the same purpose. Signed-off-by: Štěpán Němec <stepnem@gmail.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2010, 19:31:07 UTC |
| 01398df | Štěpán Němec | 08 October 2010, 18:40:32 UTC | Fix odd markup in --diff-filter documentation Instead of using the regex-like bracket expression, use grouping to make it more consistent with other similar places. The brackets now have the same meaning as in other documentation (i.e., the argument is optional). Signed-off-by: Štěpán Němec <stepnem@gmail.com> Mentored-and-Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2010, 19:30:52 UTC |
| 62b4698 | Štěpán Němec | 08 October 2010, 17:31:15 UTC | Use angles for placeholders consistently Signed-off-by: Štěpán Němec <stepnem@gmail.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2010, 19:29:52 UTC |
| 7c6eafa | Yann Dirson | 01 October 2010, 21:19:19 UTC | t/t3415: use && where applicable. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 October 2010, 20:46:02 UTC |
| 95b7a41 | Ramkumar Ramachandra | 02 October 2010, 04:37:43 UTC | SubmittingPatches: Document some extra tags used in commit messages Document the meanings of the tags "Reported-by:", "Acked-by:", "Reviewed-by:" and "Tested-by:" clearly. Also mention that the user is free to use any custom tags. Helped-by: Jonathan Nieder <jrnieder@gmail.com> Liked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 October 2010, 20:45:42 UTC |
| 6db2103 | Uwe Kleine-König | 04 October 2010, 17:28:27 UTC | Documentation/git-clone: describe --mirror more verbosely Some people in #linux-rt noticed that describing what "--mirror" option does with "it mirrors" is way insufficient. Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Darren 'Some People' Hart <darren@dvhart.com> Cc: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 October 2010, 18:24:17 UTC |
| c03c831 | Erik Faye-Lund | 05 October 2010, 07:24:10 UTC | do not depend on signed integer overflow Signed integer overflow is not defined in C, so do not depend on it. This fixes a problem with GCC 4.4.0 and -O3 where the optimizer would consider "consumed_bytes > consumed_bytes + bytes" as a constant expression, and never execute the die()-call. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Acked-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 October 2010, 18:10:07 UTC |
| b90d9b8 | René Scharfe | 04 October 2010, 10:53:11 UTC | work around buggy S_ISxxx(m) implementations There are buggy implementations of S_ISxxx(m) macros on some platforms (e.g. NetBSD). The issue is that NetBSD doesn't take care to wrap its macro arguments in parentheses, so on Linux and sane systems we have S_ISREG(m) defined as something like: (((m) & S_IFMT) == S_IFREG) But on NetBSD: ((m & _S_IFMT) == _S_IFREG) Since a caller in builtin/diff.c called our macro as `S_IFREG | 0644' this bug introduced a logic error on NetBSD, since the precedence of bit-wise & is higher than | in C. [jc: took change description from Ævar Arnfjörð Bjarmason's patch] Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 October 2010, 17:51:14 UTC |
| 349362c | Jonathan Nieder | 04 October 2010, 09:09:17 UTC | xdiff: cast arguments for ctype functions to unsigned char The ctype functions isspace(), isalnum(), et al take an integer argument representing an unsigned character, or -1 for EOF. On platforms with a signed char, it is unsafe to pass a char to them without casting it to unsigned char first. Most of git is already shielded against this by the ctype implementation in git-compat-util.h, but xdiff, which uses libc ctype.h, ought to be fixed. Noticed-by: der Mouse <mouse@Rodents-Montreal.ORG> Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 October 2010, 17:46:45 UTC |
| 9173912 | Jonathan Nieder | 04 October 2010, 04:34:27 UTC | init: plug tiny one-time memory leak The buffer used to construct paths like ".git/objects/info" and ".git/objects/pack" is allocated on the heap and never freed. So free it. While at it, factor out the relevant code into its own function and rename the sha1_dir variable to object_directory (to match the change in everyday usage after the renaming of SHA1_FILE_DIRECTORY in v0.99~603^2~7, 2005). Noticed by valgrind while setting up tests (in test-lib). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 October 2010, 17:46:05 UTC |
| 95ae69b | Brandon Casey | 04 October 2010, 22:51:47 UTC | diffcore-pickaxe.c: remove unnecessary curly braces Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 October 2010, 15:41:58 UTC |
| d4da4bc | Junio C Hamano | 05 October 2010, 15:36:10 UTC | Merge early part of git-svn into maint * commit 'git-svn/master~1': git-svn: fix processing of decorated commit hashes git-svn: check_cherry_pick should exclude commits already in our history Documentation/git-svn: discourage "noMetadata" | 05 October 2010, 15:36:15 UTC |
| 2d2ef5e | Elijah Newren | 03 October 2010, 20:00:00 UTC | t3020 (ls-files-error-unmatch): remove stray '1' from end of file Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 October 2010, 00:55:22 UTC |
| 06f3549 | Jonathan Nieder | 02 October 2010, 08:36:52 UTC | setup: make sure git dir path is in a permanent buffer If setup_git_env() is run before the usual repository discovery sequence and .git is a file with the text gitdir: <path> (with <path> any string) then the in-core git_dir variable is set to the result of converting <path> to an absolute path using make_absolute_path(). Unfortunately make_absolute_path() returns its result in a static buffer that is overwritten by later calls. Such a call could cause later accesses to git_dir (from git_pathdup(), for example) to read the wrong path, leaving git very confused. It is not obvious whether any existing code in git will trigger the problem, but in any case, it is worth a few dozen bytes to copy the return value from make_absolute_path() for some added peace of mind. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 October 2010, 23:50:54 UTC |
| 7f7868e | Jonathan Nieder | 02 October 2010, 08:35:29 UTC | environment.c: remove unused variable After v1.6.0-rc0~230^2^ (environment.c: remove unused function, 2008-06-19), git_refs_dir is not used any more. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 October 2010, 23:50:54 UTC |
| 8695353 | Johannes Schindelin | 29 September 2010, 22:22:33 UTC | Fix typo in pack-objects' usage Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 September 2010, 19:22:02 UTC |
| 8713feb | Johannes Schindelin | 29 September 2010, 22:22:32 UTC | Make sure that git_getpass() never returns NULL The result of git_getpass() is used without checking for NULL, so let's just die() instead of returning NULL. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 September 2010, 19:22:02 UTC |
| dbda967 | Jonathan Nieder | 07 September 2010, 01:50:17 UTC | t0004 (unwritable files): simplify error handling Instead of ... normal test script ... status=$? ... cleanup ... (exit $status) set up cleanup commands with test_when_finished. This makes the test script a little shorter, and more importantly, it ensures errors during cleanup are reported. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 September 2010, 17:39:06 UTC |
| e14712c | Michael J Gruber | 30 September 2010, 15:31:43 UTC | rev-list-options: clarify --parents and --children Make it clearer that --parents resp. --children list the parent resp. child commits next to each commit, so that I understand next time. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 September 2010, 16:38:47 UTC |
| 2f76919 | Junio C Hamano | 28 September 2010, 21:08:38 UTC | MinGW: avoid collisions between "tags" and "TAGS" On case insensitive filesystems, "tags" and "TAGS" target will try to overwrite the same file. Allow MinGW to use "ETAGS" instead. These two targets do produce real files; do not put them on .PHONY target list. Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 September 2010, 20:27:50 UTC |
| 9ec26eb | Matthieu Moy | 29 September 2010, 07:26:23 UTC | diff: trivial fix for --output file error message The option argument is either after the equal sign in --output=... or in the next command-line argument. optarg is the reliable way to access it. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 September 2010, 20:25:17 UTC |
| e1ba4c3 | Michael J Gruber | 28 September 2010, 11:16:07 UTC | user-manual: fix anchor name Finding-comments-With-given-Content Change the anchor name to Finding-commits-With-given-Content so that it corresponds to the actual content there. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 September 2010, 20:21:49 UTC |
| fa8347b | Kirill Smelkov | 28 September 2010, 08:20:24 UTC | user-manual: be consistent in illustrations to 'git rebase' Since we use a-b-c for mywork commits in one place, I think it would be logical to also use a-b-c too in other illustration on this topic. Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 September 2010, 20:21:28 UTC |
| 2bea593 | Jon Seymour | 27 September 2010, 15:32:45 UTC | stash: simplify parsing fixes This patch simplifies Brian's fix for the recent regression by: * eliminating the extra loop * eliminating use of git rev-parse for parsing flags * making use of the for opt idiom for the retained loop * eliminating the redundant -- case The patch has been tested with the tests in current maint. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 September 2010, 20:21:24 UTC |
| 92c1e71 | Junio C Hamano | 29 September 2010, 16:42:53 UTC | Git 1.7.3.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 September 2010, 17:39:53 UTC |
| 57693d0 | Jon Seymour | 28 September 2010, 13:19:52 UTC | stash: fix git stash branch regression when branch creation fails "git stash branch <branch> <stash>" started discarding the stash when the branch creation fails. It should have kept the stash intact when aborting. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 September 2010, 17:07:09 UTC |
| 835d6a1 | Tomas Carnecky | 28 September 2010, 13:19:51 UTC | stash drops the stash even if creating the branch fails because it already exists This bug was disovered by someone on IRC when he tried to $ git stash branch <branch> <stash> while <branch> already existed. In that case the stash is dropped even though it isn't applied on any branch, so the stash is effectively lost. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 September 2010, 16:59:42 UTC |
| 442cb08 | Linus Torvalds | 27 September 2010, 19:14:57 UTC | Fix missing 'does' in man-page for 'git checkout' Reported-by: Rainer Standke <rainer.standke@krankikom.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 22:08:06 UTC |
| 9d14017 | Pat Notz | 16 September 2010, 20:53:22 UTC | dir.c: squelch false uninitialized memory warning GCC 4.4.4 on MacOS incorrectly warns about potential use of uninitialized memory. Signed-off-by: Pat Notz <patnotz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 18:43:12 UTC |
| 61ef5e9 | Brandon Casey | 27 September 2010, 03:18:01 UTC | git-send-email.perl: ensure $domain is defined before using it valid_fqdn() may attempt to operate on an undefined value if Net::Domain::domainname fails to determine the domain name. This causes perl to emit unpleasant warnings. So, add a check for whether $domain has been defined before using it. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 18:41:45 UTC |
| b822423 | Brandon Casey | 27 September 2010, 02:49:13 UTC | wt-status.c: don't leak directory entries when processing untracked,ignored When iterating through the list of directory entries, searching for untracked entries, only the entries added to the string_list were free'd. The rest (tracked or not matching the pathspec) were leaked. Ditto for the "ignored" loop. Rearrange the loops so that all entries are free'd. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 18:41:25 UTC |
| d212cef | Christian Couder | 26 September 2010, 05:20:18 UTC | t6050 (replace): fix bogus "fetch branch with replacement" test The test was missing some "&&" at the end of some lines and it was wrong because, as the replacement refs were not fetched, the commits from the parallel branch should not show up. This was found by Elijah Newren. This is fixed by checking that after the branch from HASH6 is fetched, the commits from the parallel branch don't show up, and then by fetching the replacement refs and checking that they do show up afterwards. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 18:40:45 UTC |
| 831a8b8 | Wesley J. Landaker | 13 September 2010, 14:59:54 UTC | Documentation: Refer to git-commit-tree in git-filter-branch help Currently, the help for git filter-branch refers users of --env-filter to git-commit for information about environment variables affecting commits. However, this information is not contained in the git-commit help, but is very explicitly detailed in git-commit-tree. Signed-off-by: Wesley J. Landaker <wjl@icecavern.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 18:39:44 UTC |
| 95ad6d2 | Matthieu Moy | 24 September 2010, 16:43:59 UTC | update comment and documentation for :/foo syntax The documentation in revisions.txt did not match the implementation, and the comment in sha1_name.c was incomplete. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 17:54:52 UTC |
| 3695dc0 | Daniel Knittl-Frank | 24 September 2010, 16:21:59 UTC | Improvements to `git checkout -h` be a little more verbose about what each option does Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 17:54:17 UTC |
| 861514d | Michael J Gruber | 23 September 2010, 12:33:51 UTC | contrib/completion: --no-index option to git diff Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 17:52:49 UTC |
| afa0876 | Jeff King | 22 September 2010, 00:35:59 UTC | prefer test -h over test -L in shell scripts Even though "-L" is POSIX, the former is more portable, and we tend to prefer it already. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 17:48:23 UTC |
| 055467d | Junio C Hamano | 22 September 2010, 19:15:37 UTC | CodingGuidelines: spell Arithmetic Expansion with $(($var)) POSIX wants shells to support both "N" and "$N" and requires them to yield the same answer to $((N)) and $(($N)), but we should aim for portability in a case like this, especially when the price we pay to do so is so small, i.e. a few extra dollars. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 17:45:29 UTC |
| 4098f67 | Ramsay Jones | 21 September 2010, 17:45:09 UTC | t1503: Fix arithmetic expansion syntax error when using dash On systems which have dash as /bin/sh, such as Ubuntu, the final test (master@{n} for various n) fails with a syntax error while processing an arithmetic expansion. The syntax error is caused by using a bare name ('N') as a variable reference in the expression. In order to avoid the syntax error, we spell the variable reference as '$N' rather than simply 'N'. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 17:43:49 UTC |
| 7a0d8bc | Michael J Gruber | 17 September 2010, 21:00:53 UTC | remote-helpers: build in platform independent directory The build directory which is used by distutils depends on the platform (e.g. build/lib on Fedora 13, build/lib.linux-i686-2.6 on Ubuntu 9.04). But test-lib.sh expects to find the build in build/lib which can cause t5800-remote-helpers.sh to fail early. Override distutils' choice so that the build is always in build/lib. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 17:42:50 UTC |
| 4af3fab | Pat Notz | 16 September 2010, 20:53:23 UTC | strbuf.h: fix comment typo Signed-off-by: Pat Notz <patnotz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 17:42:11 UTC |
| 9027fa9 | Brian Gernhardt | 24 September 2010, 22:15:34 UTC | git-stash: fix flag parsing Currently git-stash uses `git rev-parse --no-revs -- "$@"` to set its FLAGS variable. This is the same as `FLAGS="-- $@"`. It should use `git rev-parse --no-revs --flags "$@"`, but that eats any "-q" or "--quiet" argument. So move the check for quiet before rev-parse. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 04:27:37 UTC |
| 3fcb887 | Brandon Casey | 24 September 2010, 20:40:38 UTC | t/t3903-stash: improve testing of git-stash show Recently, the 'stash show' functionality was broken for the case when a stash-like argument was supplied. Since, commit 9bf09e, 'stash show' when supplied a stash-like argument prints nothing and still exists with a zero status. Unfortunately, the flaw slipped through the test suite cracks since the output of 'stash show' was not verified to be correct. Improve and expand on the existing tests so that this flaws is detected. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 September 2010, 04:25:40 UTC |
| 8565a56 | Mathias Lafeldt | 23 September 2010, 22:05:03 UTC | git-svn: fix processing of decorated commit hashes The function working_head_info() fails to parse commit hashes if they are decorated (i.e. log.decorate is true), causing dcommit, rebase, and other vital git-svn commands to malfunction. This patch disables decorated log output with --no-decorate. [ew: wrapped long line] Signed-off-by: Mathias Lafeldt <misfire@debugon.org> Acked-by: Eric Wong <normalperson@yhbt.net> | 24 September 2010, 16:24:20 UTC |
| a3c7505 | Steven Walter | 02 September 2010, 22:32:06 UTC | git-svn: check_cherry_pick should exclude commits already in our history The merge-base between @$parents and $merge_tip may have been reached through a merge commit. This means that some commits that are ancestors of @$parents will not be ancestors of $merge_base. The mergeinfo property will not list commits that are ancestors of @$parents, so we need to explicitly exclude them. [ew: squashed and cleaned up test case from Steven] Signed-off-by: Steven Walter <stevenrwalter@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 24 September 2010, 08:23:53 UTC |
| c9be27f | Eric Wong | 21 August 2010, 18:52:14 UTC | Documentation/git-svn: discourage "noMetadata" "noMetadata" is a sometimes harmful option, so better document its behavior and limitations. Suggested-by: Vadim Zeitlin Signed-off-by: Eric Wong <normalperson@yhbt.net> | 24 September 2010, 08:21:54 UTC |
| 87b5054 | Junio C Hamano | 18 September 2010, 21:55:08 UTC | Git 1.7.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 September 2010, 21:55:08 UTC |
| 1125297 | Junio C Hamano | 18 September 2010, 21:46:44 UTC | Merge branch 'js/ls-files-x-doc' * js/ls-files-x-doc: ls-files documentation: reword for consistency git-ls-files.txt: clarify -x/--exclude option Conflicts: Documentation/git-ls-files.txt | 18 September 2010, 21:46:44 UTC |
| 14d8729 | Chris Johnsen | 17 September 2010, 21:42:51 UTC | git-rebase--interactive.sh: replace cut with ${v%% *} Some versions of cut do not cope well with lines that do not end in an LF. In this case, we can completely avoid cut by using the ${var%% *} parameter expansion (suggested by Brandon Casey). I found this problem when t3404's "avoid unnecessary reset" failed due to the "rebase -i" not avoiding updating the tested timestamp. On a Mac OS X 10.4.11 system: % printf '%s' 'foo bar' | /usr/bin/cut -d ' ' -f 1 cut: stdin: Illegal byte sequence Signed-off-by: Chris Johnsen <chris_johnsen@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 September 2010, 21:58:08 UTC |
| 84d6940 | Brandon Casey | 15 September 2010, 20:58:22 UTC | t/t7300: workaround ancient touch by rearranging arguments The ancient touch on Solaris 7 thinks that a decimal number supplied as the first argument specifies a date_time to give to the files specified by the remaining arguments. In this case, it fails to parse '1' as a proper date_time and exits with a failure status. Workaround this flaw by rearranging the arguments supplied to touch so that a non-digit appears first and touch will not be confused. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 September 2010, 21:42:13 UTC |
| 02567e8 | Junio C Hamano | 16 September 2010, 14:43:41 UTC | Merge branch 'bg/fix-t7003' * bg/fix-t7003: t7003: Use test_commit instead of custom function | 16 September 2010, 14:43:41 UTC |
| 4c60852 | Junio C Hamano | 16 September 2010, 00:34:20 UTC | ls-files documentation: reword for consistency Similar to descriptions of other options, state what -x does in imperative mood. Start sentences for -X and --exclude-per-directory options in capital letters. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2010, 00:38:50 UTC |
| 75609a0 | Jay Soffian | 15 September 2010, 23:56:48 UTC | git-ls-files.txt: clarify -x/--exclude option Since b5227d8, -x/--exclude does not apply to cached files. This is easy to miss unless you read the discussion in the EXCLUDE PATTERNS section. Clarify that the option applies to untracked files and direct the reader to EXCLUDE PATTERNS. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2010, 00:30:36 UTC |
| 7e100ef | Junio C Hamano | 15 September 2010, 19:47:37 UTC | Git 1.7.3 rc2 | 15 September 2010, 19:47:37 UTC |
| 2e1e961 | Junio C Hamano | 15 September 2010, 19:41:13 UTC | Merge branch 'dr/maint-ls-tree-prefix-recursion-fix' * dr/maint-ls-tree-prefix-recursion-fix: ls-tree $di $dir: do not mistakenly recurse into directories | 15 September 2010, 19:41:13 UTC |
| 0c61c6d | Junio C Hamano | 15 September 2010, 19:40:33 UTC | Merge branch 'os/fix-rebase-diff-no-prefix' * os/fix-rebase-diff-no-prefix: Add --src/dst-prefix to git-formt-patch in git-rebase.sh | 15 September 2010, 19:40:33 UTC |
| e3f213c | Junio C Hamano | 15 September 2010, 19:40:12 UTC | Merge branch 'jl/fix-test' * jl/fix-test: t1020: Get rid of 'cd "$HERE"' at the start of each test t2016 (checkout -p): add missing && t1302 (core.repositoryversion): style tweaks t2105 (gitfile): add missing && t1450 (fsck): remove dangling objects tests: subshell indentation stylefix Several tests: cd inside subshell instead of around | 15 September 2010, 19:40:12 UTC |
| 43d268e | Junio C Hamano | 15 September 2010, 19:39:32 UTC | Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor' * ch/filter-branch-deprecate-remap-to-ancestor: filter-branch: retire --remap-to-ancestor | 15 September 2010, 19:39:32 UTC |
| d42cb58 | Junio C Hamano | 15 September 2010, 19:39:22 UTC | Merge branch 'ch/maint-cannot-create-bundle-error' * ch/maint-cannot-create-bundle-error: bundle: detect if bundle file cannot be created | 15 September 2010, 19:39:22 UTC |
| 9f0ccb5 | Junio C Hamano | 15 September 2010, 19:39:12 UTC | Merge branch 'ks/recursive-rename-add-identical' * ks/recursive-rename-add-identical: RE: [PATCH] Avoid rename/add conflict when contents are identical | 15 September 2010, 19:39:12 UTC |
| 12644fa | Junio C Hamano | 15 September 2010, 19:34:37 UTC | Merge git://repo.or.cz/git-gui * 'master' of git://repo.or.cz/git-gui: git-gui 0.13 git-gui: avoid mis-encoding the copyright message on Windows. git-gui: Update Swedish translation (521t). git-gui: ensure correct application termination in git-gui--askpass git-gui: handle textconv filter on Windows and in development git-gui: use shell to launch textconv filter in "blame" git-gui: display error launching blame as a message box. git-gui: Make usage statement visible on Windows. | 15 September 2010, 19:34:48 UTC |
| 00e9de7 | Pat Thoyts | 14 September 2010, 21:42:37 UTC | git-gui 0.13 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 14 September 2010, 21:42:37 UTC |
| 2473543 | Pat Thoyts | 13 September 2010, 19:41:42 UTC | git-gui: avoid mis-encoding the copyright message on Windows. On Windows the tcl script file will use the system encoding and attempting to convert the copyright mis-encodes the string. Instead, keep the message as ASCII and substitute in the correct unicode character when running. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 September 2010, 19:41:42 UTC |
| 421a31e | Peter Krefting | 12 September 2010, 20:13:29 UTC | git-gui: Update Swedish translation (521t). Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 13 September 2010, 18:25:55 UTC |
| 77f2e4f | Brian Gernhardt | 10 September 2010, 22:06:36 UTC | t7003: Use test_commit instead of custom function t7003-filter-branch.sh had a make_commit() function that was identical to test_commit() in test-lib.sh except that it used tr to create a lowercase file name from the uppercase branch name instead of appending ".t". Not only is this unneeded code duplication, it also was something simply waiting to fail on case-insensitive file systems. So replace all uses of make_commit with test_commit. While we're editing the setup, chain it together with && so that failures early in the sequence don't get lost and add a commit graph. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2010, 17:59:06 UTC |
| 5879b6b | Junio C Hamano | 12 September 2010, 20:53:03 UTC | Merge branch 'maint' * maint: t3101: modernise style compat/nedmalloc: don't force NDEBUG on the rest of git Conflicts: Makefile | 12 September 2010, 20:53:03 UTC |
| b294ed6 | Junio C Hamano | 11 September 2010, 18:47:09 UTC | ls-tree $di $dir: do not mistakenly recurse into directories When applying two pathspecs, one of which is named as a prefix to the other, we mistakenly recursed into the shorter one. Noticed and fixed by David Reis. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2010, 20:52:03 UTC |
| e22148f | Junio C Hamano | 11 September 2010, 17:53:29 UTC | t3101: modernise style Also add a few " &&" cascade that were missing. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2010, 20:46:58 UTC |
| 5418d96 | Ramsay Jones | 09 September 2010, 17:24:06 UTC | vcs-svn: Fix some printf format compiler warnings In particular, on systems that define uint32_t as an unsigned long, gcc complains as follows: CC vcs-svn/fast_export.o vcs-svn/fast_export.c: In function `fast_export_modify': vcs-svn/fast_export.c:28: warning: unsigned int format, uint32_t arg (arg 2) vcs-svn/fast_export.c:28: warning: int format, uint32_t arg (arg 3) vcs-svn/fast_export.c: In function `fast_export_commit': vcs-svn/fast_export.c:42: warning: int format, uint32_t arg (arg 5) vcs-svn/fast_export.c:62: warning: int format, uint32_t arg (arg 2) vcs-svn/fast_export.c: In function `fast_export_blob': vcs-svn/fast_export.c:72: warning: int format, uint32_t arg (arg 2) vcs-svn/fast_export.c:72: warning: int format, uint32_t arg (arg 3) CC vcs-svn/svndump.o vcs-svn/svndump.c: In function `svndump_read': vcs-svn/svndump.c:260: warning: int format, uint32_t arg (arg 3) In order to suppress the warnings we use the C99 format specifier macros PRIo32 and PRIu32 from <inttypes.h>. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2010, 17:24:55 UTC |
| d555ff5 | René Scharfe | 11 September 2010, 09:59:18 UTC | compat/nedmalloc: don't force NDEBUG on the rest of git Define the nedmalloc feature configuration macros for nedmalloc.o, only. This keeps assert(3) working for the rest of the git source; it was turned off for nedmalloc users before by defining NDEBUG globally. Also remove -DUSE_NED_ALLOCATOR as this macro isn't used anywhere. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2010, 17:23:03 UTC |
| 3b3a8ed | Junio C Hamano | 10 September 2010, 18:55:55 UTC | Git 1.7.3 rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 18:55:55 UTC |
| 5b45c55 | Junio C Hamano | 10 September 2010, 18:54:58 UTC | Merge branch 'np/relnotes-in-subdir' * np/relnotes-in-subdir: install-webdoc: keep installed RelNotes-*.txt Documentation: move RelNotes into a directory of their own | 10 September 2010, 18:54:58 UTC |
| 6070bac | Junio C Hamano | 10 September 2010, 18:54:34 UTC | Prepare for 1.7.3 rc1 | 10 September 2010, 18:54:34 UTC |
| 9ab5a33 | Junio C Hamano | 10 September 2010, 16:39:08 UTC | Merge branch 'maint' * maint: config.txt: fix placement of diff.noprefix | 10 September 2010, 16:39:08 UTC |
| 9904fad | Mark Lodato | 10 September 2010, 01:39:37 UTC | config.txt: fix placement of diff.noprefix In git-config(1), diff.noprefix was placed in between diff.mnemonicprefix and the list of mnemonic prefixes, which is obviously incorrect and very confusing to readers. Now, it is located after the end of the explanation of mnemonicprefix, which makes much more sense. Signed-off-by: Mark Lodato <lodatom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 16:31:13 UTC |
| 99f55eb | Brandon Casey | 10 September 2010, 16:13:38 UTC | t/t4018: avoid two unnecessary sub-shell invocations Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 16:30:14 UTC |
| 8ac8cf5 | Junio C Hamano | 10 September 2010, 00:29:40 UTC | Merge branch 'maint' * maint: xdiff-interface.c: always trim trailing space from xfuncname matches diff.c: call regfree to free memory allocated by regcomp when necessary | 10 September 2010, 00:29:40 UTC |
| bff4206 | Brandon Casey | 09 September 2010, 19:02:47 UTC | t/t4018: test whether the word_regex patterns compile Previously (e3bf5e43), a test was added to test whether the builtin xfuncname regular expressions could be compiled without error by regcomp. Let's do the same for the word_regex patterns. This should help catch any cross-platform incompatibilities that exist between the pattern creator's system and the various platforms that the test suite is commonly run on. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 00:19:18 UTC |
| 1b6ecba | Brandon Casey | 09 September 2010, 19:02:46 UTC | xdiff-interface.c: always trim trailing space from xfuncname matches Generally, trailing space is removed from the string matched by the xfuncname patterns. The exception is when the matched string exceeds the length of the fixed-size buffer that it will be copied in to. But, a string that exceeds the buffer can still contain trailing space in the portion of the string that will be copied into the buffer. So, simplify this code slightly, and just perform the trailing space removal always. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 00:18:29 UTC |
| ef5644e | Brandon Casey | 09 September 2010, 19:02:45 UTC | diff.c: call regfree to free memory allocated by regcomp when necessary Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2010, 00:18:04 UTC |
