* What's in git.git
@ 2007-07-13 6:06 4% ` Junio C Hamano
0 siblings, 0 replies; 5+ results
From: Junio C Hamano @ 2007-07-13 6:06 UTC (permalink / raw)
To: git
Executive summary:
* (maint) hopefully the last maintenance release for v1.5.2
codebase, v1.5.2.4, is out.
* (master) v1.5.3 is nicely progressing and we have v1.5.3-rc1
out, but it has a serious last minute glitch in pack-objects,
so please do not use "git-gc", or "git-repack" from vanilla
v1.5.3-rc1.
v1.5.3-rc1-1-g7d7baa5 or later should be Ok.
* (next/pu) No topics are cooking in 'next' right now, although
I might apply a few series I did not pick up from the list in
the past few days, just to keep them from getting lost.
As usual, v1.5.3-rc1 means:
* I personally will be using 'master' version for my work until
v1.5.3 final (I usually run 'next', and switch to 'master'
after -rc0); I ask contributors to do the same to shake out
the last minute bugs from 'master'.
* No more features and large code churning on 'master' until
v1.5.3 final.
* Bugfixes and documenation updates are always welcomed, but
even more so than usual until v1.5.3 final.
I'll send out a draft release notes for v1.5.3 in a separate
message.
----------------------------------------------------------------
* The 'maint' branch spawned 1.5.2.4 with accumulated fixes.
Most notably, we are in sync with git-gui 0.7.5.
* The 'master' branch has these since the last announcement;
we are at v1.5.3-rc1 plus a few fixes.
Adam Roben (1):
format-patch: Add format.subjectprefix config option
Alecs King (1):
fix remote.origin.url in tutorial.txt
Alex Riesen (4):
Handle missing prefix for "Subject:" as if no prefix given
Handle format.subjectprefix for every command which accepts
--pretty
Fix t5516 to create test repo without hooks
Add -v|--verbose to git remote to show remote url
Andrew Ruder (2):
Remove USE_PAGER from git-pickaxe and git-annotate
Add urls.txt to git-clone man page
Brian Downing (10):
pack-objects: Prefer shallower deltas if the size is equal
gitk: Fix for tree view ending in nested directories
Pack information tool
Correct shebang line for contrib/stats/packinfo.pl
Don't try to delta if target is much smaller than source
Support fetching the memory usage of a delta index
Add functions for parsing integers with size suffixes
Add pack-objects window memory usage limit
Add --window-memory option to git-repack
Add documentation for --window-memory, pack.windowMemory
Brian Gernhardt (1):
Add core.pager config variable.
CJ van den Berg (1):
git-submodule: Fix two instances of the same typo
Carlos Rica (5):
t7004: Skip tests for signed tags in an old version of gpg.
t0030: Remove repeated instructions and add missing &&
t0030: Add tests with consecutive text lines and others with spaces
added.
t7004: Add tests for the git tag -n option.
Function stripspace now gets a buffer instead file descriptors.
Daniel Barkalow (2):
Add allocation and freeing functions for struct refs
Some cosmetic changes to remote library
David Kastrup (1):
Add missing functions to contrib/emacs/vc-git.el
Emil Medve (1):
git-submodule: Instead of using only annotated tags, use any tags.
Eric Wong (2):
git-svn: allow dcommit to retain local merge information
git-svn: fix blocking with svn:// servers after do_switch
Frank Lichtenheld (1):
cvsserver: always initialize state in argsplit()
Gerrit Pape (1):
git-commit: don't add multiple Signed-off-by: from the same
identity
Jakub Narebski (3):
Update git-merge documentation.
Document long options '--message=<msg>' and '--no-commit'
Document git commit --untracked-files and --verbose
James Bowes (1):
stash: allow running from a subdirectory
Jeff King (6):
git-stash: fix "no arguments" case in documentation
git-stash: fix "can't shift that many" with no arguments
git-stash: don't complain when listing in a repo with no stash
Documentation: quote {non-attributes} for asciidoc
Documentation: quote {non-attributes} for asciidoc
Documentation: minor cleanups to branch/checkout wording
Jeffrey C. Ollie (2):
Add an option to quiet git-init.
Quiet the output from git-init when cloning, if requested.
Johannes Schindelin (28):
Move the pick_author code to git-sh-setup
Teach rebase an interactive mode
rebase -i: several cleanups
rebase -i: provide reasonable reflog for the rebased branch
Teach rebase -i about --preserve-merges
Make '!' aliases more useful
git-fsck: add --lost-found option
Document git-filter-branch
Add diff-option --ext-diff
filter-branch: add a test for the commit removal example
filter-branch: make output nicer
filter-branch: a few more touch ups to the man page
filter-branch documentation: clarify which filters are eval'ed
filter-branch: fail gracefully when a filter fails
Future-proof source for changes in xdemitconf_t
Teach git-stash to "apply --index"
Enable "git rerere" by the config variable rerere.enabled
git-branch: default to --track
branch.autosetupmerge: allow boolean values, or "all"
rebase -i: handle --continue more like non-interactive rebase
rebase -i: actually show the diffstat when being verbose
rebase -i: remember the settings of -v, -s and -p when interrupted
rebase -i: put a nice warning into the todo list
rerere: record resolution even if file is not in merge base
Fix core.sharedRepository = 2
Fix --cherry-pick with given paths
Add for_each_remote() function, and extend remote_find_tracking()
branch --track: code cleanup and saner handling of local branches
Johannes Sixt (4):
Test 'git add' for unmerged entries when core.symlinks=false.
filter-branch: Avoid an error message in the map function.
filter-branch documentation: some more touch-ups.
Allow rebase to run if upstream is completely merged
Jonas Fonseca (1):
fsck --lost-found writes to subdirectories in .git/lost-found/
Junio C Hamano (30):
diffcore_count_changes: pass diffcore_filespec
diffcore_filespec: add is_binary
diffcore-delta.c: update the comment on the algorithm.
diffcore-delta.c: Ignore CR in CRLF for text files
git-stash: require "save" to be explicit and update documentation
Update public documentation links for 1.5.2.3
"git-push $URL" without refspecs pushes only matching branches
Rewrite "git-frotz" to "git frotz"
git-stash: make "save" the default action again.
Mark disused commit walkers officially deprecated.
Update draft Release Notes for 1.5.3
Update reflog message created for stashes
Do not check if getcwd() result begins with a slash.
Fix git-stash(1) markup.
git-stash: allow more descriptive reminder message when saving
Introduce diff_filespec_is_binary()
Per-path attribute based hunk header selection.
Fix configuration syntax to specify customized hunk header
patterns.
diff: honor binariness specified in attributes
gitweb: make repeated calls to git_get_project_owner() bearable
diff.c: make built-in hunk header pattern a separate table
git-gui: use "blame -w -C -C" for "where did it come from,
originally?"
git-stash: try reusing cached stat info as much as possible
Fix merge-one-file for our-side-added/our-side-removed cases
Document custom hunk header selection
revision.c: remove duplicated parents after history simplification
Revert 88494423 (removal of duplicate parents in the output
codepath)
Re-code builtin-branch.c in UTF-8
Update list of older git docs
GIT v1.5.3-rc1
Lars Hjemli (1):
git-submodule(1): update description and key names
Linus Torvalds (1):
Start deprecating "git-command" in favor of "git command"
Marcus Fritzsch (1):
Fixed a formulation mistake in Documentation/user-manual.txt
Matt Kraai (3):
Prefer EMAIL to username@hostname.
Change "added.moved or removed" to "added, moved or removed" in
Add [verse] to the SYNOPSIS section of git-submodule.txt.
Matt McCutchen (3):
gitweb: make search form generate pathinfo-style URLs
gitweb: make "No commits" in project list gray, not bold green
Makefile: rebuild git.o on version change, clean up git$X flags
Matthias Lederhofer (5):
ignore git-rebase--interactive
getenv/setenv: use constants if available
git-init: set core.worktree if GIT_WORK_TREE is specified
git-clone: split up long &&-command-chain and use a function for
cleanup
make git-clone GIT_WORK_TREE aware
Michael Hendricks (2):
git-send-email: allow an email alias for --from
gitweb: configurable width for the projects list Description column
Miklos Vajna (2):
gitweb: prefer git_get_project_owner() over get_file_owner()
gitweb: new cgi parameter: opt
Nanako Shiraishi (2):
Add git-stash script
Document git-stash
Nicolas Pitre (4):
apply delta depth bias to already deltified objects
script to display a distribution of longest common hash prefixes
reduce git-pack-objects memory usage a little more
Pack-objects: properly initialize the depth value
Paul Mackerras (6):
gitk: Fix the find and highlight functions
gitk: Fix bug in the anc_or_desc routine
gitk: Remove the unused stopfindproc function
gitk: Fix bug causing "can't read commitrow(0,n)" error
gitk: Use git log and add support for --left-right
gitk: Improve handling of -- and ambiguous arguments
René Scharfe (1):
diff-lib.c: don't strdup twice
Sean Estabrooks (1):
Alter git-checkout reflog message to include "from" branch
Shawn O. Pearce (36):
git-gui: Start blame windows as tall as possible
git-gui: Correct resizing of remote branch delete dialog
git-gui: Honor rerere.enabled configuration option
git-gui: New Git version check support routine
git-gui: Teach class system to support [$this cmd] syntax
git-gui: Abstract the revision picker into a mega widget
git-gui: Refactor the delete branch dialog to use class system
git-gui: Optimize for newstyle refs/remotes layout
git-gui: Maintain remote and source ref for tracking branches
git-gui: Allow users to match remote branch names locally
git-gui: Fast-forward existing branch in branch create dialog
git-gui: Enhance choose_rev to handle hundreds of branches
git-gui: Sort tags descending by tagger date
git-gui: Option to default new branches to match tracking branches
git-gui: Automatically refresh tracking branches when needed
git-gui: Better handling of detached HEAD
git-gui: Refactor our ui_status_value update technique
git-gui: Refactor branch switch to support detached head
git-gui: Unabbreviate commit SHA-1s prior to display
git-gui: Default selection to first matching ref
git-gui: Allow double-click in checkout dialog to start checkout
git-gui: Extract blame viewer status bar into mega-widget
git-gui: Change the main window progress bar to use status_bar
git-gui: Show a progress meter for checking out files
git-gui: Always use absolute path to all git executables
git-gui: Correct gitk installation location
git-gui: Assume unfound commands are known by git wrapper
git-gui: Treat `git version` as `git --version`
git-gui: Perform our own magic shbang detection on Windows
git-gui: Teach console widget to use git_read
git-gui: Improve the Windows and Mac OS X shortcut creators
git-gui: Paper bag fix for Cygwin shortcut creation
git-gui: Use sh.exe in Cygwin shortcuts
git-gui: Include a space in Cygwin shortcut command lines
Support wholesale directory renames in fast-import
git-gui: Change prior tree SHA-1 verification to use git_read
Steffen Prohaska (1):
filter-branch: added missing warn function
Steven Walter (1):
Documentation for git-log --follow
Sven Verdoolaege (2):
git-submodule: provide easy way of adding new submodules
git-clone: fetch possibly detached HEAD over dumb http
Uwe Kleine-König (2):
stash: end commit log with a newline
repack: don't report "Nothing new to pack." if -q is given
^ permalink raw reply [relevance 4%]
* [PATCH 2/6] Support fetching the memory usage of a delta index
2007-07-12 12:55 5% [PATCH 0/6] Pack window memory limit, take 2 Brian Downing
@ 2007-07-12 12:55 7% ` Brian Downing
0 siblings, 0 replies; 5+ results
From: Brian Downing @ 2007-07-12 12:55 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Nicolas Pitre, Brian Downing
Delta indexes, at least on 64-bit platforms, tend to be larger than
the actual uncompressed data. As such, keeping track of this storage
is important if you want to successfully limit the memory size of your
pack window.
Squirrel away the total allocation size inside the delta_index struct,
and add an accessor "sizeof_delta_index" to access it.
Signed-off-by: Brian Downing <bdowning@lavos.net>
---
delta.h | 7 +++++++
diff-delta.c | 10 ++++++++++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/delta.h b/delta.h
index 7b3f86d..40ccf5a 100644
--- a/delta.h
+++ b/delta.h
@@ -24,6 +24,13 @@ create_delta_index(const void *buf, unsigned long bufsize);
extern void free_delta_index(struct delta_index *index);
/*
+ * sizeof_delta_index: returns memory usage of delta index
+ *
+ * Given pointer must be what create_delta_index() returned, or NULL.
+ */
+extern unsigned long sizeof_delta_index(struct delta_index *index);
+
+/*
* create_delta: create a delta from given index for the given buffer
*
* This function may be called multiple times with different buffers using
diff --git a/diff-delta.c b/diff-delta.c
index faf96e4..3af5835 100644
--- a/diff-delta.c
+++ b/diff-delta.c
@@ -119,6 +119,7 @@ struct index_entry {
};
struct delta_index {
+ unsigned long memsize;
const void *src_buf;
unsigned long src_size;
unsigned int hash_mask;
@@ -159,6 +160,7 @@ struct delta_index * create_delta_index(const void *buf, unsigned long bufsize)
mem = hash + hsize;
entry = mem;
+ index->memsize = memsize;
index->src_buf = buf;
index->src_size = bufsize;
index->hash_mask = hmask;
@@ -228,6 +230,14 @@ void free_delta_index(struct delta_index *index)
free(index);
}
+unsigned long sizeof_delta_index(struct delta_index *index)
+{
+ if (index)
+ return index->memsize;
+ else
+ return 0;
+}
+
/*
* The maximum size for any opcode sequence, including the initial header
* plus Rabin window plus biggest copy.
--
1.5.2.GIT
^ permalink raw reply related [relevance 7%]
* [PATCH 0/6] Pack window memory limit, take 2
@ 2007-07-12 12:55 5% Brian Downing
2007-07-12 12:55 7% ` [PATCH 2/6] Support fetching the memory usage of a delta index Brian Downing
0 siblings, 1 reply; 5+ results
From: Brian Downing @ 2007-07-12 12:55 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Nicolas Pitre, Brian Downing
This series has my circular buffer errors (hopefully) corrected, and
the code is a lot cleaner as a bonus. Also, the options are now named
--window-memory and pack.windowMemory, and both can take {k,m,g} suffixes.
I split out the {k,m,g} parsing code from git_config_int into
git_parse_long and git_parse_ulong, so it can be used for command-line
arguments as well. Hopefully these will be useful elsewhere.
Finally the documentation has been cleaned up a bit and information on
the defaults has been added.
Patches 1 and 2 are unmodified from last time.
[PATCH 1/6] Don't try to delta if target is much smaller than source
[PATCH 2/6] Support fetching the memory usage of a delta index
[PATCH 3/6] Add functions for parsing integers with size suffixes
[PATCH 4/6] Add pack-objects window memory usage limit
[PATCH 5/6] Add --window-memory option to git-repack
[PATCH 6/6] Add documentation for --window-memory, pack.windowMemory
Documentation/config.txt | 6 +++
Documentation/git-pack-objects.txt | 11 ++++++
Documentation/git-repack.txt | 11 ++++++
builtin-pack-objects.c | 52 ++++++++++++++++++++++++++----
cache.h | 3 ++
config.c | 61 +++++++++++++++++++++++++++++------
delta.h | 7 ++++
diff-delta.c | 10 ++++++
git-repack.sh | 3 +-
9 files changed, 145 insertions(+), 19 deletions(-)
-bcd
^ permalink raw reply [relevance 5%]
* [PATCH 2/5] Support fetching the memory usage of a delta index
2007-07-12 3:14 5% [PATCH 0/5] Memory-limited pack-object window support Brian Downing
@ 2007-07-12 3:14 7% ` Brian Downing
0 siblings, 0 replies; 5+ results
From: Brian Downing @ 2007-07-12 3:14 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Brian Downing
Delta indexes, at least on 64-bit platforms, tend to be larger than
the actual uncompressed data. As such, keeping track of this storage
is important if you want to successfully limit the memory size of your
pack window.
Squirrel away the total allocation size inside the delta_index struct,
and add an accessor "sizeof_delta_index" to access it.
Signed-off-by: Brian Downing <bdowning@lavos.net>
---
delta.h | 7 +++++++
diff-delta.c | 10 ++++++++++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/delta.h b/delta.h
index 7b3f86d..40ccf5a 100644
--- a/delta.h
+++ b/delta.h
@@ -24,6 +24,13 @@ create_delta_index(const void *buf, unsigned long bufsize);
extern void free_delta_index(struct delta_index *index);
/*
+ * sizeof_delta_index: returns memory usage of delta index
+ *
+ * Given pointer must be what create_delta_index() returned, or NULL.
+ */
+extern unsigned long sizeof_delta_index(struct delta_index *index);
+
+/*
* create_delta: create a delta from given index for the given buffer
*
* This function may be called multiple times with different buffers using
diff --git a/diff-delta.c b/diff-delta.c
index faf96e4..3af5835 100644
--- a/diff-delta.c
+++ b/diff-delta.c
@@ -119,6 +119,7 @@ struct index_entry {
};
struct delta_index {
+ unsigned long memsize;
const void *src_buf;
unsigned long src_size;
unsigned int hash_mask;
@@ -159,6 +160,7 @@ struct delta_index * create_delta_index(const void *buf, unsigned long bufsize)
mem = hash + hsize;
entry = mem;
+ index->memsize = memsize;
index->src_buf = buf;
index->src_size = bufsize;
index->hash_mask = hmask;
@@ -228,6 +230,14 @@ void free_delta_index(struct delta_index *index)
free(index);
}
+unsigned long sizeof_delta_index(struct delta_index *index)
+{
+ if (index)
+ return index->memsize;
+ else
+ return 0;
+}
+
/*
* The maximum size for any opcode sequence, including the initial header
* plus Rabin window plus biggest copy.
--
1.5.2.GIT
^ permalink raw reply related [relevance 7%]
* [PATCH 0/5] Memory-limited pack-object window support
@ 2007-07-12 3:14 5% Brian Downing
2007-07-12 3:14 7% ` [PATCH 2/5] Support fetching the memory usage of a delta index Brian Downing
0 siblings, 1 reply; 5+ results
From: Brian Downing @ 2007-07-12 3:14 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Brian Downing
This patch series implements a memory limit on the window size for
pack-objects and repack. Basically, the window size will temporarily
grow smaller than the --window option specifies if the total memory
usage of the window is over the specified limit.
With this series I can run even with --window=1000 on my troublesome
repository (described in an email a couple of days ago; basically, it
has a 20MB file with around 200 revisions, plus a bunch of normal sized
files) with memory usage limited to 512MB and it will happily scale down
the window to accommodate the file without blowing out my machine.
The --window option still specifies the size of the window and is still
required; the window will not grow to reach the memory limit, it will
only shrink to fit. I think this may be a feature, as running with a
very large window depth and a memory limit basically means that you will
pack at an approximately constant slow speed, rather than rushing ahead
as it does now for very small objects.
I took the easy way out and expire objects out of the window after
allocation has occurred, rather than figuring out how much needed to
be cleared before allocating. This made the logic much more feasible,
though.
I chose --window-bytes=N and pack.windowBytes=N as my option and
configuration names. I'm not in love with them, though; no other
configuration in Git mentions bytes in the name as far as I can see,
but I wanted to clearly differentiate it from the window "size" that
--window gets you.
The first patch in this series is optional, but I recommend it. It makes
it so that files that are much smaller than a potential delta source
don't even try to delta with it. This is handy for running in a mixed
file size repository with a large window, as it means that when you get
to small files again you start moving fast without having to wait for
the large objects to trickle out of the window. The cut-off is currently
if it is 1/32 the size, but that number was completely arbitrary.
[PATCH 1/5] Don't try to delta if target is much smaller than source
[PATCH 2/5] Support fetching the memory usage of a delta index
[PATCH 3/5] Add pack-objects window memory usage limit
[PATCH 4/5] Add --window-bytes option to git-repack
[PATCH 5/5] Add documentation for --window-bytes, pack.windowBytes
Documentation/config.txt | 5 +++
Documentation/git-pack-objects.txt | 8 +++++
Documentation/git-repack.txt | 8 +++++
builtin-pack-objects.c | 58 +++++++++++++++++++++++++++++++----
delta.h | 7 ++++
diff-delta.c | 10 ++++++
git-repack.sh | 3 +-
7 files changed, 91 insertions(+), 8 deletions(-)
-bcd
^ permalink raw reply [relevance 5%]
Results 1-5 of 5 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2007-05-13 22:30 What's in git.git (stable) Junio C Hamano
2007-05-17 0:21 ` Junio C Hamano
2007-05-19 5:24 ` Junio C Hamano
2007-05-23 21:46 ` Junio C Hamano
2007-05-29 10:12 ` Junio C Hamano
2007-06-02 21:09 ` Junio C Hamano
2007-06-07 2:08 ` Junio C Hamano
2007-06-13 20:11 ` Junio C Hamano
2007-06-21 7:21 ` Junio C Hamano
2007-06-25 9:43 ` Junio C Hamano
2007-07-02 0:16 ` Junio C Hamano
2007-07-13 6:06 4% ` What's in git.git Junio C Hamano
2007-07-12 3:14 5% [PATCH 0/5] Memory-limited pack-object window support Brian Downing
2007-07-12 3:14 7% ` [PATCH 2/5] Support fetching the memory usage of a delta index Brian Downing
2007-07-12 12:55 5% [PATCH 0/6] Pack window memory limit, take 2 Brian Downing
2007-07-12 12:55 7% ` [PATCH 2/6] Support fetching the memory usage of a delta index Brian Downing
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).