Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
GIT 1.5.0.1 Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen
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>
Fredrik Kuivinen
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>
Junio C Hamano
Update draft release notes for 1.5.0.1 Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
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
Shawn O. Pearce
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>
Shawn O. Pearce
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 Hama…
Junio C Hamano
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. Signe…
Tommi Kyntola
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>
Junio C Hamano
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>
Junio C Hamano
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>
Junio C Hamano
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 defa…
Alexandre Julliard
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>
Mark Levedahl
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 redund…
Mark Levedahl
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…
Junio C Hamano
[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>
Junio C Hamano
[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 a…
Mark Levedahl
[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>
Paul Mackerras
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>
Junio C Hamano
Make sure packedgitwindowsize is multiple of (pagesize * 2) The next patch depends on this. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
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>
Junio C Hamano
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>
Alexandre Julliard
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>
Junio C Hamano
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…
Junio C Hamano
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>
Junio C Hamano
cmd-list: add git-remote Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Documentation: Drop full-stop from git-fast-import title. Signed-off-by: Junio C Hamano <junkio@cox.net>
Nicolas Pitre
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>
Junio C Hamano
GIT 1.5.0
Junio C Hamano
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>
  1. Prev
  2. Next