summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add prefixcmp()Junio C Hamano2007-02-201-0/+5
| | | | | | We have too many strncmp(a, b, strlen(b)). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'maint'Junio C Hamano2007-02-201-21/+16
|\ | | | | | | | | * maint: Check for PRIuMAX rather than NO_C99_FORMAT in fast-import.c.
| * Check for PRIuMAX rather than NO_C99_FORMAT in fast-import.c.Jason Riedy2007-02-201-21/+16
| | | | | | | | | | | | | | | | | | | | 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>
* | Link 1.5.0.1 documentation from the main page.Junio C Hamano2007-02-201-0/+4
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Teach git-remote to update existing remotes by fetching from themTheodore Ts'o2007-02-193-1/+26
| | | | | | | | | | | | | | | | This allows users to use the command "git remote update" to update all remotes that are being tracked in the repository. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'js/diff-color-check'Junio C Hamano2007-02-191-18/+39
|\ \ | | | | | | | | | | | | * js/diff-color-check: diff --check: use colour
| * | diff --check: use colourJohannes Schindelin2007-02-181-18/+39
| | | | | | | | | | | | | | | | | | | | | Reuse the colour handling of the regular diff. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'jc/fetch-notags'Junio C Hamano2007-02-191-0/+9
|\ \ \ | | | | | | | | | | | | | | | | * jc/fetch-notags: remotes.not-origin.tagopt
| * | | remotes.not-origin.tagoptJunio C Hamano2007-02-151-0/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a configuration entry like this: [remote "alt-git"] url = git://repo.or.cz/alt.git/git/ fetch = +refs/heads/*:refs/remotes/alt-git/* tagopt = --no-tags you do not have to say "git pull --no-tags alt-git". Just saying "git pull alt-git" would suffice. Obviously, if you want to get the tag from such an alternate remote in a separate namespace, you could also do something like: [remote "alt-git"] url = git://repo.or.cz/alt.git/git/ fetch = +refs/heads/*:refs/remotes/alt-git/* fetch = +refs/tags/*:refs/remote-tags/alt-git/* tagopt = --no-tags Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-02-196-17/+54
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * maint: Obey NO_C99_FORMAT in fast-import.c. Add a compat/strtoumax.c for Solaris 8. git-clone: Sync documentation to usage note.
| * | Obey NO_C99_FORMAT in fast-import.c.Jason Riedy2007-02-191-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Add a compat/strtoumax.c for Solaris 8.Jason Riedy2007-02-193-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | git-clone: Sync documentation to usage note.Christian Schlotter2007-02-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'ap/cvsserver'Junio C Hamano2007-02-191-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ap/cvsserver: Have git-cvsserver call hooks/update before really altering the ref Acked-by: Martin Langhoff <martin@catalyst.net.nz>
| * | | Have git-cvsserver call hooks/update before really altering the refAndy Parkins2007-02-141-0/+15
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-cvsserver is analogous to git-receive-pack; a checking from a cvs client to a central server is like a git-push from a working repository. Therefore it's nice to use the same access control (and email sending) that a receive-pack would perform. This patch tests for an executable update hook; if it is it is run with the ref being updated and the old and new hashes as normal. If the update hook returns an error code the update is aborted and the ref is never updated. The cvsserver returns "error 1" to the client to signal there was an EPERM error. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-02-183-12/+18
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * maint: GIT 1.5.0.1 Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding Read the config in rev-list Conflicts: RelNotes
| * | GIT 1.5.0.1v1.5.0.1Junio C Hamano2007-02-183-8/+13
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Documentation/i18n.txt: it is i18n.commitencoding not core.commitencodingFredrik Kuivinen2007-02-181-6/+6
| | | | | | | | | | | | | | | | | | | | | Similarly for i18n.logoutputencoding. Signed-off-by: Fredrik Kuivinen <frekui@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Read the config in rev-listFredrik Kuivinen2007-02-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Update draft release notes for 1.5.1Junio C Hamano2007-02-171-10/+15
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'maint'Junio C Hamano2007-02-1717-40/+97
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Update draft release notes for 1.5.0.1 Convert update-index references in docs to add. Attempt to improve git-rebase lead-in description. Do not take mode bits from index after type change. git-blame: prevent argument parsing segfault 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
| * | Update draft release notes for 1.5.0.1Junio C Hamano2007-02-171-2/+19
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Merge git://git.kernel.org/pub/scm/gitk/gitk into maintJunio C Hamano2007-02-170-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | Make gitk save and restore window pane position on Linux and Cygwin.Mark Levedahl2007-02-151-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Make gitk save and restore the user set window position.Mark Levedahl2007-02-151-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | [PATCH] gitk: Use show-ref instead of ls-remoteJunio C Hamano2007-02-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | [PATCH] Make gitk work reasonably well on Cygwin.Junio C Hamano2007-02-151-126/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | [PATCH] gitk - remove trailing whitespace from a few lines.Mark Levedahl2007-02-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Change git repo-config to git configPaul Mackerras2007-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is the gitk part of e0d10e1c63bc52b37bbec99b07deee794058d9b4 from Tom Prince. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | Convert update-index references in docs to add.Shawn O. Pearce2007-02-179-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Attempt to improve git-rebase lead-in description.Shawn O. Pearce2007-02-171-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Do not take mode bits from index after type change.Junio C Hamano2007-02-166-16/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | git-blame: prevent argument parsing segfaultTommi Kyntola2007-02-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | name-rev: introduce the --refs=<pattern> optionJohannes Schindelin2007-02-172-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of (or, in addition to) --tags, to use only tags for naming, you can now use --refs=<pattern> to specify a shell glob pattern which the refs must match to be used for naming. Example: $ git name-rev --refs=*v1* 33db5f4d 33db5f4d tags/v1.0rc1^0~1593 Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'maint'Junio C Hamano2007-02-161-6/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * maint: git-merge: minor fix for no_trivial_merge_strategies.
| * | | git-merge: minor fix for no_trivial_merge_strategies.Junio C Hamano2007-02-161-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge branch 'maint'Junio C Hamano2007-02-151-1/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * maint: pretend-sha1: grave bugfix.
| * | | pretend-sha1: grave bugfix.Junio C Hamano2007-02-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge branch 'maint'Junio C Hamano2007-02-147-26/+63
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: GIT-VERSION-FILE: check ./version first. sha1_file.c: Round the mmap offset to half the window size. Make sure packedgitwindowsize is multiple of (pagesize * 2) Add RelNotes 1.5.0.1 Still updating 1.5.0 release notes. git-daemon: Avoid leaking the listening sockets into child processes. Clarify two backward incompatible repository options.
| * | | GIT-VERSION-FILE: check ./version first.Junio C Hamano2007-02-141-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | sha1_file.c: Round the mmap offset to half the window size.Alexandre Julliard2007-02-141-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Make sure packedgitwindowsize is multiple of (pagesize * 2)Junio C Hamano2007-02-142-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | The next patch depends on this. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Add RelNotes 1.5.0.1Junio C Hamano2007-02-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In the same spirit as commit 6fc66686, let's keep notes as we fix things. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Still updating 1.5.0 release notes.Junio C Hamano2007-02-141-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | In cruft removal section we had a cruft we needed to remove. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | git-daemon: Avoid leaking the listening sockets into child processes.Alexandre Julliard2007-02-141-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Clarify two backward incompatible repository options.Junio C Hamano2007-02-141-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | The "table-of-contents" in the update hook script should match the bodyAndy Parkins2007-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44478d99ee0 introduced a filter using "git-rev-parse --not --all" to the log display to prevent the display of revisions already in the repository. However, the table of contents generation didn't get that same update. This patch fixes that. The table of contents before the log and the log now both display the same list of revisions. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Point top-level RelNotes link at 1.5.1 release notes being prepared.Junio C Hamano2007-02-141-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Add RelNotes 1.5.1Junio C Hamano2007-02-141-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of running around listing the changes near the release, let's keep things nicely organized by summarizing the changes as we merge things to the 'master' branch. I haven't decided how well this will go with people's patch submission procedure yet --- we'll play it by the ear and see what happens. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Document --ignore-space-at-eol option.Junio C Hamano2007-02-141-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status