* Re: [PATCH] Prevent megablobs from gunking up git packs
From: Junio C Hamano @ 2007-05-23 22:08 UTC (permalink / raw)
To: Dana How; +Cc: Git Mailing List
In-Reply-To: <46528A48.9050903@gmail.com>
Dana How <danahow@gmail.com> writes:
> This patch implements the following:
> 1. git pack-objects takes a new --max-blob-size=N flag,
> with the effect that only blobs less than N KB are written
> to the packfiles(s). If a blob was in a pack but violates
> this limit (perhaps the packs were created by fast-import
> or max-blob-size was reduced), then a new loose object
> is written out if needed so the data is not lost.
Why?
I really do not like that "write a new loose object" part
without proper justification. From your description, I thought
the most natural way to do this is to pretend you did not hear
about large objects at all, by rejecting them early, perhaps
inside add_object_entry() or inside get_object_details() --
either case you would do sha1_object_info() early instead of
doing it in check_object().
By the way, is there fundamental reason that this needs to be
"blob size" limit? Wouldn't "max-object-size" be more clean in
theory, and work the same way in practice?
> 2. git repack inspects repack.maxblobsize . If set, its
> value is passed to git pack-objects on the command line.
> The user should change repack.maxblobsize , NOT specify
> --max-blob-size=N .
Why not?
> This patch is on top of the earlier max-pack-size patch,
> because I thought I needed some behavior it supplied,
> but could be rebased on master if desired.
Your earlier "split according to max-pack-size" will hopefully be
on master shortly.
^ permalink raw reply
* Re: [PATCH] git-applymbox: Remove command
From: Junio C Hamano @ 2007-05-23 21:57 UTC (permalink / raw)
To: Petr Baudis; +Cc: git
In-Reply-To: <20070520001012.5051.38142.stgit@rover>
Petr Baudis <pasky@suse.cz> writes:
> I believe noone uses git-applymbox, and noone definitely should, since it
> is supposed to be completely superseded and everything by its younger
> cousin git-am. The only known person in the universe to use it was Linus
> and he declared some time ago that he will try to use git-am instead in his
> famous dotest script.
>
> The trouble is that git-applymbox existence creates confusing UI. I'm a bit
> like a recycled newbie to the git porcelain and *I* was confused by
> git-applymbox primitiveness until I've realized a while later that I'm of
> course using the wrong command.
>
> Signed-off-by: Petr Baudis <pasky@suse.cz>
>
> ---
>
> (Admittelly this patch is a bit brave and maybe we should make applymbox
> print some scary messages first for some time. I'm testing the water here
> to see if anyone complains. I still think that noone really uses it,
> though.)
Brave.
I suspect nobody really uses it, too.
^ permalink raw reply
* Re: [PATCH] Add another verbosity level to git-fetch
From: Junio C Hamano @ 2007-05-23 21:53 UTC (permalink / raw)
To: Alex Riesen; +Cc: git, Michael S. Tsirkin
In-Reply-To: <20070523213113.GF2554@steel.home>
Alex Riesen <raa.lkml@gmail.com> writes:
> Use "-v -v" to run git-fetch-pack in verbose mode.
>
> Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> ---
>
> Otherwise there is no way to show connect messages for git-fetch
How about just a single -v to do so?
^ permalink raw reply
* What's in git.git (stable)
From: Junio C Hamano @ 2007-05-23 21:46 UTC (permalink / raw)
To: git
In-Reply-To: <7vveepz8pr.fsf@assigned-by-dhcp.cox.net>
Although there are a few post release fixups queued for v1.5.2.1
on 'maint' already, all things considered I must say v1.5.2 was
a quite good release. There isn't a huge "oops, hand me a brown
paper bag please" fix yet. Knock, knock...
On the 'master' front, as promised, the first batch that were on
hold since v1.5.2-rc1 is in. Nothing earth-shattering, really.
----------------------------------------------------------------
* The 'maint' branch has these fixes since v1.5.2.
Fernando J. Pereda (1):
Use PATH_MAX instead of TEMPFILE_PATH_LEN
Frank Lichtenheld (2):
t1300: Add tests for git-config --bool --get
git-config: Correct asciidoc documentation for --int/--bool
Jim Meyering (1):
git-daemon: don't ignore pid-file write failure
Johannes Schindelin (2):
SubmittingPatches: mention older C compiler compatibility
git-status: respect core.excludesFile
Jonas Fonseca (1):
branch: fix segfault when resolving an invalid HEAD
Junio C Hamano (2):
annotate: make it work from subdirectories.
git-cvsserver: fix disabling service via per-method config
Paolo Bonzini (1):
Document branch.autosetupmerge.
Stephan Springl (1):
Use git-for-each-ref to check whether the origin branch exists.
Sven Verdoolaege (1):
unpack-trees.c: verify_uptodate: remove dead code
* The 'master' branch has these since v1.5.2, in addition to the above.
Alex Riesen (1):
Fix the progress code to output LF only when it is really needed
Dana How (1):
Custom compression levels for objects and packs
Jakub Narebski (2):
gitweb: Add test t9500 for gitweb (as standalone script)
Add an option to git-ls-tree to display also the size of blob
James Bowes (1):
Add colour support in rebase and merge tree diff stats output.
Junio C Hamano (2):
git-apply: Fix removal of new trailing blank lines.
Fix command line parameter parser of revert/cherry-pick
Marco Costalba (1):
Teach 'git-apply --whitespace=strip' to remove empty lines at the end of file
Martin Waitz (1):
rename dirlink to gitlink.
Michael S. Tsirkin (1):
connect: display connection progress
Nicolas Pitre (3):
allow for undeltified objects not to be reused
make "repack -f" imply "pack-objects --no-reuse-object"
deprecate the new loose object header format
Petr Baudis (1):
git-rev-list: Add regexp tuning options
Shawn O. Pearce (1):
Teach git-describe how to run name-rev
Sven Verdoolaege (1):
git-update-ref: add --no-deref option for overwriting/detaching ref
Theodore Ts'o (1):
Add --aggressive option to 'git gc'
^ permalink raw reply
* What's cooking in git.git (topics)
From: Junio C Hamano @ 2007-05-23 21:46 UTC (permalink / raw)
To: git
In-Reply-To: <7vd50xz7lq.fsf@assigned-by-dhcp.cox.net>
Nothing controversial has been queued since v1.5.2 yet.
Here are the topics that have been cooking. Commits prefixed
with '-' are only in 'pu' while commits prefixed with '+' are
in 'next'. The topics list the commits in reverse chronological
order.
* fl/cvsserver (Mon May 21 00:31:58 2007 +0200) 3 commits
+ t9400: Add some basic pserver tests
+ t9400: Add some more cvs update tests
+ t9400: Add test cases for config file handling
Will push this out on 'master' by the end of this week.
* dh/repack (Wed May 23 10:11:33 2007 -0700) 6 commits
+ pack-objects: clarification & option checks for --max-pack-size
+ git-repack --max-pack-size: add option parsing to enable feature
+ git-repack --max-pack-size: split packs as asked by
write_{object,one}()
+ git-repack --max-pack-size: write_{object,one}() respect pack
limit
+ git-repack --max-pack-size: new file statics and code
restructuring
+ Alter sha1close() 3rd argument to request flush only
I've commented on this series in a separate message. Looks
quite clean modulo a few minor details, which was fixed up this
morning. Will be in 'master' shortly.
* db/remote (Tue May 15 22:50:19 2007 -0400) 4 commits
+ Update local tracking refs when pushing
+ Add handlers for fetch-side configuration of remotes.
+ Move refspec parser from connect.c and cache.h to remote.{c,h}
+ Move remote parsing into a library file out of builtin-push.
Will need to look at this once more; I do not expect too much
problems with it.
* jc/nodelta (Tue May 22 23:04:49 2007 -0700) 3 commits
+ builtin-pack-objects: remove unnecessary code for no-delta
+ Teach "delta" attribute to pack-objects.
+ pack-objects: pass fullname down to add_object_entry()
I am a bit worried about potential performance penalty that can
come from attribute look-up on big trees, which I've never
measured so far. Independent measurement would be very much
appreciated, and if it turns out to be too bad, we might want to
discard this.
The remainder is backburnered.
* jc/blame (Fri Apr 20 16:25:50 2007 -0700) 4 commits
* jc/diff (Mon Dec 25 01:08:50 2006 -0800) 2 commits
^ permalink raw reply
* [PATCH] Verbose connect messages to show the IP addresses used
From: Alex Riesen @ 2007-05-23 21:34 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
Also, the patch makes the error messages more verbose. Helps when
diagnosing connect problems on weird systems.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
connect.c | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/connect.c b/connect.c
index 2a26fdb..3757392 100644
--- a/connect.c
+++ b/connect.c
@@ -391,6 +391,23 @@ static enum protocol get_protocol(const char *name)
#ifndef NO_IPV6
+static const char *ai_name(const struct addrinfo *ai)
+{
+ static char addr[INET_ADDRSTRLEN];
+ if ( AF_INET == ai->ai_family ) {
+ struct sockaddr_in *in;
+ in = (struct sockaddr_in *)ai->ai_addr;
+ inet_ntop(ai->ai_family, &in->sin_addr, addr, sizeof(addr));
+ } else if ( AF_INET6 == ai->ai_family ) {
+ struct sockaddr_in6 *in;
+ in = (struct sockaddr_in6 *)ai->ai_addr;
+ inet_ntop(ai->ai_family, &in->sin6_addr, addr, sizeof(addr));
+ } else {
+ strcpy(addr, "(unknown)");
+ }
+ return addr;
+}
+
/*
* Returns a connected socket() fd, or else die()s.
*/
@@ -401,6 +418,7 @@ static int git_tcp_connect_sock(char *host, int flags)
const char *port = STR(DEFAULT_GIT_PORT);
struct addrinfo hints, *ai0, *ai;
int gai;
+ int cnt = 0;
if (host[0] == '[') {
end = strchr(host + 1, ']');
@@ -444,10 +462,18 @@ static int git_tcp_connect_sock(char *host, int flags)
}
if (connect(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
saved_errno = errno;
+ fprintf(stderr, "%s[%d: %s]: net=%s, errno=%s\n",
+ host,
+ cnt,
+ ai_name(ai),
+ hstrerror(h_errno),
+ strerror(saved_errno));
close(sockfd);
sockfd = -1;
continue;
}
+ if (flags & CONNECT_VERBOSE)
+ fprintf(stderr, "%s ", ai_name(ai));
break;
}
@@ -476,6 +502,7 @@ static int git_tcp_connect_sock(char *host, int flags)
struct sockaddr_in sa;
char **ap;
unsigned int nport;
+ int cnt;
if (host[0] == '[') {
end = strchr(host + 1, ']');
@@ -512,7 +539,7 @@ static int git_tcp_connect_sock(char *host, int flags)
if (flags & CONNECT_VERBOSE)
fprintf(stderr, "done.\nConnecting to %s (port %s) ... ", host, port);
- for (ap = he->h_addr_list; *ap; ap++) {
+ for (cnt = 0, ap = he->h_addr_list; *ap; ap++, cnt++) {
sockfd = socket(he->h_addrtype, SOCK_STREAM, 0);
if (sockfd < 0) {
saved_errno = errno;
@@ -526,10 +553,19 @@ static int git_tcp_connect_sock(char *host, int flags)
if (connect(sockfd, (struct sockaddr *)&sa, sizeof sa) < 0) {
saved_errno = errno;
+ fprintf(stderr, "%s[%d: %s]: net=%s, errno=%s\n",
+ host,
+ cnt,
+ inet_ntoa(*(struct in_addr *)&sa.sin_addr),
+ hstrerror(h_errno),
+ strerror(saved_errno));
close(sockfd);
sockfd = -1;
continue;
}
+ if (flags & CONNECT_VERBOSE)
+ fprintf(stderr, "%s ",
+ inet_ntoa(*(struct in_addr *)&sa.sin_addr));
break;
}
--
1.5.2.58.g7a94-dirty
^ permalink raw reply related
* [PATCH] Add another verbosity level to git-fetch
From: Alex Riesen @ 2007-05-23 21:31 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Michael S. Tsirkin
Use "-v -v" to run git-fetch-pack in verbose mode.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
Otherwise there is no way to show connect messages for git-fetch
git-fetch.sh | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/git-fetch.sh b/git-fetch.sh
index 0e05cf1..6d3a346 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -61,7 +61,7 @@ do
quiet=--quiet
;;
-v|--verbose)
- verbose=Yes
+ verbose="$verbose"Yes
;;
-k|--k|--ke|--kee|--keep)
keep='-k -k'
@@ -201,8 +201,14 @@ fetch_all_at_once () {
echo "$ls_remote_result" | \
git-fetch--tool pick-rref "$rref" "-"
else
+ flags=
+ case $verbose in
+ YesYes*)
+ flags="-v"
+ ;;
+ esac
git-fetch-pack --thin $exec $keep $shallow_depth \
- $quiet $no_progress "$remote" $rref ||
+ $quiet $no_progress $flags "$remote" $rref ||
echo failed "$remote"
fi
fi
--
1.5.2.58.g7a94-dirty
^ permalink raw reply related
* [PATCH] fast-import: Fix crash when referencing already existing objects
From: Simon Hausmann @ 2007-05-23 21:01 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
Commit a5c1780a0355a71b9fb70f1f1977ce726ee5b8d8 sets the pack_id of existing
objects to MAX_PACK_ID. When the same object is referenced later again it is
found in the local object hash. With such a pack_id fast-import should not try
to locate that object in the newly created pack(s).
Signed-off-by: Simon Hausmann <simon@lst.de>
---
fast-import.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index 0ddf8fe..87eaada 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1013,7 +1013,7 @@ static void load_tree(struct tree_entry *root)
return;
myoe = find_object(sha1);
- if (myoe) {
+ if (myoe && myoe->pack_id != MAX_PACK_ID) {
if (myoe->type != OBJ_TREE)
die("Not a tree: %s", sha1_to_hex(sha1));
t->delta_depth = 0;
--
1.5.2.24.g93d4
^ permalink raw reply related
* [PATCH] fast-import: Fix uninitialized variable
From: Simon Hausmann @ 2007-05-23 21:00 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
Fix uninitialized last_object->no_free variable that is accessed in
store_object.
Signed-off-by: Simon Hausmann <simon@lst.de>
---
fast-import.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index ffa00fd..0ddf8fe 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1122,6 +1122,7 @@ static void store_tree(struct tree_entry *root)
|| le->pack_id != pack_id) {
lo.data = NULL;
lo.depth = 0;
+ lo.no_free = 0;
} else {
mktree(t, 0, &lo.len, &old_tree);
lo.data = old_tree.buffer;
--
1.5.2.24.g93d4
^ permalink raw reply related
* [PATCH] Add a configuration option to control diffstat after merge
From: Alex Riesen @ 2007-05-23 21:01 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git Mailing List
In-Reply-To: <20070523204312.GD2554@steel.home>
The diffstat can be controlled either with command-line options
(--summary|--no-summary) or with merge.diffstat. The default is
left as it was: diffstat is active by default.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
Alex Riesen, Wed, May 23, 2007 22:43:12 +0200:
> > > +if test -z "$show_diffstat"; then
> > > + test "$(git-config merge.diffstat)" = false && show_diffstat=false
> > > + test -z "$show_diffstat" && show_diffstat=t
> > > +fi
> >
> > Isn't this hunk wrong?
> >
>
> It is. Will resend in an hour, unless you beat me to it
>
> > if test -z "$show_diffstat"; then
> > test "$(git-config --bool merge.diffstat)" = false && show_diffstat=false
> > test -z "$show_diffstat" && show_diffstat=t
> > fi
>
> Thanks!
>
Documentation/git-merge.txt | 2 +-
Documentation/merge-options.txt | 4 ++++
git-merge.sh | 18 ++++++++++++------
git-pull.sh | 3 +++
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 9c08efa..912ef29 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -9,7 +9,7 @@ git-merge - Join two or more development histories together
SYNOPSIS
--------
[verse]
-'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]...
+'git-merge' [-n] [--summary] [--no-commit] [--squash] [-s <strategy>]...
[-m <msg>] <remote> <remote>...
DESCRIPTION
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 182cef5..56f1d8d 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,3 +1,7 @@
+--summary::
+ Show a diffstat at the end of the merge. The diffstat is also
+ controlled by the configuration option merge.diffstat.
+
-n, \--no-summary::
Do not show diffstat at the end of the merge.
diff --git a/git-merge.sh b/git-merge.sh
index 351676f..44e9b70 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -3,7 +3,7 @@
# Copyright (c) 2005 Junio C Hamano
#
-USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'
+USAGE='[-n] [--summary] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'
SUBDIRECTORY_OK=Yes
. git-sh-setup
@@ -88,12 +88,11 @@ finish () {
'')
;;
?*)
- case "$no_summary" in
- '')
+ if test "$show_diffstat" = t
+ then
# We want color (if set), but no pager
GIT_PAGER='' git-diff --stat --summary -M "$head" "$1"
- ;;
- esac
+ fi
;;
esac
}
@@ -126,7 +125,9 @@ do
case "$1" in
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
--no-summa|--no-summar|--no-summary)
- no_summary=t ;;
+ show_diffstat=false ;;
+ --summary)
+ show_diffstat=t ;;
--sq|--squ|--squa|--squas|--squash)
squash=t no_commit=t ;;
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
@@ -168,6 +169,11 @@ do
shift
done
+if test -z "$show_diffstat"; then
+ test "$(git-config --bool merge.diffstat)" = false && show_diffstat=false
+ test -z "$show_diffstat" && show_diffstat=t
+fi
+
# This could be traditional "merge <msg> HEAD <commit>..." and the
# way we can tell it is to see if the second token is HEAD, but some
# people might have misused the interface and used a committish that
diff --git a/git-pull.sh b/git-pull.sh
index a3665d7..ba0ca07 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -22,6 +22,9 @@ do
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
--no-summa|--no-summar|--no-summary)
no_summary=-n ;;
+ --summary)
+ no_summary=$1
+ ;;
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
no_commit=--no-commit ;;
--sq|--squ|--squa|--squas|--squash)
--
1.5.2.67.gbd3c2
^ permalink raw reply related
* Re: [PATCH] Add a configuration option to control diffstat after merge
From: Alex Riesen @ 2007-05-23 20:43 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git Mailing List
In-Reply-To: <7v646j2t1e.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano, Wed, May 23, 2007 22:18:05 +0200:
> Alex Riesen <raa.lkml@gmail.com> writes:
>
> > The diffstat can be controlled either with command-line options
> > (--summary|--no-summary) or with merge.diffstat. The default is
> > left as it was: diffstat is active by default.
> >
> > Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> > ---
> >
> > I have to explain the implementation a bit: in Windows, every exec is
> > *very* expensive, so I tried to avoid a call to git-config as long as
> > possible. The stupid OS is my reason for this change, actually:
> > diffstat not just takes too long. It also takes a *long* while before
> > the diffstat even starts!
>
> Even on Linux, if your project is well modularized and your
> workflow is "merge small and merge often" like the kernel is, it
> is not unusual that the final diffstat takes much longer than a
> merge. But the diffstat is not an eye-candy but is an important
> safety measure from the workflow point of view.
Can't have it on Windows. It makes me prefer git-am to git-merge.
> > @@ -168,6 +169,11 @@ do
> > shift
> > done
> >
> > +if test -z "$show_diffstat"; then
> > + test "$(git-config merge.diffstat)" = false && show_diffstat=false
> > + test -z "$show_diffstat" && show_diffstat=t
> > +fi
>
> Isn't this hunk wrong?
>
It is. Will resend in an hour, unless you beat me to it
> if test -z "$show_diffstat"; then
> test "$(git-config --bool merge.diffstat)" = false && show_diffstat=false
> test -z "$show_diffstat" && show_diffstat=t
> fi
Thanks!
^ permalink raw reply
* [PATCH] Allow environment variables to be unset in the processes started by run_command
From: Alex Riesen @ 2007-05-23 20:21 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Sven Verdoolaege
In-Reply-To: <20070522231442.GM30871@steel.home>
To unset a variable, just specify its name, without "=". For example:
const char *env[] = {"GIT_DIR=.git", "PWD", NULL};
const char *argv[] = {"git-ls-files", "-s", NULL};
int err = run_command_v_opt_cd_env(argv, RUN_GIT_CMD, ".", env);
The PWD will be unset before executing git-ls-files.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
Alex Riesen, Wed, May 23, 2007 01:14:42 +0200:
> > Because you _scan_ the whole string in your patch to see if it
> > ends with = anyway, a trivial improvement would be to do:
> >
> > if (strchr(cmd->env, '='))
> > putenv(cmd->env);
> > else
> > unsetenv(cmd->env);
>
> I like this one. The env field in struct child_process and run_command
> will have to mention it in comments (in run-command.h), it's kind of
> special.
>
run-command.c | 8 ++++++--
run-command.h | 5 +++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/run-command.c b/run-command.c
index 605aa1e..3b1899e 100644
--- a/run-command.c
+++ b/run-command.c
@@ -77,8 +77,12 @@ int start_command(struct child_process *cmd)
die("exec %s: cd to %s failed (%s)", cmd->argv[0],
cmd->dir, strerror(errno));
if (cmd->env) {
- for (; *cmd->env; cmd->env++)
- putenv((char*)*cmd->env);
+ for (; *cmd->env; cmd->env++) {
+ if (strchr(*cmd->env, '='))
+ putenv((char*)*cmd->env);
+ else
+ unsetenv(*cmd->env);
+ }
}
if (cmd->git_cmd) {
execv_git_cmd(cmd->argv);
diff --git a/run-command.h b/run-command.h
index af1e0bf..7958eb1 100644
--- a/run-command.h
+++ b/run-command.h
@@ -35,6 +35,11 @@ int run_command(struct child_process *);
#define RUN_COMMAND_STDOUT_TO_STDERR 4
int run_command_v_opt(const char **argv, int opt);
int run_command_v_opt_cd(const char **argv, int opt, const char *dir);
+
+/*
+ * env (the environment) is to be formatted like environ: "VAR=VALUE".
+ * To unset an environment variable use just "VAR".
+ */
int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env);
#endif
--
1.5.2.67.gbd3c2
^ permalink raw reply related
* Re: [PATCH] Add a configuration option to control diffstat after merge
From: Junio C Hamano @ 2007-05-23 20:18 UTC (permalink / raw)
To: Alex Riesen; +Cc: Git Mailing List
In-Reply-To: <20070523200223.GB2554@steel.home>
Alex Riesen <raa.lkml@gmail.com> writes:
> The diffstat can be controlled either with command-line options
> (--summary|--no-summary) or with merge.diffstat. The default is
> left as it was: diffstat is active by default.
>
> Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> ---
>
> I have to explain the implementation a bit: in Windows, every exec is
> *very* expensive, so I tried to avoid a call to git-config as long as
> possible. The stupid OS is my reason for this change, actually:
> diffstat not just takes too long. It also takes a *long* while before
> the diffstat even starts!
Even on Linux, if your project is well modularized and your
workflow is "merge small and merge often" like the kernel is, it
is not unusual that the final diffstat takes much longer than a
merge. But the diffstat is not an eye-candy but is an important
safety measure from the workflow point of view.
> @@ -168,6 +169,11 @@ do
> shift
> done
>
> +if test -z "$show_diffstat"; then
> + test "$(git-config merge.diffstat)" = false && show_diffstat=false
> + test -z "$show_diffstat" && show_diffstat=t
> +fi
Isn't this hunk wrong?
[merge]
diffstat = 0
diffstat = false
should both mean "merge.diffstat is set to false".
"git config --bool" does that.
And when merge.diffstat does not appear in the configuration
file, "git config --bool merge.diffstat" exits non-zero.
if test -z "$show_diffstat"; then
test "$(git-config --bool merge.diffstat)" = false && show_diffstat=false
test -z "$show_diffstat" && show_diffstat=t
fi
^ permalink raw reply
* Re: [PATCH] disable merge summaries if they are disabled
From: Junio C Hamano @ 2007-05-23 20:03 UTC (permalink / raw)
To: Alex Riesen; +Cc: Git Mailing List
In-Reply-To: <20070523195823.GA2554@steel.home>
Alex Riesen <raa.lkml@gmail.com> writes:
> Junio C Hamano, Wed, May 23, 2007 20:22:57 +0200:
>> "Alex Riesen" <raa.lkml@gmail.com> writes:
>>
>> > Otherwise the merge.summary option has no visible effect.
>>
>> I suspect you are mistaking a different merge summary. The
>> option affects fmt-merge-msg, iow, the shortlog looking summary
>> that appears as the commit message in a merge commit.
>>
>> The command line parameter --no-summary inhibits the diffstat
>> given to the terminal after "git-pull/git-merge" is made.
>>
>
> I did it again, didn't I?! :)
You could argue that it is not your fault but is a faulty and
misleading documentation, if you supply a patch to clarify it
;-).
^ permalink raw reply
* [PATCH] Add a configuration option to control diffstat after merge
From: Alex Riesen @ 2007-05-23 20:02 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git Mailing List
In-Reply-To: <20070523195823.GA2554@steel.home>
The diffstat can be controlled either with command-line options
(--summary|--no-summary) or with merge.diffstat. The default is
left as it was: diffstat is active by default.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
I have to explain the implementation a bit: in Windows, every exec is
*very* expensive, so I tried to avoid a call to git-config as long as
possible. The stupid OS is my reason for this change, actually:
diffstat not just takes too long. It also takes a *long* while before
the diffstat even starts!
Documentation/git-merge.txt | 2 +-
Documentation/merge-options.txt | 4 ++++
git-merge.sh | 18 ++++++++++++------
git-pull.sh | 3 +++
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 9c08efa..912ef29 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -9,7 +9,7 @@ git-merge - Join two or more development histories together
SYNOPSIS
--------
[verse]
-'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]...
+'git-merge' [-n] [--summary] [--no-commit] [--squash] [-s <strategy>]...
[-m <msg>] <remote> <remote>...
DESCRIPTION
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 182cef5..56f1d8d 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,3 +1,7 @@
+--summary::
+ Show a diffstat at the end of the merge. The diffstat is also
+ controlled by the configuration option merge.diffstat.
+
-n, \--no-summary::
Do not show diffstat at the end of the merge.
diff --git a/git-merge.sh b/git-merge.sh
index 351676f..80f7de8 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -3,7 +3,7 @@
# Copyright (c) 2005 Junio C Hamano
#
-USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'
+USAGE='[-n] [--summary] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'
SUBDIRECTORY_OK=Yes
. git-sh-setup
@@ -88,12 +88,11 @@ finish () {
'')
;;
?*)
- case "$no_summary" in
- '')
+ if test "$show_diffstat" = t
+ then
# We want color (if set), but no pager
GIT_PAGER='' git-diff --stat --summary -M "$head" "$1"
- ;;
- esac
+ fi
;;
esac
}
@@ -126,7 +125,9 @@ do
case "$1" in
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
--no-summa|--no-summar|--no-summary)
- no_summary=t ;;
+ show_diffstat=false ;;
+ --summary)
+ show_diffstat=t ;;
--sq|--squ|--squa|--squas|--squash)
squash=t no_commit=t ;;
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
@@ -168,6 +169,11 @@ do
shift
done
+if test -z "$show_diffstat"; then
+ test "$(git-config merge.diffstat)" = false && show_diffstat=false
+ test -z "$show_diffstat" && show_diffstat=t
+fi
+
# This could be traditional "merge <msg> HEAD <commit>..." and the
# way we can tell it is to see if the second token is HEAD, but some
# people might have misused the interface and used a committish that
diff --git a/git-pull.sh b/git-pull.sh
index a3665d7..ba0ca07 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -22,6 +22,9 @@ do
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
--no-summa|--no-summar|--no-summary)
no_summary=-n ;;
+ --summary)
+ no_summary=$1
+ ;;
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
no_commit=--no-commit ;;
--sq|--squ|--squa|--squas|--squash)
--
1.5.2.36.g04e2-dirty
^ permalink raw reply related
* Re: [PATCH] disable merge summaries if they are disabled
From: Alex Riesen @ 2007-05-23 19:58 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git Mailing List
In-Reply-To: <7vhcq32yda.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano, Wed, May 23, 2007 20:22:57 +0200:
> "Alex Riesen" <raa.lkml@gmail.com> writes:
>
> > Otherwise the merge.summary option has no visible effect.
>
> I suspect you are mistaking a different merge summary. The
> option affects fmt-merge-msg, iow, the shortlog looking summary
> that appears as the commit message in a merge commit.
>
> The command line parameter --no-summary inhibits the diffstat
> given to the terminal after "git-pull/git-merge" is made.
>
I did it again, didn't I?! :)
^ permalink raw reply
* Re: [PATCH] disable merge summaries if they are disabled
From: Junio C Hamano @ 2007-05-23 18:22 UTC (permalink / raw)
To: Alex Riesen; +Cc: Git Mailing List
In-Reply-To: <81b0412b0705230828s7fcdd836gf3bb92000d8ebd79@mail.gmail.com>
"Alex Riesen" <raa.lkml@gmail.com> writes:
> Otherwise the merge.summary option has no visible effect.
I suspect you are mistaking a different merge summary. The
option affects fmt-merge-msg, iow, the shortlog looking summary
that appears as the commit message in a merge commit.
The command line parameter --no-summary inhibits the diffstat
given to the terminal after "git-pull/git-merge" is made.
^ permalink raw reply
* Re: [PATCH] Use git-for-each-ref to check whether the origin branch exists.
From: Junio C Hamano @ 2007-05-23 18:06 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Stephan Springl, git
In-Reply-To: <Pine.LNX.4.64.0705231153000.4113@racer.site>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Default for ref-packed repositories is to pack only the tags,
> therefore you usually do not need this patch. However, it looks
> obviously correct to me. A cursory test also showed that it does
> not break anything.
>
> > Maybe you want to use this or a similar solution to be
> > integrated in stock git.
>
> Unfortunately your patch is white-space corrupted (it has an extra
> space on all lines starting with a space, it seems). Therefore I
> redid it with this email.
>
> It would be nice to follow Documentation/SubmittingPatches next
> time. For example, I guess that you want to sign off on it...
Thanks both.
^ permalink raw reply
* Re: just fetching HEAD of repository
From: Guilhem Bonnefille @ 2007-05-23 17:12 UTC (permalink / raw)
To: Stian Haklev; +Cc: git
In-Reply-To: <566574ef0705210201wc5c0adbmaa22d197b16bf72d@mail.gmail.com>
Are you looking for something to "shallow clone" the remote git repo
(as replyed by Matthieu, or something more similar to the "cvs export"
or "svn export" commands (ie exporting a current snapshot, not a
working repo)?
On 5/21/07, Stian Haklev <shaklev@gmail.com> wrote:
> After checking all the docs, I am still wondering if there is a way to
> get only the last commit from a given git repository. Sometimes I
> really just want the latest code so I can compile it - and let's say
> they are not running gitweb, or it is not convenient to go to gitweb
> and ask for a tar package to be made? This is especially relevant in
> countries with slow internet connection - here in Indonesia it takes
> me an hour to clone the git repository for example, never mind let's
> say the Linux kernel.
>
> Thank you
> Stian
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Guilhem BONNEFILLE
-=- #UIN: 15146515 JID: guyou@im.apinc.org MSN: guilhem_bonnefille@hotmail.com
-=- mailto:guilhem.bonnefille@gmail.com
-=- http://nathguil.free.fr/
^ permalink raw reply
* [PATCH] pack-objects: clarification & option checks for --max-pack-size
From: Dana How @ 2007-05-23 17:11 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git Mailing List, danahow
Explain the special code for detecting a corner-case error,
and complain about --stdout & --max-pack-size being used together.
Signed-off-by: Dana L. How <danahow@gmail.com>
---
builtin-pack-objects.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 19b0aa1..a5bade6 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -679,6 +679,12 @@ static void write_pack_file(void)
stop_progress(&progress_state);
if (written != nr_result)
die("wrote %u objects while expecting %u", written, nr_result);
+ /*
+ * We have scanned through [0 ... i). Since we have written
+ * the correct number of objects, the remaining [i ... nr_objects)
+ * items must be either already written (due to out-of-order delta base)
+ * or a preferred base. Count those which are neither and complain if any.
+ */
for (j = 0; i < nr_objects; i++) {
struct object_entry *e = objects + i;
j += !e->offset && !e->preferred_base;
@@ -1852,6 +1858,9 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
if (pack_to_stdout != !base_name)
usage(pack_usage);
+ if (pack_to_stdout && pack_size_limit)
+ die("--max-pack-size cannot be used to build a pack for transfer.");
+
if (!pack_to_stdout && thin)
die("--thin cannot be used to build an indexable pack.");
--
1.5.2.762.gd8c6-dirty
^ permalink raw reply related
* [PATCH] Fix the progress code to output LF only when it is really needed
From: Alex Riesen @ 2007-05-23 16:07 UTC (permalink / raw)
To: Git Mailing List; +Cc: Junio C Hamano
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
I was wondering about why git-reset --hard now prints an empty
line between the command and the oneline commit description.
progress.c | 6 +++++-
progress.h | 1 +
2 files changed, 6 insertions(+), 1 deletions(-)
[-- Attachment #2: 0001-Fix-the-progress-code-to-output-LF-only-when-it-is-rea.txt --]
[-- Type: text/plain, Size: 1933 bytes --]
From 139c597fecbb9ddf18c47b12cc97c42763a133bf Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 23 May 2007 17:55:28 +0200
Subject: [PATCH] Fix the progress code to output LF only when it is really needed
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
progress.c | 6 +++++-
progress.h | 1 +
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/progress.c b/progress.c
index 05f7890..4344f4e 100644
--- a/progress.c
+++ b/progress.c
@@ -62,11 +62,13 @@ int display_progress(struct progress *progress, unsigned n)
fprintf(stderr, "%s%4u%% (%u/%u) done\r",
progress->prefix, percent, n, progress->total);
progress_update = 0;
+ progress->need_lf = 1;
return 1;
}
} else if (progress_update) {
fprintf(stderr, "%s%u\r", progress->prefix, n);
progress_update = 0;
+ progress->need_lf = 1;
return 1;
}
return 0;
@@ -80,6 +82,7 @@ void start_progress(struct progress *progress, const char *title,
progress->total = total;
progress->last_percent = -1;
progress->delay = 0;
+ progress->need_lf = 0;
if (snprintf(buf, sizeof(buf), title, total))
fprintf(stderr, "%s\n", buf);
set_progress_signal();
@@ -95,12 +98,13 @@ void start_progress_delay(struct progress *progress, const char *title,
progress->delayed_percent_treshold = percent_treshold;
progress->delayed_title = title;
progress->delay = delay;
+ progress->need_lf = 0;
set_progress_signal();
}
void stop_progress(struct progress *progress)
{
clear_progress_signal();
- if (progress->total)
+ if (progress->need_lf)
fputc('\n', stderr);
}
diff --git a/progress.h b/progress.h
index 5ae1a89..a7c17ca 100644
--- a/progress.h
+++ b/progress.h
@@ -8,6 +8,7 @@ struct progress {
unsigned delay;
unsigned delayed_percent_treshold;
const char *delayed_title;
+ int need_lf;
};
int display_progress(struct progress *progress, unsigned n);
--
1.5.2.787.g56770
^ permalink raw reply related
* [PATCH] Add an option to override the configured setting for merge summaries
From: Alex Riesen @ 2007-05-23 16:04 UTC (permalink / raw)
To: Git Mailing List; +Cc: Junio C Hamano
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
Just for completeness.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
git-merge.sh | 5 ++++-
git-pull.sh | 3 +++
2 files changed, 7 insertions(+), 1 deletions(-)
[-- Attachment #2: 0002-Add-an-option-to-override-the-configured-setting-for-m.txt --]
[-- Type: text/plain, Size: 1527 bytes --]
From 48a6a3db1a21f1ce3db516987b167a9d6b2143a7 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 23 May 2007 17:36:00 +0200
Subject: [PATCH] Add an option to override the configured setting for merge summaries
Just for completeness.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
git-merge.sh | 5 ++++-
git-pull.sh | 3 +++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/git-merge.sh b/git-merge.sh
index 7fbe03a..e79cc76 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -3,7 +3,7 @@
# Copyright (c) 2005 Junio C Hamano
#
-USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'
+USAGE='[-n] [--summary] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'
SUBDIRECTORY_OK=Yes
. git-sh-setup
@@ -128,6 +128,9 @@ do
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
--no-summa|--no-summar|--no-summary)
no_summary=t ;;
+ --summary)
+ no_summary=
+ ;;
--sq|--squ|--squa|--squas|--squash)
squash=t no_commit=t ;;
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
diff --git a/git-pull.sh b/git-pull.sh
index a3665d7..ba0ca07 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -22,6 +22,9 @@ do
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
--no-summa|--no-summar|--no-summary)
no_summary=-n ;;
+ --summary)
+ no_summary=$1
+ ;;
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
no_commit=--no-commit ;;
--sq|--squ|--squa|--squas|--squash)
--
1.5.2.787.g56770
^ permalink raw reply related
* Re: [PATCH] disable merge summaries if they are disabled
From: Alex Riesen @ 2007-05-23 16:03 UTC (permalink / raw)
To: Git Mailing List; +Cc: Junio C Hamano
In-Reply-To: <81b0412b0705230828s7fcdd836gf3bb92000d8ebd79@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
Otherwise the merge.summary option has no visible effect.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
Forgot the sign-off.
git-merge.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
[-- Attachment #2: 0001-disable-merge-summaries-if-the-are-disabled.txt --]
[-- Type: text/plain, Size: 666 bytes --]
From 20ef81ca3b30a4c96906b3512ca1b52d2bec3698 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 23 May 2007 15:52:16 +0200
Subject: [PATCH] disable merge summaries if they are disabled
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
git-merge.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/git-merge.sh b/git-merge.sh
index 351676f..7fbe03a 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -121,6 +121,7 @@ merge_name () {
case "$#" in 0) usage ;; esac
have_message=
+test $(git-config merge.summary) = false && no_summary=t
while case "$#" in 0) break ;; esac
do
case "$1" in
--
1.5.2.787.g56770
^ permalink raw reply related
* [PATCH] disable merge summaries if they are disabled
From: Alex Riesen @ 2007-05-23 15:28 UTC (permalink / raw)
To: Git Mailing List; +Cc: Junio C Hamano
[-- Attachment #1: Type: text/plain, Size: 136 bytes --]
Otherwise the merge.summary option has no visible effect.
---
git-merge.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
[-- Attachment #2: 0001-disable-merge-summaries-if-the-are-disabled.txt --]
[-- Type: text/plain, Size: 617 bytes --]
From 20ef81ca3b30a4c96906b3512ca1b52d2bec3698 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 23 May 2007 15:52:16 +0200
Subject: [PATCH] disable merge summaries if they are disabled
---
git-merge.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/git-merge.sh b/git-merge.sh
index 351676f..7fbe03a 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -121,6 +121,7 @@ merge_name () {
case "$#" in 0) usage ;; esac
have_message=
+test $(git-config merge.summary) = false && no_summary=t
while case "$#" in 0) break ;; esac
do
case "$1" in
--
1.5.2.784.gb18c
^ permalink raw reply related
* Re: HTTP trees trailing GIT trees
From: Panagiotis Issaris @ 2007-05-23 14:11 UTC (permalink / raw)
To: Petr Baudis; +Cc: git
In-Reply-To: <20070523140552.GN4489@pasky.or.cz>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
Petr Baudis wrote:
> Hi,
>
> On Wed, May 23, 2007 at 04:01:33PM CEST, Panagiotis Issaris wrote:
>> I reported this to the person who had setup the repository:
>> http://article.gmane.org/gmane.comp.video.ffmpeg.devel/51151
>>
>> But unfortunately, the problem seems to remain.
>>
>> Is this a known problem, or might this be a bug or misconfiguration?
>
> did any push happenned since the post-update hook was enabled? It
> takes effect only after the next push. So far,
>
> http://git.mplayerhq.hu/ffmpeg/info/refs
>
> and
>
> http://git.mplayerhq.hu/ffmpeg/refs/heads/master
>
> is still out-of-sync (keeping this in sync is what is the job of the
> post-update hook, or git-update-server-info respectively).
Yes, I'd think so, as Måns stated that he had enabled the hook on
2007-05-22 20:43:27. The last commit shown on http://git.mplayerhq.hu/
through gitweb occurred 25 minutes ago ("Wed, 23 May 2007 13:46:11 +0000").
Thanks for your fast reply.
With friendly regards,
Takis
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFGVEuA9kOxLuzz4CkRAkXTAJ9xqbkUO6qF88HwV7GSYnVkV+VRNgCfSr/D
ZPPYBfeD9RpqbXNKwmukObc=
=wkyo
-----END PGP SIGNATURE-----
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox