| 437b1b2 | Junio C Hamano | 14 February 2007, 00:00:00 UTC | GIT 1.5.0 | 14 February 2007, 00:00:00 UTC |
| 26cfcfb | Junio C Hamano | 13 February 2007, 23:15:05 UTC | Add release notes to the distribution. This also adds a hook in the Makefile I can use to automatically include pointers to documentation for older releases when updating the pages at http://kernel.org/pub/software/scm/git/docs/. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 23:15:05 UTC |
| ea44949 | Junio C Hamano | 13 February 2007, 21:48:52 UTC | Merge branch 'master' of git://repo.or.cz/git-gui * 'master' of git://repo.or.cz/git-gui: git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull" | 13 February 2007, 21:48:52 UTC |
| cec8d14 | Junio C Hamano | 13 February 2007, 16:58:01 UTC | Documentation: Moving out of detached HEAD does not warn anymore. The documentation still talked about the unnecessary 'safety' in git-checkout. Pointed out by Matthias Lederhofer. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 18:12:37 UTC |
| bd3a5b5 | Linus Torvalds | 13 February 2007, 17:23:59 UTC | Mark places that need blob munging later for CRLF conversion. Here's a patch that I think we can merge right now. There may be other places that need this, but this at least points out the three places that read/write working tree files for git update-index, checkout and diff respectively. That should cover a lot of it [jc: git-apply uses an entirely different codepath both for reading and writing]. Some day we can actually implement it. In the meantime, this points out a place for people to start. We *can* even start with a really simple "we do CRLF conversion automatically, regardless of filename" kind of approach, that just look at the data (all three cases have the _full_ file data already in memory) and says "ok, this is text, so let's convert to/from DOS format directly". THAT somebody can write in ten minutes, and it would already make git much nicer on a DOS/Windows platform, I suspect. And it would be totally zero-cost if you just make it a config option (but please make it dynamic with the _default_ just being 0/1 depending on whether it's UNIX/Windows, just so that UNIX people can _test_ it easily). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 18:12:37 UTC |
| e19b91b | Nicolas Pitre | 13 February 2007, 16:39:01 UTC | Update RPM core package description Git isn't as stupid as it used to be Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 18:12:37 UTC |
| 72f627d | Andy Parkins | 13 February 2007, 14:23:58 UTC | Fix potential command line overflow in hooks--update In a repository with a large number of refs, the following command line could easily overflow the command line size limitations git-rev-list $newref $(git-rev-parse --not --all) Fortunately, git-rev-list already has the means to cope with this situation with the --stdin switch git-rev-parse --not --all | git-rev-list --stdin $newref Which is exactly what this patch does. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 17:33:09 UTC |
| c2120e5 | Johannes Schindelin | 13 February 2007, 13:01:42 UTC | git-gc: run pack-refs by default unless the repo is bare The config variable gc.packrefs is tristate now: "true", "false" and "notbare", where "notbare" is the default. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 17:19:34 UTC |
| 022fef3 | Andy Parkins | 13 February 2007, 15:26:16 UTC | git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull" Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 13 February 2007, 15:35:58 UTC |
| 85b1f98 | Junio C Hamano | 11 February 2007, 21:41:23 UTC | "git-fetch --tags $URL" should not overwrite existing tags Use the same --exclude-existing filter as we use for automatic tag following to avoid overwriting existing tags with replacement ones the other side created. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 07:31:00 UTC |
| acb39f6 | Junio C Hamano | 13 February 2007, 07:21:34 UTC | for-each-reflog: not having $GIT_DIR/logs directory is not an error. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 07:22:07 UTC |
| 25b51e2 | Junio C Hamano | 13 February 2007, 07:06:54 UTC | Do not forget to pack objects reachable from HEAD reflog. Similar to commit eb8381c8, we need to use for_each_reflog() to make sure we do not miss objects reachable from HEAD reflog. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 07:06:54 UTC |
| 7b3fab8 | Michael Spang | 13 February 2007, 00:33:37 UTC | Work around Subversion race in git-svn tests. Some of the git-svn tests can fail on fast machines due to a race in Subversion: if a file is modified in the same second it was checked out (or in for that matter), Subversion will not consider it modified. This works around the problem by increasing the timestamp by one second before each commit. [jc: with "touch -r -d" replacement from Eric] Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Michael Spang <mspang@uwaterloo.ca> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 06:17:04 UTC |
| ccf5aa8 | Pavel Roskin | 13 February 2007, 05:43:44 UTC | Clarify that git-update-server-info should be run for every git-push The old text suggested that git-update-server-info only needs to be run if new tags or branches are created, but not for new commits. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 06:00:45 UTC |
| 07fef5f | Aneesh Kumar K.V | 12 February 2007, 17:30:28 UTC | blameview: Move the commit info to a pane below the blame window. Also spawn the the new blameview in the background Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 03:20:08 UTC |
| 1e8b0d4 | Matthias Lederhofer | 05 February 2007, 11:37:27 UTC | git merge documentation: -m is optional Changed -m=<msg> to -m <msg> too. Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 03:19:45 UTC |
| 2055f3b | Mark Levedahl | 13 February 2007, 00:19:34 UTC | Make gitk save and restore window pane position on Linux and Cygwin. Subtle bugs remained on both Cygwin and Linux that caused the various window panes to be restored in positions different than where the user last placed them. Sergey Vlasov posed a pair of suggested fixes to this, what is done here is slightly different. The basic fix here involves a) explicitly remembering and restoring the sash positions for the upper window, and b) using paneconfigure to redundantly set height and width of other elements. This redundancy is needed as Cygwin Tcl has a nasty habit of setting pane sizes to zero if their slaves are not configured with a specific size, but Linux Tcl does not honor the specific size given. Signed-off-by: Mark Levedahl <mdl123@verizon.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 00:40:25 UTC |
| 9236053 | Junio C Hamano | 13 February 2007, 00:28:15 UTC | Add RPM target for git-gui Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 00:32:04 UTC |
| d647c2e | Shawn O. Pearce | 12 February 2007, 23:20:34 UTC | Link git-gui into the master Makefile. I'm exporting gitexecdir because git-gui wants to know where it should install git-gui and git-citool. These belong under gitexecdir, just like git-diff, as the git wrapper is able to invoke these commands for the end-user. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 February 2007, 00:18:12 UTC |
| 67c7575 | Junio C Hamano | 13 February 2007, 00:07:29 UTC | Merge branch 'master' of git://repo.or.cz/git-gui * 'master' of git://repo.or.cz/git-gui: git-gui: Change base version to 0.6. git-gui: Guess our version accurately as a subproject. git-gui: Handle gitgui tags in version gen. git-gui: Generate a version file on demand. git-gui: Rename GIT_VERSION to GITGUI_VERSION. git-gui: Allow gitexecdir, INSTALL to be set by the caller. | 13 February 2007, 00:07:29 UTC |
| fdf6cfc | Shawn O. Pearce | 12 February 2007, 22:45:21 UTC | git-gui: Change base version to 0.6. This is the start of the 0.6 series of git-gui. I'm calling it 0.6 (rather than any other value) as I already had a private tag on one system based on 0.5, and that tag is quite a bit behind this version. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 February 2007, 22:45:21 UTC |
| 07d082b | Shawn O. Pearce | 12 February 2007, 22:05:10 UTC | git-gui: Guess our version accurately as a subproject. When we are included as a subproject, such as how git.git carries us, we want to retain our own version number and not the version number assigned by git.git's own tags. Consequently we need to locate the correct tag which applies to our tree content and its commit lineage. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 February 2007, 22:05:10 UTC |
| 6a6459b | Shawn O. Pearce | 12 February 2007, 21:38:29 UTC | git-gui: Handle gitgui tags in version gen. I've decided to use gitgui-0.5 as the format for tags in the git-gui repository. The prefix of gitgui was chosen here to make its namespace different from the namespace used by git itself, allowing developers to pull both tag namespaces into the same repository. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 February 2007, 21:38:29 UTC |
| 5d643cd | Shawn O. Pearce | 12 February 2007, 21:14:44 UTC | git-gui: Generate a version file on demand. Because git-gui is being shipped as a subproject of the main Git project and will often have a different lifecycle than the main Git project, we should ship our own version number in the release tarball rather than relying on the main Git version file. Git's master Makefile will invoke our own with the target dist-version, asking us to save off our GITGUI_VERSION value into our own version file, so that our GIT-VERSION-GEN script can recover it at build time. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 February 2007, 21:14:44 UTC |
| 7e81d4e | Shawn O. Pearce | 12 February 2007, 21:12:04 UTC | git-gui: Rename GIT_VERSION to GITGUI_VERSION. Now that the decision has been made to treat git-gui as a subproject, rather than merging it directly into git, we should use a different substitution for our version value to avoid any possible confusion. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 February 2007, 21:12:04 UTC |
| 663e7cf | Shawn O. Pearce | 12 February 2007, 20:37:50 UTC | git-gui: Allow gitexecdir, INSTALL to be set by the caller. When used as a subproject within git.git our Makefile must honor the gitexecdir which git.git's Makefile is passing down to us, ensuring that we install our executables into the libexec chosen by the end-user or packager. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 February 2007, 20:37:50 UTC |
| d63ea11 | Michael Loeffler | 12 February 2007, 14:17:11 UTC | import-tars: brown paper bag fix for file mode. There is a bug with this $git_mode variable which should be 0644 or 0755, but nothing else I think. Signed-off-by: Michael Loeffler <zvpunry@zvpunry.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 February 2007, 17:19:45 UTC |
| ea5e370 | Shawn O. Pearce | 12 February 2007, 09:08:43 UTC | fast-import: Support reusing 'from' and brown paper bag fix reset. It was suggested on the mailing list that being able to use `from` in any commit to reset the current branch is useful in some types of importers, such as a darcs importer. We originally did not permit resetting an existing branch with a new `from` command during a `commit` command, but this restriction was only to help debug the hacked up cvs2svn that Jon Smirl was developing in parallel with git-fast-import. It is probably more of a problem to disallow it than to allow it. So now we permit a `from` during any `commit`. While making the changes required to permit multiple `from` commands on the same branch, I discovered we no longer needed the last_commit field to be set to 0 during a reset, so that was removed. (Reset was originally setting the field to 0 to signal cmd_from() that it was OK to execute on the branch.) While poking around in this section of fast-import I also realized the `reset` command was not working as intended if the corresponding `from` command was omitted (as allowed by the BNF grammar and the code). If `from` was omitted we cleared out the tree but we left the tree SHA-1 and parent commit SHA-1 intact. This is not what the user intended in this case. Instead they would be trying to reset the branch to have no parent and to have no tree, making the branch look new-born during the next commit. We now clear these SHA-1 values during `reset`, ensuring the branch looks new-born if `from` does not get supplied. New test cases for these were also added. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 February 2007, 17:17:31 UTC |
| b4d2b04 | Junio C Hamano | 12 February 2007, 07:04:00 UTC | Merge git-gui This merges git-gui project of Shawn as a subproject of git.git at git-gui/ subdirectory. This merge only melds two histories together. The toplevel Makefile does not even know about git-gui yet. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2007, 07:04:00 UTC |
| 4853534 | Junio C Hamano | 12 February 2007, 06:29:12 UTC | Add discussion section to git-tag documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2007, 06:29:12 UTC |
| 2092a1f | Junio C Hamano | 12 February 2007, 06:05:36 UTC | Teach git-am to pass -p option down to git-apply This is originally from Andy Parkins whose patch used --patchdepth; let's use -p which is more in line with the underlying git-apply. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2007, 06:05:36 UTC |
| c5c3fc9 | Junio C Hamano | 12 February 2007, 06:03:55 UTC | Documentation: git-rebase -C<n> Replace -CNUM in Synopsis section with -C<n> to make it consistent with the description text. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 February 2007, 06:03:55 UTC |
| b578e50 | Junio C Hamano | 12 February 2007, 04:34:57 UTC | Merge branch 'master' of git://repo.or.cz/git/fastimport * 'master' of git://repo.or.cz/git/fastimport: bash: Hide git-fast-import. fast-import: Add tip about importing renames. fast-import: Hide the pack boundary commits by default. | 12 February 2007, 04:34:57 UTC |
| c6ec3b1 | Shawn O. Pearce | 12 February 2007, 00:55:22 UTC | bash: Hide git-fast-import. The new git-fast-import command is not intended to be invoked directly by an end user. So offering it as a possible completion for a subcommand is not very useful. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 February 2007, 00:55:22 UTC |
| c734615 | Shawn O. Pearce | 12 February 2007, 00:50:50 UTC | fast-import: Add tip about importing renames. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 February 2007, 00:50:50 UTC |
| bdf1c06 | Shawn O. Pearce | 12 February 2007, 00:45:56 UTC | fast-import: Hide the pack boundary commits by default. Most users don't need the pack boundary information that fast-import was printing to standard output, especially if they were calling it with --quiet. Those users who do want this information probably want it captured so they can go back and use it to repack the imported repository. So dumping the boundary commits to a log file makes more sense then printing them to standard output. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 February 2007, 00:45:56 UTC |
| 0960f7d | Shawn O. Pearce | 11 February 2007, 22:19:38 UTC | git-gui: Stop deleting gitk preferences. Now that git 1.5.0 and later contains a version of gitk that uses correct geometry on Windows platforms, even if ~/.gitk exists, we should not delete the user's ~/.gitk to work around the bug. It is downright mean to remove a user's preferences for another app. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 11 February 2007, 22:19:38 UTC |
| d414461 | Michael S. Tsirkin | 09 February 2007, 10:23:23 UTC | Document that git-am can read standard input. Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2007, 22:07:47 UTC |
| 602598f | Mark Levedahl | 09 February 2007, 03:22:24 UTC | Make gitk save and restore the user set window position. gitk was saving widget sizes and positions when the main window was destroyed, which is after all child widgets are destroyed. The cure is to trap the WM_DELETE_WINDOW event before the gui is torn down. Also, the saved geometry was captured using "winfo geometry .", rather than "wm geometry ." Under Linux, these two return different answers and the latter one is correct. [jc: credit goes to Brett Schwarz for suggesting the use of "wm protocol"; I also squashed the follow-up patch to remove extraneous -0 from expressions.] Signed-off-by: Mark Levedahl <mdl123@verizon.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2007, 21:47:55 UTC |
| 7887432 | Junio C Hamano | 11 February 2007, 21:28:42 UTC | t4016: test quoting funny pathnames in diff output Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2007, 21:28:42 UTC |
| e5bfbf9 | Alexandre Julliard | 10 February 2007, 14:39:00 UTC | diff.c: More logical file name quoting for renames in diffstat. Quote both file names separately when printing a rename, yielding something like "foo" => "bar" instead of the current "foo => bar" Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2007, 21:08:10 UTC |
| 0d26a64 | Alexandre Julliard | 10 February 2007, 14:37:48 UTC | diff.c: Properly quote file names in diff --summary output. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2007, 20:53:05 UTC |
| b9f4416 | Alexandre Julliard | 10 February 2007, 14:36:47 UTC | diff.c: Reuse the pprint_rename function for diff --summary output. This avoids some code duplication, and yields more readable results for directory renames. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2007, 20:47:22 UTC |
| 1187d75 | Dotan Barak | 11 February 2007, 15:54:40 UTC | Make it easier to override path to asciidoc command Allow setting the path of asciidoc in only one place when creating the documentation. Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2007, 20:44:09 UTC |
| 4f75b11 | Ren,bi(B Scharfe | 11 February 2007, 13:29:58 UTC | Avoid ugly linewrap in git help Some of the short help texts that are shown e.g. when running 'git' without any parameters wrap on a 80-column terminal. They are just one character over the line. This patch avoids it by decreasing the number of spaces around the preceding command name from four to three (on both sides for symmetry). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2007, 20:42:01 UTC |
| b4f020c | Mukund | 10 February 2007, 18:12:01 UTC | Fixed some typos in git-repack docs Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2007, 06:48:57 UTC |
| 7774284 | Eric Wong | 11 February 2007, 05:07:12 UTC | git-svn: correctly handle boolean options via git-config We don't append a space after '--bool', so we can't expect a regular expression to match the space. Semi-noticed by Junio C Hamano :) Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2007, 06:48:18 UTC |
| dfd42a3 | Theodore Ts'o | 11 February 2007, 00:33:58 UTC | Allow aliases to expand to shell commands If the alias expansion is prefixed with an exclamation point, treat it as a shell command which is run using system(3). Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2007, 06:46:34 UTC |
| f3dd015 | Theodore Ts'o | 11 February 2007, 00:33:57 UTC | Print a sane error message if an alias expands to an invalid git command Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 February 2007, 06:46:30 UTC |
| 471efb0 | Junio C Hamano | 10 February 2007, 06:18:19 UTC | diff_flush_name(): take struct diff_options parameter. Among the low-level output functions called from flush_one_pair(), this was the only function that did not take (filepair, options) as arguments. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 February 2007, 06:43:02 UTC |
| cc46a74 | Junio C Hamano | 10 February 2007, 00:22:42 UTC | wt_status_prepare(): clean up structure initialization. Otherwise it would be a pain to add members to it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 February 2007, 00:26:02 UTC |
| 02f571c | Junio C Hamano | 09 February 2007, 23:41:35 UTC | git-fetch: document automatic tag following. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 23:41:35 UTC |
| ad34a02 | Nicolas Pitre | 09 February 2007, 17:18:28 UTC | remove mailmap.linux This file is incomplete, unmaintained, and it doesn't belong in the GIT package anyway. A more complete version is already included in the Linux -mm tree and is about to make its way into mainline RSN. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 20:14:40 UTC |
| d258985 | David Kågedal | 09 February 2007, 08:22:19 UTC | git-blame.el: Autoupdate while editing This adds the support for automatically updating the buffer while editing. A configuration variable git-blame-autoupdate controls whether this should be enabled or not. Signed-off-by: David Kågedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 08:52:53 UTC |
| 96df551 | David Kågedal | 09 February 2007, 08:21:51 UTC | git-blame.el: Doc fixes and cleanup Signed-off-by: David Kågedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 08:52:53 UTC |
| f0f39bb | David Kågedal | 09 February 2007, 08:21:32 UTC | git-blame.el: blame unsaved changes Make git-blame use the current buffer contents for the blame, instead of the saved file. This makes the blame correct even if there are unsaved changes. Also added a git-reblame command. Signed-off-by: David Kågedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 08:52:53 UTC |
| fa88211 | David Kågedal | 09 February 2007, 08:21:03 UTC | git-blame.el: improve color handling Signed-off-by: David Kågedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 08:52:52 UTC |
| 9f85fb3 | David Kågedal | 09 February 2007, 08:20:38 UTC | Handle uncommitted changes and cache descriptions Signed-off-by: David Kågedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 08:52:52 UTC |
| f6f125f | Jakub Narebski | 09 February 2007, 08:19:59 UTC | git-blame: Change installation instructions Change installation instructions to using either "(require 'git-blame)" or appropriate autoload instruction in GNU Emacs init file, .emacs This required adding "(provide 'git-blame)" at the end of git-blame.el and adding [preliminary] docstring to `git-blame-mode' function for consistency (to mark function as interactive in `autoload' we have to provide docstring as DOCSTRING is third arg, and INTERACTIVE fourth, and both are optional). `git-blame-mode' is marked to autoload. While at it ensure that we add `git-blame-mode' to `minor-mode-alist' only once (in a way that does not depend on `cl' package). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 08:52:52 UTC |
| b52ba1a | Jakub Narebski | 09 February 2007, 08:19:28 UTC | git-blame: Add Emacs Lisp file headers and GNU GPL boilerplate Add Emacs Lisp file headers, according to "Coding Conventions" chapter in Emacs Lisp Reference Manual and Elisp Area Convetions for EmacsWiki: http://www.emacswiki.org/cgi-bin/wiki/ElispAreaConventions Those include: copyright notice, GNU GPL boilerplate, description and instalation instructions as provided in email and in commit message introducing git-blame.el, compatibility notes from another email by David Kågedal about what to change to use it in GNU Emacs 20, and "git-blame ends here" to detect if file was truncated. First line includes setting file encoding via first line local variable values (file variables). Added comment to "(require 'cl)" to note why it is needed; "Coding Conventions" advises to avoid require the `cl' package of Common Lisp extensions at run time. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 08:52:52 UTC |
| 9e2586f | Junio C Hamano | 09 February 2007, 07:35:43 UTC | Documentation/git-pull: describe default behaviour and config interactions The way 'git pull' without explicit parameters work were not explained well in any existing documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 07:35:43 UTC |
| d585e78 | Shawn O. Pearce | 09 February 2007, 07:28:32 UTC | git-gui: Focus into blame panels on Mac OS. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 February 2007, 07:28:32 UTC |
| 40facde | Junio C Hamano | 09 February 2007, 07:24:51 UTC | reflog: handle $name => remotes/%s/HEAD mapping consistently for logs When refs/remotes/gfi/master and refs/remotes/gfi/HEAD exist, and the latter is a symref that points at the former, dwim_ref() resolves string "gfi" to "refs/remotes/gfi/master" as expected, but dwim_log() does not understand "gfi@{1.day}" and needs to be told "gfi/master@{1.day}". This is confusing. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 07:24:51 UTC |
| 486ef52 | Shawn O. Pearce | 09 February 2007, 06:59:38 UTC | git-gui: Improve annotated file display. Rather than trying to mark the background color of the line numbers to show which lines have annotated data loaded, we now show a ruler between the line numbers and the file data. This ruler is just 1 character wide and its background color is set to grey to denote which lines have annotation ready. I had to make this change as I kept loosing the annotation marker when a line was no longer colored as part of the current selection. We now color the lines blamed on the current commit in yellow, the lines in the commit which came after (descendant) in red (hotter, less tested) and the lines in the commit before (ancestor) in blue (cooler, better tested). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 February 2007, 06:59:38 UTC |
| 1351ba1 | Shawn O. Pearce | 09 February 2007, 03:41:51 UTC | git-gui: Jump to the first annotation block as soon as its available. To help clue users into the fact that annotation data arrives incrementally, and that they should try to locate the region they want while the tool is running, we jump to the first line of the first annotation if the user has not already clicked on a line they are interested in and if the window is still looking at the very top of the file. Since it takes a second (at least on my PowerBook) to even generate the first annotation for git-gui.sh, the user should have plenty of time to adjust the scrollbar or click on a line even before we get that first annotation record in, which allows the user to bypass our automatic jumping. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 February 2007, 03:41:51 UTC |
| 6910ae8 | Shawn O. Pearce | 09 February 2007, 02:39:27 UTC | git-gui: Redesign the display of annotated files. Using 180 columns worth of screen space to display just 20 columns of file data and 160 columns worth of annotation information is not practically useful. Users need/want to see the file data, and have the anotation associated with it displayed in a detail pane only when they have focused on a particular region of the file. Now our file viewer has a small 10-line high pane below the file which shows the commit message for the commit this line was blamed on. The columns have all been removed, except the current line number column as that has some real value when trying to locate an interesting block. To keep the user entertained we have a progress meter in the status bar of the viewer which lets them know how many lines have been annotated, and how much has been completed. We use a grey background on the line numbers for lines which we have obtained annotation from, and we color all lines in the current commit with a yellow background, so they stand out when scanning through the file. All other lines are kept with a white background, making the yellow really pop. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 February 2007, 02:39:27 UTC |
| eb3a482 | Johannes Schindelin | 09 February 2007, 00:28:23 UTC | log --reflog: use dwim_log Since "git log origin/master" uses dwim_log() to match "refs/remotes/origin/master", it makes sense to do that for "git log --reflog", too. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 01:48:22 UTC |
| e00de24 | Johannes Schindelin | 09 February 2007, 00:43:54 UTC | format-patch -n: make sorting easier by padding number Now, when format-patch outputs more than 9 patches, the numbers are padded accordingly. Example: [PATCH 009/167] The 9th patch of a series of 167 Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 01:47:38 UTC |
| df6287e | Shawn O. Pearce | 09 February 2007, 00:53:36 UTC | git-gui: Use git-config now over git-repo-config. Now that core Git has "renamed" git-repo-config to git-config, we should do the same. I don't know how long core Git will keep the repo-config command, and since git-gui's userbase is so small and almost entirely on some flavor of 1.5.0-rc2 or later, where the rename has already taken place, it should be OK to rename now. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 February 2007, 00:53:36 UTC |
| 24d2bf2 | Shawn O. Pearce | 09 February 2007, 00:44:49 UTC | git-gui: Relabel the Add All action. One user that I spoke with recently was confused why the 'Add All' button did not add all of his 'Changed But Not Updated' files. The particular files in question were new, and thus not known to Git. Since the 'Add All' routine only updates files which are already tracked, they were not added automatically. I suspect that calling this action 'Add Existing' would be less confusing, so I'm renaming it. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 February 2007, 00:44:49 UTC |
| 258871d | Shawn O. Pearce | 09 February 2007, 00:41:32 UTC | git-gui: Select subcommands like git does. If we are invoked as `git-foo`, then we should run the `foo` subcommand, as the user has made some sort of link from `git-foo` to our actual program code. So we should honor their request. If we are invoked as `git-gui foo`, the user has not made a link (or did, but is not using it right now) so we should execute the `foo` subcommand. We now can start the single commit UI mode via `git-citool` and also through `git gui citool`. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 February 2007, 00:41:32 UTC |
| 4e244cb | Johannes Schindelin | 08 February 2007, 20:58:33 UTC | log --reflog: honour --relative-date If you say "git log -g --relative-date", it is very likely that you want to see the reflog names in terms of a relative date. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 00:20:52 UTC |
| 2ebba52 | Shawn O. Pearce | 09 February 2007, 00:10:52 UTC | git-gui: View blame from the command line. Viewing annotated files is one of those tasks that is relatively difficult to do in a simple vt100 terminal emulator. The user really wants to be able to browse through a lot of information, and to interact with it by navigating through revisions. Now users can start our file viewer with annotations by running 'git gui blame commit path', thereby seeing the contents of the given file at the given commit. Right now I am being lazy by not allowing the user to omit the commit name (and have us thus assume HEAD). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 February 2007, 00:10:52 UTC |
| b4dd485 | Johannes Schindelin | 08 February 2007, 23:59:47 UTC | for_each_reflog_ent: be forgiving about missing message Some reflogs are/were generated without a message; do not plainly ignore those entries. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 February 2007, 00:06:10 UTC |
| 05b07ab | Junio C Hamano | 08 February 2007, 23:47:08 UTC | Merge branch 'master' of git://repo.or.cz/git/fastimport * 'master' of git://repo.or.cz/git/fastimport: tar archive frontend for fast-import. Correct spelling of fast-import in docs. Correct some language in fast-import documentation. Correct ^0 asciidoc syntax in fast-import docs. | 08 February 2007, 23:47:08 UTC |
| cf39f54 | Linus Torvalds | 08 February 2007, 17:51:56 UTC | git reflog show It makes "git reflog [show]" act as git log -g --pretty=oneline --abbrev-cmit and is fairly straightforward. So you can just write git reflog or git reflog show and it will show you the reflog in a nice format. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 February 2007, 23:35:24 UTC |
| 67dad68 | Michael S. Tsirkin | 08 February 2007, 13:57:08 UTC | add -C[NUM] to git-am Add -C[NUM] to git-am and git-rebase so that patches can be applied even if context has changed a bit. Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 February 2007, 23:23:52 UTC |
| 66e788b | Michael S. Tsirkin | 08 February 2007, 23:22:21 UTC | Update git-log and git-show documentation Point at where the options not so frequently used are found. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 February 2007, 23:22:21 UTC |
| db7f34d | Shawn O. Pearce | 08 February 2007, 22:47:17 UTC | git-gui: Optionally save commit buffer on exit. If the commit area does not exist, don't save the commit message to a file, or the window geometry. The reason I'm doing this is I want to make the main window entirely optional, such as if the user has asked us to show a blame from the command line. In such cases the commit area won't exist and trying to get its text would cause an error. If we are running without the commit message area, we cannot save our window geometry either, as the root window '.' won't be a normal commit window. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 February 2007, 23:14:44 UTC |
| 64a906f | Shawn O. Pearce | 08 February 2007, 23:10:05 UTC | git-gui: Separate transport/branch menus from multicommit. These are now controlled by the transport and branch options, rather than the multicommit option. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 February 2007, 23:10:05 UTC |
| cf25ddc | Shawn O. Pearce | 08 February 2007, 23:03:41 UTC | git-gui: Refactor single_commit to a proc. This is a minor code cleanup to make working with what used to be the $single_commit flag easier. Its also to better handle various UI configurations, depending on command line parameters given by the user, or perhaps user preferences. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 February 2007, 23:03:41 UTC |
| 42b922f | Shawn O. Pearce | 08 February 2007, 22:13:51 UTC | git-gui: Replace \ with \\ when showing paths. We already replace \n with \\n so that Tk widgets don't start a new display line with part of a file path which is just unlucky enough to contain an LF. But then its confusing to read a path whose name actually contains \n as literal characters. Escaping \ to \\ would make that case display as \\n, clarifying the output. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 February 2007, 22:13:51 UTC |
| 9bccb78 | Shawn O. Pearce | 08 February 2007, 22:07:59 UTC | git-gui: Support keyboard traversal in browser. Users want to navigate the file list shown in our branch browser windows using the keyboard. So we now support basic traversal with the arrow keys: Up/Down: Move the "selection bar" to focus on a different name. Return: Move into the subtree, or open the annotated file. M1-Right: Ditto. M1-Up: Move to the parent tree. M1-Left: Ditto. Probably the only feature missing from this is to key a leading part of the file name and jump directly to that file (or subtree). This change did require a bit of refactoring, to pull the navigation logic out of the mouse click procedure and into more generic routines which can also be used in bindings. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 February 2007, 22:07:59 UTC |
| 63faf4d | Shawn O. Pearce | 08 February 2007, 20:59:39 UTC | git-gui: Update known branches during rescan. If the user has created (or deleted) a branch through an external tool, and uses Rescan, they probably are trying to make git-gui update to show their newly created branch. So now we load all known heads and update the branch menu during any rescan operation, just in-case the set of known branches was modified. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 February 2007, 20:59:39 UTC |
| 590dd4b | Shawn O. Pearce | 08 February 2007, 20:26:01 UTC | tar archive frontend for fast-import. This is an example fast-import frontend, in less than 100 lines of Perl. It accepts one or more tar archives on the command line, passes them through gzcat/bzcat/zcat if necessary, parses out the individual file headers and feeds all contained data to fast-import. No temporary files are involved. Each tar is treated as one commit, with the commit timestamp coming from the oldest file modification date found within the tar. Each tar is also tagged with an annotated tag, using the basename of the tar file as the name of the tag. Currently symbolic links and hard links are not handled by the importer. The file checksums are also not verified. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 February 2007, 20:37:53 UTC |
| 882227f | Shawn O. Pearce | 08 February 2007, 18:49:06 UTC | Correct spelling of fast-import in docs. Its spelled 'fast-import', not 'gfi'. Linus and Dscho have both recently pointed this out to me on the mailing list. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 February 2007, 18:49:06 UTC |
| ed35dec | James Bowes | 07 February 2007, 22:57:43 UTC | Read cvsimport options from repo-config Default values for command line options can be saved in .git/config (or the global ~/.gitconfig). Config option names match the command line option names, so cvsimport.d corresponds to git-cvsimport -d. One may also set cvsimport.module to specify a default cvs module name. Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 February 2007, 07:54:25 UTC |
| d48744d | Junio C Hamano | 08 February 2007, 07:41:43 UTC | create_symref(): create leading directories as needed. Otherwise "git remote add -t master -m master" without the initial fetch would not work. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 February 2007, 07:41:43 UTC |
| f842fdb | Shawn O. Pearce | 08 February 2007, 06:53:48 UTC | Correct some language in fast-import documentation. Minor documentation improvements, as suggested on the Git mailing list by Horst H. von Brand and Karl Hasselström. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 February 2007, 06:54:42 UTC |
| 209f129 | Shawn O. Pearce | 08 February 2007, 06:35:37 UTC | Correct ^0 asciidoc syntax in fast-import docs. I wrote this documentation with asciidoc 7.1.2, but apparently asciidoc 8 assumes ^ means superscript. The solution was already documented in rev-parse's manpage and is to use {caret} instead. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 February 2007, 06:35:37 UTC |
| 5c553ea | Junio C Hamano | 07 February 2007, 22:31:21 UTC | GIT v1.5.0-rc4 Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2007, 22:31:46 UTC |
| 81f915e | Junio C Hamano | 07 February 2007, 22:30:47 UTC | Documentation: Add gfi to the main command list. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2007, 22:30:47 UTC |
| abd4e22 | Linus Torvalds | 07 February 2007, 19:49:56 UTC | Fix "git log -z" behaviour For commit messages, we should really put the "line_termination" when we output the character in between different commits, *not* between the commit and the diff. The diff goes hand-in-hand with the commit, it shouldn't be separated from it with the termination character. So this: - uses the termination character for true inter-commit spacing - uses a regular newline between the commit log and the diff We had it the other way around. For the normal case where the termination character is '\n', this obviously doesn't change anything at all, since we just switched two identical characters around. So it's very safe - it doesn't change any normal usage, but it definitely fixes "git log -z". By fixing "git log -z", you can now also do insane things like git log -p -z | grep -z "some patch expression" | tr '\0' '\n' | less -S and you will see only those commits that have the "some patch expression" in their commit message _or_ their patches. (This is slightly different from 'git log -S"some patch expression"', since the latter requires the expression to literally *change* in the patch, while the "git log -p -z | grep .." approach will see it if it's just an unchanged _part_ of the patch context) Of course, if you actually do something like the above, you're probably insane, but hey, it works! Try the above command line for a demonstration (of course, you need to change the "some patch expression" to be something relevant). The old behaviour of "git log -p -z" was useless (and got things completely wrong for log entries without patches). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2007, 19:58:07 UTC |
| a4f7112 | Junio C Hamano | 07 February 2007, 18:56:38 UTC | git-add -i: update removed path correctly. Earlier, when a path that was removed from the working tree was chosen for update subcommand, you got an error like this: error: git-resolve.sh: does not exist and --remove not passed fatal: Unable to process file git-resolve.sh Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2007, 18:56:38 UTC |
| fa1b4d2 | Junio C Hamano | 07 February 2007, 18:42:08 UTC | t4200: skip gc-rerere test on systems with non GNU date. Quite nonstandard "date -d @11111111 +%s" does not even fail on OpenBSD but gives the current date in "seconds since epoch" format, which is useless for the purpose of this test. We want to make sure that this returns exactly the same input before proceeding. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2007, 18:43:56 UTC |
| ecea1ed | Junio C Hamano | 07 February 2007, 17:47:49 UTC | Merge branch 'ml/gitk' (early part) * 'ml/gitk' (early part): gitk: Use show-ref instead of ls-remote Make gitk work reasonably well on Cygwin. gitk - remove trailing whitespace from a few lines. | 07 February 2007, 17:47:49 UTC |
| 40db58b | Johannes Schindelin | 07 February 2007, 11:38:21 UTC | fast-import: Fix compile warnings Not on all platforms are size_t and unsigned long equivalent. Since I do not know how portable %z is, I play safe, and just cast the respective variables to unsigned long. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2007, 17:28:23 UTC |
| fcee5a1 | Junio C Hamano | 07 February 2007, 17:18:57 UTC | for-each-reflog: fix case for empty log directory When we remove the last reflog in a directory, opendir() would succeed and we would iterate over its dirents, expecting retval to be initialized to zero and setting it to non-zero only upon seeing an error. If the directory is empty, oops!, we do not have anybody that touches retval. The problem is because we initialize retval to errno even on success from opendir(), which would leave the errno unmolested. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2007, 17:18:57 UTC |
| 302da67 | Junio C Hamano | 07 February 2007, 16:39:16 UTC | Merge branch 'master' of git://repo.or.cz/git/fastimport * 'master' of git://repo.or.cz/git/fastimport: Add a Tips and Tricks section to fast-import's manual. Don't crash fast-import if the marks cannot be exported. Dump all refs and marks during a checkpoint in fast-import. Teach fast-import how to sit quietly in the corner. Teach fast-import how to clear the internal branch content. Minor timestamp related documentation corrections for fast-import. | 07 February 2007, 16:39:16 UTC |
| 099c783 | Junio C Hamano | 07 February 2007, 10:10:56 UTC | git-clone --reference: work well with pack-ref'ed reference repository Earlier we only used loose refs to anchor already existing objects. When cloning from a repository that forked relatively long time ago from the reference repository, this made the want/have exchange by fetch-pack to do unnecessary work. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 February 2007, 10:10:56 UTC |
