| 0d9b9ab | Junio C Hamano | 26 February 2007, 07:58:50 UTC | GIT 1.5.0.2 Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 February 2007, 08:26:06 UTC |
| 4e5104c | Pavel Roskin | 21 February 2007, 05:03:36 UTC | git-remote: support remotes with a dot in the name [jc: the original from Pavel was limiting the variable names to only fetch and url, but I loosened it to take valid variable names.] [jc: cherry-picked from 'master', since people seem to be reinventing this many times.] Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 February 2007, 08:24:41 UTC |
| c5ddca1 | Junio C Hamano | 26 February 2007, 07:26:11 UTC | Documentation: describe "-f/-t/-m" options to "git-remote add" Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 February 2007, 07:50:29 UTC |
| 4fc970c | Junio C Hamano | 26 February 2007, 06:24:47 UTC | diff --cc: fix display of symlink conflicts during a merge. "git-diff-files --cc" to show conflicts during merge did not pass the correct mode information for the working tree down, and showed bogus combined diff. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 February 2007, 06:25:30 UTC |
| 0b1f647 | Junio C Hamano | 26 February 2007, 03:09:59 UTC | Merge branch 'jc/merge-symlink' into maint * jc/merge-symlink: merge-recursive: fix longstanding bug in merging symlinks merge-index: fix longstanding bug in merging symlinks | 26 February 2007, 03:09:59 UTC |
| 17cd29b | Junio C Hamano | 26 February 2007, 02:42:07 UTC | merge-recursive: fix longstanding bug in merging symlinks Commit 3af244ca added unlink(2) before running symlink(2) to update the working tree with the merge result, but it was unlinking a wrong path. This resulted in loss of the path pointed by a symlink. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 February 2007, 03:08:48 UTC |
| 308efc1 | Junio C Hamano | 26 February 2007, 02:17:15 UTC | merge-index: fix longstanding bug in merging symlinks Ancient commit e2b6a9d0 added code to pass "file modes" from merge-index to merge-one-file, and then later commit 54dd99a1 wanted to make sure we do not end up creating a nonsense symlink that points at a path whose name contains conflict markers. However, nobody noticed that the code in merge-index added by e2b6a9d0 were stripping the S_IFMT bits and the code in 54dd99a1 was meaningless. This fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 February 2007, 03:08:48 UTC |
| d2dc622 | Junio C Hamano | 25 February 2007, 18:53:42 UTC | Add Release Notes to prepare for 1.5.0.2 Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 February 2007, 18:53:42 UTC |
| ffa84ff | Roland Dreier | 25 February 2007, 17:34:27 UTC | Allow arbitrary number of arguments to git-pack-objects If a repository ever gets in a situation where there are too many packs (more than 60 or so), perhaps because of frequent use of git-fetch -k or incremental git-repack, then it becomes impossible to fully repack the repository with git-repack -a. That command just dies with the cryptic message fatal: too many internal rev-list options This message comes from git-pack-objects, which is passed one command line option like --unpacked=pack-<SHA1>.pack for each pack file to be repacked. However, the current code has a static limit of 64 command line arguments and just aborts if more arguments are passed to it. Fix this by dynamically allocating the array of command line arguments, and doubling the size each time it overflows. Signed-off-by: Roland Dreier <roland@digitalvampire.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 February 2007, 18:50:12 UTC |
| 1289172 | Junio C Hamano | 25 February 2007, 09:29:43 UTC | rerere: do not deal with symlinks. Who would use multi-line symlinks that would benefit from rerere? Just ignore them. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 February 2007, 09:29:43 UTC |
| ab242f8 | Junio C Hamano | 25 February 2007, 09:24:34 UTC | rerere: do not skip two conflicted paths next to each other. The code forgot to take the for (;;) loop control into account, incrementing the index once too many. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 February 2007, 09:28:44 UTC |
| cef19c7 | Junio C Hamano | 25 February 2007, 07:33:12 UTC | Merge git://repo.or.cz/git-gui into maint * git://repo.or.cz/git-gui: Don't modify CREDITS-FILE if it hasn't changed. | 25 February 2007, 07:33:12 UTC |
| 92446ab | Junio C Hamano | 25 February 2007, 07:18:11 UTC | Don't modify CREDITS-FILE if it hasn't changed. We should always avoid rewriting a built file during `make install` if nothing has changed since `make all`. This is to help support the typical installation process of compiling a package as yourself, then installing it as root. Forcing CREDITS-FILE to be always be rebuilt in the Makefile means that CREDITS-GEN needs to check for a change and only update CREDITS-FILE if the file content actually differs. After all, content is king in Git. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 25 February 2007, 07:18:26 UTC |
| 5089277 | Junio C Hamano | 23 February 2007, 11:44:30 UTC | diff-patch: Avoid emitting double-slashes in textual patch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 February 2007, 09:26:52 UTC |
| b1440cc | Junio C Hamano | 24 February 2007, 09:05:27 UTC | Reword git-am 3-way fallback failure message. When the blobs recorded on the index lines in the patch as pre-image blobs are not found in the repository, "git-am" punted saying that the index line does not record anything useful. This was not clear enough -- the index line does have something useful but the problem was that it was not useful in _that_ repository. Reword the message as Francis Moreau suggests. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 February 2007, 09:06:19 UTC |
| c06d2da | Robin Rosenberg | 23 February 2007, 22:27:58 UTC | Limit filename for format-patch Badly formatted commits may have very long comments. This causes git-format-patch to fail. To avoid that, truncate the filename to a value we believe will always work. Err out if the patch file cannot be created. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 February 2007, 08:55:56 UTC |
| bdd69c2 | Santi Béjar | 23 February 2007, 16:03:43 UTC | core.legacyheaders: Use the description used in RelNotes-1.5.0 It explains what it does and why, and says how to use the new format. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 February 2007, 08:25:05 UTC |
| 8ab40a2 | Dmitry V. Levin | 23 February 2007, 17:12:33 UTC | git-show-ref --verify: Fail if called without a reference builtin-show-ref.c (cmd_show_ref): Fail if called with --verify option but without a reference. Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 February 2007, 08:17:38 UTC |
| 75b62b4 | Johannes Schindelin | 23 February 2007, 04:20:32 UTC | git-diff: fix combined diff The code forgets that typecast binds tighter than addition, in other words: (cast *)array + i === ((cast *)array) + i Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 February 2007, 05:24:34 UTC |
| 755b99d | Fredrik Kuivinen | 22 February 2007, 20:28:12 UTC | Fix 'git commit -a' in a newly initialized repository With current git: $ git init $ git commit -a cp: cannot stat `.git/index': No such file or directory Output a nice error message instead. Signed-off-by: Fredrik Kuivinen <frekui@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 February 2007, 05:02:39 UTC |
| 4917d2a | Shawn O. Pearce | 22 February 2007, 04:49:51 UTC | Include git-gui credits file in dist. The Makefile for the git-gui subproject will fail to execute if run outside of a git.git directory, such as when building from a .tar.gz or .tar.bz2. This is because it is looking for the credits file, which was created but omitted from the tarball by the toplevel Makefile. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 February 2007, 05:47:42 UTC |
| e4a15f4 | Shawn O. Pearce | 21 February 2007, 22:59:08 UTC | Document the new core.bare configuration option. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 February 2007, 00:39:09 UTC |
| 5bac4a6 | Junio C Hamano | 21 February 2007, 19:09:57 UTC | Merge branch 'master' of git://repo.or.cz/git-gui into maint * 'master' of git://repo.or.cz/git-gui: git-gui: Don't crash in citool mode on initial commit. git-gui: Remove TODO list. git-gui: Include browser in our usage message. git-gui: Change summary of git-gui. git-gui: Display all authors of git-gui. git-gui: Use mixed path for docs on Cygwin. git-gui: Correct crash when saving options in blame mode. git-gui: Expose the browser as a subcommand. git-gui: Create new branches from a tag. git-gui: Prefer version file over git-describe. git-gui: Print version on the console. git-gui: More consistently display the application name. git-gui: Permit merging tags into the current branch. git-gui: Basic version check to ensure git 1.5.0 or later is used. git-gui: Refactor 'exec git subcmd' idiom. | 21 February 2007, 19:09:57 UTC |
| c750da2 | Michael Loeffler | 14 February 2007, 16:03:12 UTC | Use gunzip -c over gzcat in import-tars example. Not everyone has gzcat or bzcat installed on their system, but gunzip -c and bunzip2 -c perform the same task and are available if the user has installed gzip support or bzip2 support. Signed-off-by: Michael Loeffler <zvpunry@zvpunry.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2007, 16:09:57 UTC |
| 9811937 | Shawn O. Pearce | 21 February 2007, 06:33:59 UTC | git-gui: Don't crash in citool mode on initial commit. Attempting to use `git citool` to create an initial commit caused git-gui to crash with a Tcl error as it tried to add the newly born branch to the non-existant branch menu. Moving this code to after the normal commit cleanup logic resolves the issue, as we only have a branch menu if we are not in singlecommit mode. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2007, 06:33:59 UTC |
| 7391b2e | Shawn O. Pearce | 21 February 2007, 06:29:05 UTC | git-gui: Remove TODO list. I'm apparently not very good at keeping my own TODO file current. I its also somewhat strange to keep the TODO list as part of the software branch, as its meta-information that is not directly related to the code. I'm pulling the TODO list from git-gui and moving it into a seperate branch. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2007, 06:29:05 UTC |
| c0f7a6c | Shawn O. Pearce | 21 February 2007, 06:24:57 UTC | git-gui: Include browser in our usage message. Now that the 'browser' subcommand can be used to startup the tree browser, it should be listed as a possible subcommand option in our usage message. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2007, 06:24:57 UTC |
| 019f42a | Shawn O. Pearce | 19 February 2007, 02:08:04 UTC | git-gui: Change summary of git-gui. Since git-gui does more than create commits, it is unfair to call it "a commit creation tool". Instead lets just call it a graphical user interface. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2007, 05:11:02 UTC |
| 871f4c9 | Shawn O. Pearce | 19 February 2007, 02:06:48 UTC | git-gui: Display all authors of git-gui. Now that git-gui has been released to the public as part of Git 1.5.0 I am starting to see some work from other people beyond myself and Paul. Consequently the copyright for git-gui is not strictly the two of us anymore, and these others deserve to have some credit given to them. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2007, 05:11:01 UTC |
| ee40599 | Shawn O. Pearce | 19 February 2007, 00:06:09 UTC | git-gui: Use mixed path for docs on Cygwin. The Firefox browser requires that a URL use / to delimit directories. This is instead of \, as \ gets escaped by the browser into its hex escape code and then relative URLs are incorrectly resolved, Firefox no longer sees the directories for what they are. Since we are handing the browser a true URL, we better use the standard / for directories. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2007, 05:11:01 UTC |
| 3efb1f3 | Jason Riedy | 21 February 2007, 01:34:56 UTC | Check for PRIuMAX rather than NO_C99_FORMAT in fast-import.c. Thanks to Simon 'corecode' Schubert <corecode@fs.ei.tum.de> for the clean-up. Defining the C99 standard PRIuMAX when necessary replaces UM_FMT and the awkward UM10_FMT. There are no direct C99 translations for other uses of NO_C99_FORMAT in git, alas. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 February 2007, 03:10:57 UTC |
| e326bce | Jason Riedy | 20 February 2007, 00:27:09 UTC | Obey NO_C99_FORMAT in fast-import.c. Define UM_FMT and UM10_FMT and use in place of %ju and %10ju, respectively. Both format as unsigned long long, so this assumes the compiler supports long long. Signed-off-by: Jason Riedy <jason@acm.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 February 2007, 02:20:49 UTC |
| bc6b4f5 | Jason Riedy | 20 February 2007, 00:22:56 UTC | Add a compat/strtoumax.c for Solaris 8. Solaris 8 was pre-c99, and they weren't willing to commit to the strtoumax definition according to /usr/include/inttypes.h. This adds NO_STRTOUMAX and NO_STRTOULL for ancient systems. If NO_STRTOUMAX is defined, the routine in compat/strtoumax.c will be used instead. That routine passes its arguments to strtoull unless NO_STRTOULL is defined. If NO_STRTOULL, then the routine uses strtoul (unsigned long). Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Acked-by: Shawn O Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 February 2007, 02:20:30 UTC |
| f496454 | Christian Schlotter | 19 February 2007, 12:35:35 UTC | git-clone: Sync documentation to usage note. Documentation advertises the new `--depth <n>' parameter with an equal sign, while the usage notes (shown after `git-clone --help') do not. If I understood git-clone's source code correctly, the version without the equal sign is correct, which is why this patch syncs documentation to the usage note. Signed-off-by: Christian Schlotter <schlotter@users.sourceforge.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 February 2007, 02:14:29 UTC |
| 4bc94d2 | Junio C Hamano | 19 February 2007, 00:18:43 UTC | GIT 1.5.0.1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 February 2007, 00:18:43 UTC |
| 38eb932 | Fredrik Kuivinen | 18 February 2007, 09:36:51 UTC | Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding Similarly for i18n.logoutputencoding. Signed-off-by: Fredrik Kuivinen <frekui@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 February 2007, 23:58:20 UTC |
| 256c3fe | Fredrik Kuivinen | 18 February 2007, 09:36:22 UTC | Read the config in rev-list Otherwise "git rev-list --header HEAD" will not do the right thing if i18n.commitencoding is set. Signed-off-by: Fredrik Kuivinen <frekui@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 February 2007, 23:58:08 UTC |
| 372ef95 | Shawn O. Pearce | 18 February 2007, 07:12:32 UTC | git-gui: Correct crash when saving options in blame mode. Martin Waitz noticed that git-gui crashed while saving the user's options out if the application was started in blame mode. This was caused by the do_save_config procedure invoking reshow_diff incase the number of context lines was modified by the user. Because we bypassed main window UI setup to enter blame mode we did not set many of the globals which were accessed by reshow_diff, and reading unset variables is an error in Tcl. Aside from moving the globals to be set earlier, I also modified reshow_diff to not invoke clear_diff if there is no path currently in the diff viewer. This way reshow_diff does not crash when in blame mode due to the $ui_diff command not being defined. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 18 February 2007, 07:12:32 UTC |
| 21b4875 | Junio C Hamano | 17 February 2007, 23:47:46 UTC | Update draft release notes for 1.5.0.1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 February 2007, 00:15:22 UTC |
| 460ca30 | Junio C Hamano | 18 February 2007, 00:13:08 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk into maint * git://git.kernel.org/pub/scm/gitk/gitk: Make gitk save and restore window pane position on Linux and Cygwin. Make gitk save and restore the user set window position. [PATCH] gitk: Use show-ref instead of ls-remote [PATCH] Make gitk work reasonably well on Cygwin. [PATCH] gitk - remove trailing whitespace from a few lines. Change git repo-config to git config | 18 February 2007, 00:13:17 UTC |
| d7f078b | Shawn O. Pearce | 17 February 2007, 09:43:42 UTC | Convert update-index references in docs to add. Since `git add` is the approved porcelain for an end-user to invoke when they want to manipulate the index, porcelain documentation should steer the user to this command rather than the pure plumbing update-index. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 February 2007, 18:20:27 UTC |
| 5ca2db5 | Shawn O. Pearce | 17 February 2007, 09:31:50 UTC | Attempt to improve git-rebase lead-in description. It was mentioned on #git this morning that the lead-in description of git-rebase is very confusing. Too many branch this and branch that in a very short run of text. This new description attempts to walk the user through the command syntax, while also describing exactly what git-rebase is doing to their repository. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 February 2007, 18:08:21 UTC |
| 185c975 | Junio C Hamano | 17 February 2007, 06:43:48 UTC | Do not take mode bits from index after type change. When we do not trust executable bit from lstat(2), we copied existing ce_mode bits without checking if the filesystem object is a regular file (which is the only thing we apply the "trust executable bit" business) nor if the blob in the index is a regular file (otherwise, we should do the same as registering a new regular file, which is to default non-executable). Noticed by Johannes Sixt. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 February 2007, 06:56:06 UTC |
| f442132 | Tommi Kyntola | 16 February 2007, 08:50:58 UTC | git-blame: prevent argument parsing segfault The 3rd branch in builtin-blame.c should also check for lacking arguments. Running that in top dir does not trigger the problem because the 'prefix' is NULL. Signed-off-by: Tommi Kyntola <tommi.kyntola@ray.fi> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 February 2007, 05:39:21 UTC |
| de6f0de | Junio C Hamano | 16 February 2007, 23:08:25 UTC | git-merge: minor fix for no_trivial_merge_strategies. The shell loop to determine if we should skip the trivial in-index merge stage based on what strategy is given was not prepared to have more than one strategy listed in the variable $no_trivial_merge_strategies. This does not trigger unless you use a modified git but the fix is simple and straightforward, so let's fix it before 1.5.0.1. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 February 2007, 23:08:25 UTC |
| b90d479 | Shawn O. Pearce | 16 February 2007, 05:24:03 UTC | git-gui: Expose the browser as a subcommand. Some users may find being able to browse around an arbitrary branch to be handy, so we now expose our graphical browser through `git gui browse <committish>`. Yes, I'm being somewhat lazy and making the user give us the name of the branch to browse. They can always enter HEAD. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 February 2007, 05:24:03 UTC |
| efa13f7 | Junio C Hamano | 16 February 2007, 01:02:06 UTC | pretend-sha1: grave bugfix. We stashed away objects that we pretend to have, but did not save the actual data. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 February 2007, 01:03:11 UTC |
| 101e3ae | Martin Koegler | 15 February 2007, 06:28:34 UTC | git-gui: Create new branches from a tag. I'm missing the possibility to base a new branch on a tag. The following adds a tag drop down to the new branch dialog. Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 15 February 2007, 06:34:40 UTC |
| 204d409 | Junio C Hamano | 14 February 2007, 19:33:04 UTC | GIT-VERSION-FILE: check ./version first. When somebody else extracts git tarball inside a larger project, 'git describe' would reported the version number of that upper level project. Sometimes, using the consistent versioning across subdirectories of a larger project is useful, but it may not always be the right thing to do. This changes the script to check ./vertion file first, and then fall back to "git describe". This way, by default, tarball distribution will get our own version. If the upper level wants to use consistent versioning across its subdirectories, its Makefile can overwrite ./version file to force whatever version number they want to give us before descending into us. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2007, 23:25:27 UTC |
| 78a28df | Alexandre Julliard | 14 February 2007, 17:11:40 UTC | sha1_file.c: Round the mmap offset to half the window size. This ensures that a given area is mapped at most twice, and greatly reduces the virtual address space usage. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2007, 23:22:08 UTC |
| 9ca72f4 | 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> | 14 February 2007, 22:13:14 UTC |
| b6047c5 | 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> | 14 February 2007, 22:12:53 UTC |
| 7426eb7 | Junio C Hamano | 30 January 2007, 05:53:28 UTC | [PATCH] gitk: Use show-ref instead of ls-remote It used to be ls-remote on self was the only easy way to grab the ref information. Now we have show-ref which does not involve fork and IPC, so use it. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Paul Mackerras <paulus@samba.org> | 14 February 2007, 22:01:59 UTC |
| e9937d2 | Junio C Hamano | 01 February 2007, 13:46:38 UTC | [PATCH] Make gitk work reasonably well on Cygwin. The gitk gui layout was completely broken on Cygwin. If gitk was started without previous geometry in ~/.gitk, the user could drag the window sashes to get a useable layout. However, if ~/.gitk existed, this was not possible at all. The fix was to rewrite makewindow, changing the toplevel containers and the particular geometry information saved between sessions. Numerous bugs in both the Cygwin and the Linux Tk versions make this a delicate balancing act: the version here works in both but many subtle variants are competely broken in one or the other environment. Three user visible changes result: 1 - The viewer is fully functional under Cygwin. 2 - The search bar moves from the bottom to the top of the lower left pane. This was necessary to get around a layout problem on Cygwin. 3 - The window size and position is saved and restored between sessions. Again, this is necessary to get around a layout problem on Cygwin. Signed-off-by: Mark Levedahl <mdl123@verizon.net> Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Paul Mackerras <paulus@samba.org> | 14 February 2007, 21:57:14 UTC |
| 40b87ff | Mark Levedahl | 01 February 2007, 13:44:46 UTC | [PATCH] gitk - remove trailing whitespace from a few lines. Signed-off-by: Mark Levedahl <mdl123@verizon.net> Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Paul Mackerras <paulus@samba.org> | 14 February 2007, 21:57:14 UTC |
| 27cb61c | Paul Mackerras | 14 February 2007, 21:54:34 UTC | Change git repo-config to git config This is the gitk part of e0d10e1c63bc52b37bbec99b07deee794058d9b4 from Tom Prince. Signed-off-by: Paul Mackerras <paulus@samba.org> | 14 February 2007, 21:54:34 UTC |
| 5faaf24 | Junio C Hamano | 14 February 2007, 21:20:41 UTC | Make sure packedgitwindowsize is multiple of (pagesize * 2) The next patch depends on this. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2007, 21:20:41 UTC |
| bd07326 | Junio C Hamano | 14 February 2007, 19:01:41 UTC | Add RelNotes 1.5.0.1 In the same spirit as commit 6fc66686, let's keep notes as we fix things. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2007, 19:05:11 UTC |
| 37b73cf | Junio C Hamano | 14 February 2007, 18:54:25 UTC | Still updating 1.5.0 release notes. In cruft removal section we had a cruft we needed to remove. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2007, 18:55:24 UTC |
| 2027688 | Alexandre Julliard | 14 February 2007, 17:10:26 UTC | git-daemon: Avoid leaking the listening sockets into child processes. This makes it possible to restart git-daemon even if some children are still running. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2007, 18:25:41 UTC |
| 958545c | Junio C Hamano | 14 February 2007, 09:50:28 UTC | Clarify two backward incompatible repository options. It was unclear if the backward compatible features were disabled or the configuration variables that controls them were set to false by default from the description. Obviously we meant the former, but the problem was made worse by the fact that one configuration variable breaks compatibility when set to true and the other one breaks it when set to false. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2007, 09:50:28 UTC |
| 26370f7 | Shawn O. Pearce | 14 February 2007, 06:55:16 UTC | git-gui: Prefer version file over git-describe. Some distributions are using Git for part of their package management system, but unpack Git's own source code for delivery from the .tar.gz. This means that when we walk up the directory tree with git-describe to locate a Git repository, the repository we find is for the distribution and *not* for git-gui. Consequently any tag we might find there is bogus and does not apply to us. In this case the version file should always exist and be readable, as the packager is working from the released .tar.gz sources. So we should always favor the version file over anything git-describe guess for us. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 February 2007, 06:55:16 UTC |
| 4b02c52 | Junio C Hamano | 14 February 2007, 06:45:22 UTC | Makefile: update check-docs target Old aliases are not linked to the main command list. Also the internal git-add--interactive does not need to be on the list. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2007, 06:45:22 UTC |
| 727d38d | Junio C Hamano | 14 February 2007, 06:42:51 UTC | cmd-list: add git-remote Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2007, 06:42:51 UTC |
| 7a33631 | Junio C Hamano | 14 February 2007, 06:32:36 UTC | Documentation: Drop full-stop from git-fast-import title. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2007, 06:32:36 UTC |
| ed3adde | Shawn O. Pearce | 14 February 2007, 05:28:00 UTC | git-gui: Print version on the console. Like `git version`, `git gui version` (or `git gui --version`) shows the version of git-gui, in case the user needs to know this, without looking at it in the GUI about dialog. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 February 2007, 05:28:00 UTC |
| 5ac58f5 | Shawn O. Pearce | 14 February 2007, 05:10:20 UTC | git-gui: More consistently display the application name. I started to find it confusing that git-gui would refer to itself as git-citool when it was started through the citool hardlink, or with the citool subcommand. What was especially confusing was the options dialog and the about dialog, as both seemed to imply they were somehow different from the git-gui versions. In actuality there is no difference at all. Now we just call our options menu item 'Options...' (skipping the application name) and our About dialog now always shows git-gui within the short description (above the copyleft notice) and in the version field. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 February 2007, 05:10:20 UTC |
| a989a5e | Nicolas Pitre | 14 February 2007, 03:25:08 UTC | Minor corrections to release notes Update section about warning when leaving a detached head. Also fix a few indentations that weren't like the rest of the file. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 February 2007, 04:58:56 UTC |
| cdf6e08 | Shawn O. Pearce | 14 February 2007, 04:43:48 UTC | git-gui: Permit merging tags into the current branch. It was pointed out on the git mailing list by Martin Koegler that we did not show tags as possible things to merge into the current branch. They actually are, and core Git's Grand Unified Merge Driver will accept them just like any other commit. So our merge dialog now requests all refs/heads, refs/remotes and refs/tags named refs and attempts to match them against the commits not in HEAD. One complicating factor here is that we must use the %(*objectname) field when talking about an annotated tag, as they will not appear in the output of rev-list. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 February 2007, 04:43:48 UTC |
| 54acdd9 | Shawn O. Pearce | 14 February 2007, 04:15:25 UTC | git-gui: Basic version check to ensure git 1.5.0 or later is used. This is a very crude (but hopefully effective) check against the `git` executable found in our PATH. Some of the subcommands and options that git-gui requires to be present to operate were created during the 1.5.0 development cycle, so 1.5 is the minimum version of git that we can expect to support. There actually are early releases of 1.5 (e.g. 1.5.0-rc0) that don't have everything we expect (like `blame --incremental`) but these are purely academic at this point. 1.5.0 final was tagged and released just a few hours ago. The release candidates will (hopefully) fade into the dark quickly. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 February 2007, 04:15:25 UTC |
| 8134722 | Shawn O. Pearce | 13 February 2007, 03:48:56 UTC | git-gui: Refactor 'exec git subcmd' idiom. As we frequently need to execute a Git subcommand and obtain its returned output we are making heavy use of [exec git foo] to run foo. As I'm concerned about possibly needing to carry environment data through a shell on Cygwin for at least some subcommands, I'm migrating all current calls to a new git proc. This actually makes the code look cleaner too, as we aren't saying 'exec git' everywhere. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 14 February 2007, 02:32:52 UTC |
| 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 |
