| 1ed9193 | Junio C Hamano | 15 December 2005, 01:30:03 UTC | GIT 0.99.9n aka 1.0rc6 Oh, I hate to do this but I ended up merging big usage string cleanups from Fredrik, git-am enhancements that made a lot of sense for non mbox users from HPA, and rebase changes (done independently by me and Lukas) among other things, so git is still in perpetual state of 1.0rc. 1.0 will probably be next Wednesday, but who knows. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 December 2005, 01:30:03 UTC |
| 294c695 | Amos Waterland | 14 December 2005, 22:48:19 UTC | git rebase loses author name/email if given bad email address If GIT_AUTHOR_EMAIL is of a certain form, `git rebase master' will blow away the author name and email when fast-forward merging commits. I have not tracked it down, but here is a testcase that demonstrates the behavior. Signed-off-by: Amos Waterland <apw@us.ibm.com> Acked-by: Michal Ostrowski <mostrows@watson.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 December 2005, 01:04:47 UTC |
| 32d9954 | Lukas Sandström | 14 December 2005, 23:36:35 UTC | Bugfixes for git-rebase Fix bugs in git-rebase wrt rebasing another branch than the current HEAD, rebasing with a dirty working dir, and rebasing a proper decendant of the target branch. [jc: with a bit of hand-merging] Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 December 2005, 01:02:03 UTC |
| e0e3ba2 | Junio C Hamano | 15 December 2005, 00:31:06 UTC | mailinfo and git-am: allow "John Doe <johndoe>" An isolated developer could have a local-only e-mail, which will be stripped out by mailinfo because it lacks '@'. Define a fallback parser to accomodate that. At the same time, reject authorless patch in git-am. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 December 2005, 00:31:06 UTC |
| 252fef7 | Martin Atukunda | 13 December 2005, 12:21:34 UTC | define MAXPATHLEN for hosts that don't support it [jc: Martin says syllable (www.syllable.org) wants this.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 22:26:44 UTC |
| 773b633 | Junio C Hamano | 14 December 2005, 21:32:52 UTC | Do not let errors pass by unnoticed when running `make check'. [jc: originally from Amos Waterland.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 21:32:52 UTC |
| 9a26dbd | Junio C Hamano | 14 December 2005, 21:04:43 UTC | Merge branch 'hold/am' | 14 December 2005, 21:04:43 UTC |
| 2db8aae | Junio C Hamano | 14 December 2005, 11:11:37 UTC | rebase: do not get confused in fast-forward situation. When switching to another branch and rebasing it in a one-go, it failed to update the variable that holds the branch head, and did not detect fast-forward situation correctly. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 21:04:25 UTC |
| b0d3e9b | Junio C Hamano | 14 December 2005, 21:01:01 UTC | Merge branch 'fk/usage' | 14 December 2005, 21:01:01 UTC |
| a4adf54 | Junio C Hamano | 14 December 2005, 20:57:49 UTC | Documentation: topic branches Recommend git over ssh direct to master.kernel.org, instead of going over rsync to public machines, since this is meant to be a procedure for kernel subsystem maintainers. Also fix an obvious typo. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 20:57:49 UTC |
| 5073eb0 | Junio C Hamano | 14 December 2005, 02:19:12 UTC | applypatch: no need to do non-portable [[ ... ]] ... when old, proven, case would do. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:45 UTC |
| 9678faa | freku045@student.liu.se | 13 December 2005, 22:30:32 UTC | git-repack: Usage string clean-up, emit usage at incorrect invocation Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| 3ae39ab | freku045@student.liu.se | 13 December 2005, 22:30:32 UTC | git-rebase: Usage string clean-up, emit usage string at incorrect invocation Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| 7ab099d | freku045@student.liu.se | 13 December 2005, 22:30:32 UTC | git-prune: Usage string clean-up, use the 'usage' function Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| d20e2f1 | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | git-lost-found: Usage string clean-up, emit usage string at incorrect invocation Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| 87358b7 | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | git-fetch: Usage string clean-up, emit usage string at unrecognized option Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| 43a95cf | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | git-cherry: Usage string clean-up, use the 'usage' function Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| 6cf6193 | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | git-applypatch: Usage string clean-up, emit usage string at incorrect invocation Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| cf1fe88 | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | git-am: Usage string clean-up Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| 4e7824b | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | git-revert: Usage string clean-up Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:43 UTC |
| 3497012 | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | git-verify-tag: Usage string clean-up, emit usage string at incorrect invocation Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:43 UTC |
| 806f36d | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | Trivial usage string clean-up Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:43 UTC |
| aa9dc7a | Junio C Hamano | 13 December 2005, 07:38:47 UTC | t3200: branch --help does not die anymore. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:43 UTC |
| d025524 | Fredrik Kuivinen | 11 December 2005, 09:55:49 UTC | Usage message clean-up, take #2 There were some problems with the usage message clean-up patch series. I hadn't realised that subdirectory aware scripts can't source git-sh-setup. I propose that we change this and let the scripts which are subdirectory aware set a variable, SUBDIRECTORY_OK, before they source git-sh-setup. The scripts will also set USAGE and possibly LONG_USAGE before they source git-sh-setup. If LONG_USAGE isn't set it defaults to USAGE. If we go this way it's easy to catch --help in git-sh-setup, print the (long) usage message to stdout and exit cleanly. git-sh-setup can define a 'usage' shell function which can be called by the scripts to print the short usage string to stderr and exit non-cleanly. It will also be easy to change $0 to basename $0 or something else, if would like to do that sometime in the future. What follows is a patch to convert a couple of the commands to this style. If it's ok with everyone to do it this way I will convert the rest of the scripts too. [jc: thrown in to proposed updates queue for comments.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:43 UTC |
| b3f041f | H. Peter Anvin | 14 December 2005, 06:39:23 UTC | git-am support for naked email messages (take 2) This allows git-am to accept single-message files as well as mboxes. Unlike the previous version, this one doesn't need to be explicitly told which one it is; rather, it looks to see if the first line is a From line and uses it to select mbox mode or not. I moved the logic to do all this into git-mailsplit, which got a new user interface as result, although the old interface is still available for backwards compatibility. [jc: applied with two obvious fixes.] Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:04:56 UTC |
| 01f49e3 | Junio C Hamano | 14 December 2005, 08:42:45 UTC | Everyday: a bit more examples. Talk about the following as well: * git fetch --tags * Use of "git push" as a one-man distributed development vehicle. * Show example of remotes file for pulling and pushing. * Annotate git-shell setup. * Using Carl's update hook in a CVS-style shared repository. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 08:42:45 UTC |
| f4f9ada | Junio C Hamano | 14 December 2005, 05:39:56 UTC | checkout-index: fix checking out specific path. 3bd348aeea24709cd9be4b9d741f79b6014cd7e3 commit broke checking out specific paths. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 05:39:56 UTC |
| ed24928 | Petr Baudis | 14 December 2005, 00:45:40 UTC | Make git-send-pack exit with error when some refs couldn't be pushed out In case some refs couldn't be pushed out due to an error (mostly the not-a-proper-subset error), make git-send-pack exit with non-zero status after the push is over (that is, it still tries to push out the rest of the refs). [jc: I adjusted a test for this change.] Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 02:15:02 UTC |
| 9954f5b | Junio C Hamano | 14 December 2005, 01:01:23 UTC | [PATCH] allow merging any committish Although "git-merge" is advertised as the end-user level command (instead of being a "git-pull" backend), it was not prepared to take tag objects that point at commits and barfed when fed one. Sanitize the input while we validate them, for which we already have a loop. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 01:01:23 UTC |
| 0a8b4de | Junio C Hamano | 13 December 2005, 23:58:00 UTC | git-clone: tell the user a bit more about clone-pack failure. When clone-pack has trouble with the remote, it dies unfriendly "EOF" error message. We cannot tell the reason why it failed from the local end; it could be that the repository did not exist, or configured not to serve over git-daemon, or a network failure. At least, saying clone-pack failed makes it a bit more meaningful. I am not convinced yet that removing the newly created directory is the right thing to do, so this commit leaves the new directory behind. Reported by Sam Ravnborg. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 23:58:00 UTC |
| 9755afb | Junio C Hamano | 13 December 2005, 10:38:24 UTC | Documentation: not learning core git commands. The initial section of tutorial was too heavy on internal workings for the first-time readers, so rewrite the introductory section of git(7) to start with "not learning core git commands" section and refer them to README to grasp the basic concepts, then Everyday to give overview with task/role oriented examples for minimum set of commands, and finally the tutorial. Also add to existing note in the tutorial that many too technical descriptions can be skipped by a casual reader. I initially started to review the tutorial, with the objective of ripping out the detailed technical information altogether, but I found that the level of details in the initial couple of sections that talk about refs and the object database in a hands-on fashion was about rigth, and left all of them there. I feel that reading about fsck-index and repack is too abstract without being aware of these directories and files. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 10:38:24 UTC |
| 803f498 | Junio C Hamano | 13 December 2005, 09:54:15 UTC | Documentation: diff examples. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 09:54:15 UTC |
| 76cead3 | Junio C Hamano | 13 December 2005, 07:55:09 UTC | Documentation: fix missing links to git(7) Also move pack protocol description to technical/. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 07:55:09 UTC |
| 1e2ccd3 | Junio C Hamano | 13 December 2005, 07:24:06 UTC | Documentation: more examples. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 07:24:06 UTC |
| 180c474 | Junio C Hamano | 13 December 2005, 02:29:53 UTC | Everyday: a bit more example. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 02:29:53 UTC |
| 0532a5e | Junio C Hamano | 13 December 2005, 01:15:55 UTC | diffcore-break: do not break too small filepair. Somehow we checked only one side and not the other. By checking the filesize upfront, we can bypass generating delta unnecessarily. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 01:15:55 UTC |
| 86c9523 | Junio C Hamano | 13 December 2005, 00:43:15 UTC | Revert "Add deltifier test." This reverts e726715a52e25d8035c89d4ea09398599610737e commit, because reverting diff-delta emptiness change would break this test. | 13 December 2005, 00:43:15 UTC |
| c7a45bd | Junio C Hamano | 13 December 2005, 00:42:38 UTC | Revert "diff-delta.c: allow delta with empty blob." This reverts 962537a3eb03a118cf27d9d0da365a3216ed1caa commit to play safe. | 13 December 2005, 00:42:38 UTC |
| 44db136 | Junio C Hamano | 13 December 2005, 00:20:21 UTC | Everyday: some examples. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 00:20:21 UTC |
| 962537a | Junio C Hamano | 12 December 2005, 20:01:52 UTC | diff-delta.c: allow delta with empty blob. Delta computation with an empty blob used to punt and returned NULL. This commit allows creation with empty blob; all combination of empty->empty, empty->something, and something->empty are allowed. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 December 2005, 20:57:25 UTC |
| e726715 | Junio C Hamano | 12 December 2005, 20:28:34 UTC | Add deltifier test. This test kicks in only if you built test-delta executable, and makes sure that the basic delta routine is working properly even on empty files. This commit is to make sure we have a test to catch the breakage. The delitifier code is still broken, which will be fixed with the next commit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 December 2005, 20:57:25 UTC |
| d28c8af | Junio C Hamano | 12 December 2005, 20:50:40 UTC | diffcore-break.c: check diff_delta() return value. This bug caused Darrin Thompson to notice that our deltifier was half broken and punting on an empty blob. Signed-off-by: Junio C Hamano <junio@twinsun.com> | 12 December 2005, 20:57:25 UTC |
| a957207 | Junio C Hamano | 12 December 2005, 00:49:45 UTC | GIT 0.99.9m aka 1.0rc5 Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 December 2005, 00:49:45 UTC |
| b825e6f | Junio C Hamano | 11 December 2005, 20:44:46 UTC | t/t6022: a new test for renaming merge. This adds a couple of tests to cover the following renaming merge cases: - one side renames and the other side does not, with and without content conflicts. - both side rename to the same path, with and without content conflicts. The test setup also prepares a case in which both side rename to different destination, but currently the code collapses these destination paths and removes the original path, which may be wrong. The outcome of this case is not checked by the tests in this round. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 December 2005, 20:44:46 UTC |
| 157dc07 | Junio C Hamano | 11 December 2005, 09:55:52 UTC | merge-recursive: cleanup setIndexStages Fredrik points out there is a useful wrapper runProgram() used everywhere that we can use to feed input into subprocess. Use it to catch errors from the subprocess; it is a good cleanup as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 December 2005, 09:55:52 UTC |
| 28e77a8 | Junio C Hamano | 11 December 2005, 06:05:01 UTC | merge-recursive: leave unmerged entries in the index. This does two things. - When one branch renamed and the other branch did not, the resulting half-merged file in the working tree used to swap branches around and showed as if renaming side was "ours". This was confusing and inconsistent (even though the conflict markers were marked with branch names, it was not a good enough excuse). This changes the order of arguments to mergeFile in such a case to make sure we always see "our" change between <<< and ===, and "their" change between === and >>>. - When both branches renamed to the same path, and when one branch renamed and the other branch did not, we attempt mergeFile. When this automerge conflicted, we used to collapse the index. Now we use update-index --index-info to inject higher stage entries to leave the index in unmerged state for these two cases. What this still does _not_ do is to inject unmerged state into the index when the structural changes conflict. I have not thought things through what to do in each case yet, but the cases this commit cover are the most common ones, so this would be a good start. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 December 2005, 09:47:15 UTC |
| 7564577 | Junio C Hamano | 11 December 2005, 06:22:35 UTC | format-patch: use same number of digits in numbers This would help sorting by subject in MUA work saner even though MUA is too dumb to attempt sorting numbered subjects sanely. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 December 2005, 06:22:35 UTC |
| eea4206 | Junio C Hamano | 11 December 2005, 04:55:32 UTC | t0000: catch trivial pilot errors. People seem to be getting test failure from t6021 not becuase git is faulty but because they forgot to install "merge". Check this and other trivial pilot errors in the first test. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 December 2005, 04:55:32 UTC |
| 73ab46d | Junio C Hamano | 11 December 2005, 02:36:15 UTC | t3300: funny name test Add double quote character to the test pattern. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 December 2005, 03:00:24 UTC |
| 024510c | Daniel Barkalow | 10 December 2005, 22:25:24 UTC | Allow saving an object from a pipe In order to support getting data into git with scripts, this adds a --stdin option to git-hash-object, which will make it read from stdin. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 December 2005, 02:57:57 UTC |
| 10945e0 | Eric Wong | 24 November 2005, 07:58:16 UTC | archimport: fix a in new changeset applyer addition Fix a stupid bug I introduced when splitting the accurate and fast changeset appliers. Also, remove an old debugging statement I added Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> | 11 December 2005, 01:41:40 UTC |
| 6e33101 | Eric Wong | 24 November 2005, 07:56:31 UTC | archimport: Fix a bug I introduced in the new log parser This fixes the case (that worked originally in Martin's version) where the only new/modified files are Arch control files. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> | 11 December 2005, 01:41:40 UTC |
| 3e525e6 | Eric Wong | 24 November 2005, 07:55:04 UTC | archimport: Add the accurate changeset applyer And make it the default. This includes stats tracking to verbose mode Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> | 11 December 2005, 01:41:40 UTC |
| 6df896b | Eric Wong | 24 November 2005, 07:53:55 UTC | archimport: safer log file parsing Better logfile parsing, no longer confused by 'headers' after the first blank line. Re-enabled tag-reading with abrowse (baz and tla compatible) Remove need to quote args to external processes Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> | 11 December 2005, 01:41:40 UTC |
| 42f44b0 | Eric Wong | 24 November 2005, 07:52:43 UTC | archimport: add -D <depth> and -a switch add -D <depth> option to abrowse add -a switch to attempt to auto-register archives at mirrors.sourcecontrol.net (ML: Also removes some std libraries no longer in use) Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> | 11 December 2005, 01:41:40 UTC |
| 1136fb5 | Eric Wong | 24 November 2005, 07:51:33 UTC | archimport: remove git wrapper dependency use git-diff-files instead of git diff-files so we don't rely on the wrapper being installed (some people may have git as GNU interactive tools :) Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> | 11 December 2005, 01:41:40 UTC |
| 5744f27 | Eric Wong | 24 November 2005, 07:50:27 UTC | archimport: fix -t tmpdir switch set TMPDIR env correctly if -t <tmpdir> is passed from the command-line. setting TMPDIR => 1 as an argument to tempdir() has no effect otherwise Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> | 11 December 2005, 01:41:40 UTC |
| f88961a | Eric Wong | 24 November 2005, 07:48:57 UTC | archimport: remove String::ShellQuote dependency. use safe_pipe_capture() or system() over backticks where shellquoting may have been necessary. More changes planned, so I'm not touching the parts I'm planning on replacing entirely. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> | 11 December 2005, 01:41:39 UTC |
| 2777ef7 | Eric Wong | 24 November 2005, 07:47:39 UTC | archimport: first, make sure it still compiles (ML: And introduce safe_pipe_capture()) Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> | 11 December 2005, 01:41:39 UTC |
| 8b15e2f | Junio C Hamano | 10 December 2005, 07:41:03 UTC | Link Everyday GIT to main documentation tree. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 December 2005, 07:41:03 UTC |
| db9536c | Junio C Hamano | 10 December 2005, 07:07:29 UTC | Everyday GIT with 20 commands Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 December 2005, 07:07:29 UTC |
| 10b94e2 | Junio C Hamano | 10 December 2005, 01:32:18 UTC | Use GIT_EXEC_PATH explicitly for initial git-init-db in tests. This is just a belts-and-suspenders check, but makes sure we have both "git" and "git-init-db" built, executable, and checking. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 December 2005, 01:32:18 UTC |
| 0f73746 | Alex Riesen | 08 December 2005, 20:25:55 UTC | use "git init-db" in tests This is to catch an error where tests are run without first building what are being tested. Relying on prefixing $PATH with the build directory and expect that the PATH mechanism would find what we just built would silently run an already installed binaries from the PATH. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 December 2005, 20:51:04 UTC |
| 2b86976 | Junio C Hamano | 09 December 2005, 07:18:41 UTC | git-prune: never lose objects reachable from our refs. Explicit <head> arguments to git-prune replaces, instead of extends, the list of heads used for reachability analysis by fsck-objects. By giving a subset of heads by mistake, objects reachable only from other heads can be removed, resulting in a corrupted repository. This commit stops replacing the list of heads, and makes the command line arguments to add to them instead for safety. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 December 2005, 07:18:41 UTC |
| 2dee581 | Junio C Hamano | 09 December 2005, 01:29:11 UTC | qsort(): ptrdiff_t may be larger than int This is a companion patch to e23eff8be92a2a2cb66b53deef020063cff285ed commit. The same logic, the same rationale that a comparison function that returns an int should not just compute a ptrdiff_t and return it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 December 2005, 01:29:11 UTC |
| c82365d | Junio C Hamano | 09 December 2005, 00:30:24 UTC | Documentation: git-prune Not replacing but always including our own refs may be more desirable (and unarguably much safer), but at the same time I have a suspicion that that might be forbidding a useful usage I haven't thought of, so... Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 December 2005, 00:30:24 UTC |
| 8c667f4 | Nikolai Weibull | 08 December 2005, 23:28:06 UTC | Documentation/git-read-tree.txt: Add --reset to SYNOPSIS. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:16 UTC |
| d839091 | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Documentation/git-tag.txt: Fix the order of sections (DESCRIPTION should come before OPTIONS). Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:15 UTC |
| 03f6c23 | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Documentation/git-update-server-info.txt: Add -f alias for --force to documentation. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:15 UTC |
| 5dd7342 | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Documentation/git-http-fetch.txt: Document the commit-id argument. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:15 UTC |
| 31f2328 | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Documentation/git-repack.txt: Add -l and -n. This adds documentation for the -l and -n options to git-repack. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:15 UTC |
| 5e34c99 | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Documentation/git-ls-remote.txt: Add -h and -t. -h and -t are aliases for --heads and --tags to git-ls-remote. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:15 UTC |
| 6f85537 | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Documentation/git-format-patch.txt: Add --signoff, --check, and long option-names. The documentation was lacking descriptions for the --signoff and --check options to git-format-patch. It was also missing the following long option-names: --output-directory (-o), --numbered (-n), --keep-subject (-k), --author (-a), --date (-d), and --mbox (-m). Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:15 UTC |
| d4ce5f7 | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Add documentation for the --topo-order option to git-show-branch. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:14 UTC |
| 674b280 | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Add documentation for git-revert and git-cherry-pick. * Added the -e option to the documentation of git-cherry-pick. * Added the -e and --no-commit option to git-revert. * Removed redundant case expression for -n as --no-edit (already taken by --no-commit). Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:14 UTC |
| d972217 | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Documentation/git-cherry-pick: Add --replay and --no-commit. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:14 UTC |
| 56e5e91 | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Documentation/git-cvsimport.txt: Fix a slight glitch in description heading. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:14 UTC |
| e293de3 | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Documentation/git-verify-pack.txt: added documentation for --. The -- option has been added to the documentation of git-verify-pack. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:14 UTC |
| eaa54ef | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Documentation/git-commit.txt: Add long options and -- to documentation. Added the following long options to documentation: * --all * --signoff * --verify * --no-verify * --edit Also added documentation for the -- option for terminating option parsing. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:14 UTC |
| 16cc50d | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Use uniform description for the '--' option. All descriptions of the '--' option were the same except for that in Documentation/git-merge-index.txt. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:13 UTC |
| 68e37f8 | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Fix the description of --utf8 and --keep to git-am. The git-am script actually transform --utf8 and --keep to -u and -k when sent to git-mailinfo. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:13 UTC |
| 63ae26f | Nikolai Weibull | 08 December 2005, 23:28:05 UTC | Document the --non-empty command-line option to git-pack-objects. This provides (minimal) documentation for the --non-empty command-line option to the pack-objects command. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 23:50:13 UTC |
| bcaf60b | Junio C Hamano | 08 December 2005, 22:10:02 UTC | show-branch: comment typo Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 22:10:02 UTC |
| 9688a88 | Junio C Hamano | 08 December 2005, 22:04:33 UTC | Documentation: recursive is the default strategy these days. We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 22:04:33 UTC |
| 49ccb08 | Junio C Hamano | 08 December 2005, 05:52:28 UTC | Make sure we use compat/subprocess.py with Python 2.3 while running tests. Otherwise the test will not succeed without installing. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 06:05:05 UTC |
| 128aed6 | Daniel Barkalow | 08 December 2005, 02:04:38 UTC | Clean up file descriptors when calling hooks. When calling post-update hook, don't leave stdin and stdout connected to the pushing connection. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 05:05:39 UTC |
| 64224ca | Junio C Hamano | 08 December 2005, 01:48:53 UTC | refs.c: make sure leading directories exist before writing a ref. Otherwise cloning a repository with hierarchical branch/tag over http would fail. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 01:48:53 UTC |
| 361c06d | Junio C Hamano | 08 December 2005, 00:44:12 UTC | Documentation(tutorial): adjust merge example to the new merge world order. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 00:44:12 UTC |
| 6bad190 | Junio C Hamano | 08 December 2005, 00:26:49 UTC | Documentation(cvs-migration): minor cleanups. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 00:26:49 UTC |
| 12bd7e7 | Junio C Hamano | 08 December 2005, 00:16:04 UTC | Documentation(glossary): minor formatting clean-ups. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 00:16:04 UTC |
| 2fa090b | Junio C Hamano | 08 December 2005, 00:05:21 UTC | Documentation: git.html/git.7 Finish each sentence with a full stop. Instead of saying 'directory index' 'directory cache' etc, consistently say 'index'. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 December 2005, 00:05:21 UTC |
| 5e80092 | Junio C Hamano | 07 December 2005, 19:25:42 UTC | Merge http://www.kernel.org/pub/scm/gitk/gitk | 07 December 2005, 19:25:42 UTC |
| fd8ccbe | Paul Mackerras | 07 December 2005, 12:28:22 UTC | gitk: Work around Tcl's non-standard names for encodings This uses a table of encoding names and aliases distilled from http://www.iana.org/assignments/character-sets plus some heuristics to convert standard encoding names to ones that Tcl recognizes. Signed-off-by: Paul Mackerras <paulus@samba.org> | 07 December 2005, 12:28:22 UTC |
| d23748a | Junio C Hamano | 07 December 2005, 09:45:38 UTC | update-index: allow --index-info to add higher stages. The new merge world order tells the merge strategies to leave the cache unmerged and store the automerge result in the working tree if automerge is not clean. This was done for the resolve strategy and recursive strategy when no rename is involved, but recording a conflicting merge in the rename case could not easily be done by the recursive strategy. This commit adds a new input format, in addition to the exsting two, to "update-index --index-info". (1) mode SP sha1 TAB path The first format is what "git-apply --index-info" reports, and used to reconstruct a partial tree that is used for phony merge base tree when falling back on 3-way merge. (2) mode SP type SP sha1 TAB path The second format is to stuff git-ls-tree output into the index file. (3) mode SP sha1 SP stage TAB path This format is to put higher order stages into the index file and matches git-ls-files --stage output. To place a higher stage entry to the index, the path should first be removed by feeding a mode=0 entry for the path, and then feeding necessary input lines in the (3) format. For example, starting with this index: $ git ls-files -s 100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0 frotz $ git update-index --index-info ;# interactive session -- input follows... 0 0000000000000000000000000000000000000000 frotz 100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz 100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz The first line of the input feeds 0 as the mode to remove the path; the SHA1 does not matter as long as it is well formatted. Then the second and third line feeds stage 1 and stage 2 entries for that path. After the above, we would end up with this: $ git ls-files -s 100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz 100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz This completes the groundwork for the new merge world order. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 December 2005, 09:53:50 UTC |
| b539c5e | Junio C Hamano | 07 December 2005, 08:50:33 UTC | git-merge-one: new merge world order. This does two things: - Use new --stage=2 option to create the working tree file with leading paths and correct permission bits using checkout-index, as before. - Make sure we do not confuse "merge" program when the file being merged has an unfortunate name, '-L'. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 December 2005, 08:50:33 UTC |
| 3bd348a | Junio C Hamano | 07 December 2005, 08:29:51 UTC | checkout-index: allow checking out from higher stages. The new option, --stage=<n>, lets you copy out from an unmerged, higher stage. This is to help the new merge world order during a nontrivial merge. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 December 2005, 08:44:30 UTC |
| 9754563 | Jason Riedy | 06 December 2005, 22:21:52 UTC | Use printf rather than echo -n. On AIX, there is no -n option to the system's echo. Instead, it needs the '\c' control character. We could replace echo -n "foo" with echo -e "foo\c" but printf is recommended by most man pages. Tested on AIX 5.3, Solaris 8, and Debian. [jc: futureproofed two instances that uses variable with '%s' so later feeding different messages would not break things too easily; others are emitting literal so whoever changes the literal ought to notice more easily so they are safe.] Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 December 2005, 02:09:12 UTC |
| e23eff8 | Junio C Hamano | 06 December 2005, 21:41:48 UTC | qsort() ptrdiff_t may be larger than int Morten Welinder <mwelinder@gmail.com> writes: > The code looks wrong. It assumes that pointers are no larger than ints. > If pointers are larger than ints, the code does not necessarily compute > a consistent ordering and qsort is allowed to do whatever it wants. > > Morten > > static int compare_object_pointers(const void *a, const void *b) > { > const struct object * const *pa = a; > const struct object * const *pb = b; > return *pa - *pb; > } Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 December 2005, 01:28:26 UTC |
| a6da939 | Jason Riedy | 06 December 2005, 22:20:16 UTC | [PATCH] Initial AIX portability fixes. Added an AIX clause in the Makefile; that clause likely will be wrong for any AIX pre-5.2, but I can only test on 5.3. mailinfo.c was missing the compat header file, and convert-objects.c needs to define a specific _XOPEN_SOURCE as well as _XOPEN_SOURCE_EXTENDED. Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 December 2005, 00:15:55 UTC |
| be61db9 | Junio C Hamano | 06 December 2005, 08:07:58 UTC | git-merge-one-file: resurrect leading path creation. Since we do not use git-update-index followed by git-checkout-index -u to create the half-merged file on conflicting case anymore, we need to make sure the leading directories are created here. Maybe a better solution would be to allow update-index to add to higher stage, and checkout-index to extract from such, but that is a change slightly bigger than I would like to have so close to 1.0, so this should do for now. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 December 2005, 08:07:58 UTC |
