- 29 10月, 2009 1 次提交
-
-
由 Markus Heidelberg 提交于
So complete refs, files after the double-dash and some diff options that make sense for difftool. Signed-off-by: NMarkus Heidelberg <markus.heidelberg@web.de> Acked-by: NShawn O. Pearce <spearce@spearce.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 28 10月, 2009 4 次提交
-
-
由 Björn Gustavsson 提交于
Complete all long options for 'git rebase' except --no-verify (probably used very seldom) and the long options corresponding to -v, -q, and -f. Signed-off-by: NBjörn Gustavsson <bgustavsson@gmail.com> Acked-by: NShawn O. Pearce <spearce@spearce.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
git://git.bogomips.org/git-svn由 Junio C Hamano 提交于
* git://git.bogomips.org/git-svn: git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents git-svn: add test data for SVN 1.5+ merge, with script. git-svn: convert SVK merge tickets to extra parents git-svn: allow test setup script to support PERL env. var git-svn: add test data for SVK merge, with script. git svn: fix fetch where glob is on the top-level URL
-
git://repo.or.cz/git-gui由 Junio C Hamano 提交于
* git://repo.or.cz/git-gui: git-gui: adjust the minimum height of diff pane for shorter screen height git-gui: fix use of uninitialized variable git-gui: store wm state and fix wm geometry git-gui: Ensure submodule path is quoted properly git-gui: fix diff for partially staged submodule changes git-gui: Update russian translation git-gui: Limit display to a maximum number of files git-gui: remove warning when deleting correctly merged remote branch git-gui: Added Greek translation & glossary git-gui: display summary when showing diff of a submodule
-
由 Vietor Liu 提交于
When the main window is maximized, if the screen height is shorter (e.g. Netbook screen 1024x600), both the partial commit pane and the status bar are hidden. The diff pane is resizable, so that it can use less vertical height, allowing the overall window to be shorter and still display both the entire commit pane and status bar. Signed-off-by: NVietor Liu <vietor@vxwo.org> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 27 10月, 2009 6 次提交
-
-
由 Sam Vilain 提交于
This feature is long overdue; convert SVN's merge representation to git's as revisions are imported. This works by converting the list of revisions in each line of the svn:mergeinfo into git revision ranges, and then checking the latest of each of these revision ranges for A) being new and B) now being completely merged. Signed-off-by: NSam Vilain <sam.vilain@catalyst.net.nz> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Sam Vilain 提交于
Dump generated with SVN 1.5.1 (on lenny amd64). This test should hopefully cover all but a few intermediate versions of the svnmerge.py script. Signed-off-by: NSam Vilain <sam.vilain@catalyst.net.nz> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Sam Vilain 提交于
SVK is a simple case to start with, as its idea of merge parents matches git's one. When a svk:merge ticket is encountered, check each of the listed merged revisions to see if they are in the history of this commit; if not, then we have encountered a merge - record it. [ew: minor formatting cleanups] Signed-off-by: NSam Vilain <sam.vilain@catalyst.net.nz> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Sam Vilain 提交于
Possibly the 'perl' in the PATH is not the one to be used for the tests; let PERL set in the environment select it. Signed-off-by: NSam Vilain <sam.vilain@catalyst.net.nz> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Sam Vilain 提交于
Dump generated with SVK 2.0.2 and SVN 1.5.1 (on lenny amd64). Signed-off-by: NSam Vilain <sam.vilain@catalyst.net.nz> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Eric Wong 提交于
In cases where the top-level URL we're tracking is the path we glob against, we can once again track odd repositories that keep branches/tags at the top level. This regression was introduced in commit 6f5748e1. Thanks to Daniel Cordero for the original bug report and bisection. Signed-off-by: NEric Wong <normalperson@yhbt.net>
-
- 26 10月, 2009 13 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* sb/gitweb-link-author: gitweb: linkify author/committer names with search
-
由 Junio C Hamano 提交于
* jk/maint-cvsimport-pathname: cvsimport: fix relative argument filenames
-
由 Junio C Hamano 提交于
* iv/tar-lzma-xz: import-tars: Add support for tarballs compressed with lzma, xz
-
由 Junio C Hamano 提交于
* bg/clone-doc: git-clone.txt: Fix grammar and formatting
-
由 Junio C Hamano 提交于
* jc/receive-pack-auto: receive-pack: run "gc --auto --quiet" and optionally "update-server-info" gc --auto --quiet: make the notice a bit less verboase
-
由 Junio C Hamano 提交于
* jc/fsck-default-full: fsck: default to "git fsck --full"
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* jc/maint-fix-unpack-zlib-check: Fix incorrect error check while reading deflated pack data
-
由 Junio C Hamano 提交于
* maint-1.6.4: ls-files: excludes should not impact tracked files
-
由 Junio C Hamano 提交于
* jk/maint-1.6.3-ls-files-no-ignore-cached: ls-files: excludes should not impact tracked files
-
由 Junio C Hamano 提交于
* jn/maint-1.6.3-check-ref-format-doc: Documentation: describe check-ref-format --branch
-
- 25 10月, 2009 3 次提交
-
-
由 Junio C Hamano 提交于
* maint: t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test Work around option parsing bug in the busybox tar implementation
-
由 Markus Heidelberg 提交于
GIT_DIFFTOOL_PROMPT doesn't have any effect if overridden with --prompt. Signed-off-by: NMarkus Heidelberg <markus.heidelberg@web.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Andreas Schwab 提交于
The first argument of the tar command is interpreted as a bundle of letters specifying the mode of operation and additional options, with any option arguments taken from subsequent words on the command line as needed. The implementation of tar in busybox treats this bundle as if preceded by a dash and then parses it by getopt rules, which mishandles 'tar xfo -'. Use 'tar xof -' instead to work this around. Signed-off-by: NAndreas Schwab <schwab@linux-m68k.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 24 10月, 2009 6 次提交
-
-
由 Junio C Hamano 提交于
* maint: Fix list of released versions in the toc document Do not fail "describe --always" in a tag-less repository
-
由 Junio C Hamano 提交于
-
由 Junio C Hamano 提交于
* jp/maint-send-email-fold: git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
-
由 Junio C Hamano 提交于
* jn/maint-1.6.3-check-ref-format-doc: Documentation: describe check-ref-format --branch
-
由 Junio C Hamano 提交于
* pv/maint-add-p-no-exclude: git-add--interactive: never skip files included in index
-
由 Junio C Hamano 提交于
This fixes a regression introduce by d68dc34c (git-describe: Die early if there are no possible descriptions, 2009-08-06). Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 22 10月, 2009 7 次提交
-
-
由 Junio C Hamano 提交于
The loop in get_size_from_delta() feeds a deflated delta data from the pack stream _until_ we get inflated result of 20 bytes[*] or we reach the end of stream. Side note. This magic number 20 does not have anything to do with the size of the hash we use, but comes from 1a3b55c6 (reduce delta head inflated size, 2006-10-18). The loop reads like this: do { in = use_pack(); stream.next_in = in; st = git_inflate(&stream, Z_FINISH); curpos += stream.next_in - in; } while ((st == Z_OK || st == Z_BUF_ERROR) && stream.total_out < sizeof(delta_head)); This git_inflate() can return: - Z_STREAM_END, if use_pack() fed it enough input and the delta itself was smaller than 20 bytes; - Z_OK, when some progress has been made; - Z_BUF_ERROR, if no progress is possible, because we either ran out of input (due to corrupt pack), or we ran out of output before we saw the end of the stream. The fix b3118bdc (sha1_file: Fix infinite loop when pack is corrupted, 2009-10-14) attempted was against a corruption that appears to be a valid stream that produces a result larger than the output buffer, but we are not even trying to read the stream to the end in this loop. If avail_out becomes zero, total_out will be the same as sizeof(delta_head) so the loop will terminate without the "fix". There is no fix from b3118bdc needed for this loop, in other words. The loop in unpack_compressed_entry() is quite a different story. It feeds a deflated stream (either delta or base) and allows the stream to produce output up to what we expect but no more. do { in = use_pack(); stream.next_in = in; st = git_inflate(&stream, Z_FINISH); curpos += stream.next_in - in; } while (st == Z_OK || st == Z_BUF_ERROR) This _does_ risk falling into an endless interation, as we can exhaust avail_out if the length we expect is smaller than what the stream wants to produce (due to pack corruption). In such a case, avail_out will become zero and inflate() will return Z_BUF_ERROR, while avail_in may (or may not) be zero. But this is not a right fix: do { in = use_pack(); stream.next_in = in; st = git_inflate(&stream, Z_FINISH); + if (st == Z_BUF_ERROR && (stream.avail_in || !stream.avail_out) + break; /* wants more input??? */ curpos += stream.next_in - in; } while (st == Z_OK || st == Z_BUF_ERROR) as Z_BUF_ERROR from inflate() may be telling us that avail_in has also run out before reading the end of stream marker. In such a case, both avail_in and avail_out would be zero, and the loop should iterate to allow the end of stream marker to be seen by inflate from the input stream. The right fix for this loop is likely to be to increment the initial avail_out by one (we allocate one extra byte to terminate it with NUL anyway, so there is no risk to overrun the buffer), and break out if we see that avail_out has become zero, in order to detect that the stream wants to produce more than what we expect. After the loop, we have a check that exactly tests this condition: if ((st != Z_STREAM_END) || stream.total_out != size) { free(buffer); return NULL; } So here is a patch (without my previous botched attempts) to fix this issue. The first hunk reverts the corresponding hunk from b3118bdc, and the second hunk is the same fix proposed earlier. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: Document `delta` attribute in "git help attributes". Mark files in t/t5100 as UTF-8 Remove a left-over file from t/t5100
-
由 Junio C Hamano 提交于
* gb/maint-gitweb-esc-param: gitweb: fix esc_param
-
由 Björn Gustavsson 提交于
Add the missing definite article ("the") in several places. Change "note to..." to "note for...", since "note to" means that that the note is addressed to someone (source: Google search). Change "progressbar" to "progress bar" (source: Wikipedia). Format git commands, options, and file names consistently using back quotes (i.e. a fixed font in the resulting HTML document). Signed-off-by: NBjörn Gustavsson <bgustavsson@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Ingmar Vanhassel 提交于
Also handle the extensions .tlz and .txz, aliases for .tar.lzma and .tar.xz respectively. Signed-off-by: NIngmar Vanhassel <ingmar@exherbo.org> Liked-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Introduce two new configuration variables, receive.autogc (defaults to true) and receive.updateserverinfo (defaults to false). When these are set, receive-pack runs "gc --auto --quiet" and "update-server-info" respectively after it finishes receiving data from "git push" and updating refs. Signed-off-by: NJunio C Hamano <gitster@pobox.com> Acked-by: NNicolas Pitre <nico@fluxnic.net>
-
由 Junio C Hamano 提交于
When "gc --auto --quiet" decides there is something to do, it tells the user what it is doing, as it is going to make the user wait for a bit. But the message was a bit too long. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-