* Re: [PATCHv2 4/4] Rename push.default to push.mode
From: Michael J Gruber @ 2009-03-30 10:42 UTC (permalink / raw)
To: Santi Béjar; +Cc: git
In-Reply-To: <1238407903-28020-5-git-send-email-santi@agolina.net>
Santi Béjar venit, vidit, dixit 30.03.2009 12:11:
> push.default was too generic, and also didn't specify if it was about
> remote, refspec, branches, behaviour...
I guess we go for US spelling here, so it's "behavior" ;)
>
> Signed-off-by: Santi Béjar <santi@agolina.net>
> ---
> Documentation/RelNotes-1.6.3.txt | 2 +-
> Documentation/config.txt | 4 ++--
> builtin-push.c | 16 ++++++++--------
> cache.h | 14 +++++++-------
> config.c | 10 +++++-----
> environment.c | 2 +-
> 6 files changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNotes-1.6.3.txt
> index f0a2e41..67b2b66 100644
> --- a/Documentation/RelNotes-1.6.3.txt
> +++ b/Documentation/RelNotes-1.6.3.txt
> @@ -24,7 +24,7 @@ receive.denyDeleteCurrent in the receiving repository.
>
> When the user does not tell "git push" what to push, it has always
> pushed matching refs. For some people it is unexpected, and a new
> -configuration variable push.default has been introduced to allow
> +configuration variable push.mode has been introduced to allow
> changing a different default behaviour. To advertise the new feature,
Maybe time to change it here, too.
> a big warning is issued if this is not configured and a git push without
> arguments is attempted.
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 38ab785..80bb3a6 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -480,7 +480,7 @@ branch.<name>.remote::
> branch.<name>.merge::
> It defines, together with branch.<name>.remote, the upstream branch
> for the given branch. It tells 'git-fetch'/'git-pull' which
> - branch to merge and can also afect 'git-push' (see push.default).
> + branch to merge and can also afect 'git-push' (see push.mode).
s/afect/affect/
> When in branch <name>, it tells 'git-fetch' the default
> refspec to be marked for merging in FETCH_HEAD. The value is
> handled like the remote part of a refspec, and must match a
> @@ -1215,7 +1215,7 @@ pull.octopus::
> pull.twohead::
> The default merge strategy to use when pulling a single branch.
>
> -push.default::
> +push.mode::
> Defines the action git push should take if no refspec is given
> on the command line, no refspec is configured in the remote, and
> no refspec is implied by any of the options given on the command
> diff --git a/builtin-push.c b/builtin-push.c
> index 2eabcd3..c2c4de1 100644
> --- a/builtin-push.c
> +++ b/builtin-push.c
> @@ -72,7 +72,7 @@ static const char *warn_unconfigured_push_msg[] = {
> "not necessarily be what you want to happen.",
> "",
> "You can specify what action you want to take in this case, and",
> - "avoid seeing this message again, by configuring 'push.default' to:",
> + "avoid seeing this message again, by configuring 'push.mode' to:",
> " 'nothing' : Do not push anything",
> " 'matching' : Push all matching branches (default)",
> " 'tracking' : Push the current branch to whatever it is tracking",
> @@ -89,26 +89,26 @@ static void warn_unconfigured_push(void)
> static void setup_default_push_refspecs(void)
> {
> git_config(git_default_config, NULL);
> - switch (push_default) {
> - case PUSH_DEFAULT_UNSPECIFIED:
> + switch (push_mode) {
> + case PUSH_MODE_UNSPECIFIED:
> warn_unconfigured_push();
> /* fallthrough */
>
> - case PUSH_DEFAULT_MATCHING:
> + case PUSH_MODE_MATCHING:
> add_refspec(":");
> break;
>
> - case PUSH_DEFAULT_TRACKING:
> + case PUSH_MODE_TRACKING:
> setup_push_tracking();
> break;
>
> - case PUSH_DEFAULT_CURRENT:
> + case PUSH_MODE_CURRENT:
> add_refspec("HEAD");
> break;
>
> - case PUSH_DEFAULT_NOTHING:
> + case PUSH_MODE_NOTHING:
> die("You didn't specify any refspecs to push, and "
> - "push.default is \"nothing\".");
> + "push.mode is \"nothing\".");
> break;
> }
> }
> diff --git a/cache.h b/cache.h
> index 641529b..1625965 100644
> --- a/cache.h
> +++ b/cache.h
> @@ -542,17 +542,17 @@ enum rebase_setup_type {
> AUTOREBASE_ALWAYS,
> };
>
> -enum push_default_type {
> - PUSH_DEFAULT_UNSPECIFIED = -1,
> - PUSH_DEFAULT_NOTHING = 0,
> - PUSH_DEFAULT_MATCHING,
> - PUSH_DEFAULT_TRACKING,
> - PUSH_DEFAULT_CURRENT,
> +enum push_mode_type {
> + PUSH_MODE_UNSPECIFIED = -1,
> + PUSH_MODE_NOTHING = 0,
> + PUSH_MODE_MATCHING,
> + PUSH_MODE_TRACKING,
> + PUSH_MODE_CURRENT,
> };
>
> extern enum branch_track git_branch_track;
> extern enum rebase_setup_type autorebase;
> -extern enum push_default_type push_default;
> +extern enum push_mode_type push_mode;
>
> #define GIT_REPO_VERSION 0
> extern int repository_format_version;
> diff --git a/config.c b/config.c
> index b76fe4c..ba02cfb 100644
> --- a/config.c
> +++ b/config.c
> @@ -567,17 +567,17 @@ static int git_default_branch_config(const char *var, const char *value)
>
> static int git_default_push_config(const char *var, const char *value)
> {
> - if (!strcmp(var, "push.default")) {
> + if (!strcmp(var, "push.mode")) {
> if (!value)
> return config_error_nonbool(var);
> else if (!strcmp(value, "nothing"))
> - push_default = PUSH_DEFAULT_NOTHING;
> + push_mode = PUSH_MODE_NOTHING;
> else if (!strcmp(value, "matching"))
> - push_default = PUSH_DEFAULT_MATCHING;
> + push_mode = PUSH_MODE_MATCHING;
> else if (!strcmp(value, "tracking"))
> - push_default = PUSH_DEFAULT_TRACKING;
> + push_mode = PUSH_MODE_TRACKING;
> else if (!strcmp(value, "current"))
> - push_default = PUSH_DEFAULT_CURRENT;
> + push_mode = PUSH_MODE_CURRENT;
> else {
> error("Malformed value for %s: %s", var, value);
> return error("Must be one of nothing, matching, "
> diff --git a/environment.c b/environment.c
> index 4696885..c925ea4 100644
> --- a/environment.c
> +++ b/environment.c
> @@ -42,7 +42,7 @@ enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
> unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
> enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
> enum rebase_setup_type autorebase = AUTOREBASE_NEVER;
> -enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED;
> +enum push_mode_type push_mode = PUSH_MODE_UNSPECIFIED;
>
> /* Parallel index stat data preload? */
> int core_preload_index = 0;
Your patches contain quoted-printable characters all over the place. Are
they not sent with git send-email?
Michael
^ permalink raw reply
* Re: [PATCHv2 3/4] Documentation: branch.*.merge can also afect 'git-push'
From: Michael J Gruber @ 2009-03-30 10:35 UTC (permalink / raw)
To: Santi Béjar; +Cc: git
In-Reply-To: <1238407903-28020-4-git-send-email-santi@agolina.net>
Santi Béjar venit, vidit, dixit 30.03.2009 12:11:
>
> Signed-off-by: Santi Béjar <santi@agolina.net>
> ---
> Documentation/config.txt | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 7ae584f..38ab785 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -480,7 +480,7 @@ branch.<name>.remote::
> branch.<name>.merge::
> It defines, together with branch.<name>.remote, the upstream branch
> for the given branch. It tells 'git-fetch'/'git-pull' which
> - branch to merge.
> + branch to merge and can also afect 'git-push' (see push.default).
s/afect/affect/
> When in branch <name>, it tells 'git-fetch' the default
> refspec to be marked for merging in FETCH_HEAD. The value is
> handled like the remote part of a refspec, and must match a
^ permalink raw reply
* Re: [PATCH 1/2] send-email: refactor and ensure prompting doesn't loop forever
From: Matthieu Moy @ 2009-03-30 11:29 UTC (permalink / raw)
To: Jay Soffian; +Cc: git, Junio C Hamano
In-Reply-To: <1238290751-57461-1-git-send-email-jaysoffian@gmail.com>
Jay Soffian <jaysoffian@gmail.com> writes:
> Several places in send-email prompt for input, and will do so forever
> when the input is EOF. This is poor behavior when send-email is run
> unattended (say from cron).
Thanks a lot for the patch, it does fix the problem I reported in
http://article.gmane.org/gmane.comp.version-control.git/114577 .
Minor problem: I still (harmless) get error messages in my log:
print() on closed filehandle FOUT at /usr/share/perl/5.8/Term/ReadLine.pm line 193.
readline() on closed filehandle FIN at /usr/share/perl/5.8/Term/ReadLine.pm line 395.
print() on closed filehandle FOUT at /usr/share/perl/5.8/Term/ReadLine.pm line 203.
But I can very well live with them!
--
Matthieu
^ permalink raw reply
* [PATCH] Fix bash completion in path with spaces
From: Daniel Cheng (aka SDiZ) @ 2009-03-30 11:27 UTC (permalink / raw)
To: gitster; +Cc: git, Daniel Cheng (aka SDiZ)
Signed-off-by: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com>
---
contrib/completion/git-completion.bash | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1c6b0e2..e72ce24 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1103,7 +1103,7 @@ _git_log ()
local cur="${COMP_WORDS[COMP_CWORD]}"
local g="$(git rev-parse --git-dir 2>/dev/null)"
local merge=""
- if [ -f $g/MERGE_HEAD ]; then
+ if [ -f "$g/MERGE_HEAD" ]; then
merge="--merge"
fi
case "$cur" in
@@ -1943,7 +1943,7 @@ _gitk ()
local cur="${COMP_WORDS[COMP_CWORD]}"
local g="$(__gitdir)"
local merge=""
- if [ -f $g/MERGE_HEAD ]; then
+ if [ -f "$g/MERGE_HEAD" ]; then
merge="--merge"
fi
case "$cur" in
--
1.6.2
^ permalink raw reply related
* Re: Segfault on merge with 1.6.2.1
From: Miklos Vajna @ 2009-03-30 11:03 UTC (permalink / raw)
To: Michael Johnson; +Cc: git
In-Reply-To: <op.urk20nanso3nzr@sulidor.mdjohnson.us>
[-- Attachment #1: Type: text/plain, Size: 634 bytes --]
On Sun, Mar 29, 2009 at 09:39:49PM -0500, Michael Johnson <redbeard@mdjohnson.us> wrote:
> Well, I've got a backtrace, but I don't have debugging symbols,
> apparently. There is not a Debian package I can find that has them. I
> checked debug.debian.net, as well as the standard sid repository. So I
> will have to rebuild the package with debugging turned on. I will not be
> able to do that tonight, unfortunately. I will probably have a chance
> tomorrow evening.
Okay, no rush. In case Dscho's patch does not fix your problem, please
rebuild git with debug symbols enabled and send a normal trace.
Thanks.
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: [PATCH 0/5] Header includes cleanup
From: Johannes Sixt @ 2009-03-30 10:50 UTC (permalink / raw)
To: Nathaniel P Dawson; +Cc: git
In-Reply-To: <1238406925-15907-1-git-send-email-nathaniel.dawson@gmail.com>
Please wrap your lines at ca. 75 columns.
Nathaniel P Dawson schrieb:
> This is just the beginning for this project. I'm slowly cleaning up
> the header includes one chunk at a time. I hope my patches aren't too
> messy, I've learned how to better utilize git to make patches and
> organize my commits logically so I'll submit neater chunks henceforth.
> You can expect patches from me nightly until I've finished this project.
You have removed includes that are implied by other includes, i.e. if
foo.h includes bar.h, then you removed #include "bar.h" from *.c if there
is #include "foo.h".
IMO, this is not a good guiding principle to reduce includes. A better
principle is to keep #include "bar.h" in a source or header file iff a
feature that is declared or defined in bar.h is *used* *directly* in that
source or header file, regardless of whether bar.h is included in foo.h
that is itself included in that source or header file.
If this latter principle is obeyed, then the build won't break by removing
the include of foo.h (for the reason that nothing of foo.h is *use*
*directly* anymore).
-- Hannes
^ permalink raw reply
* Re: [Q] merging from one (kernel) stable to another?
From: Johannes Sixt @ 2009-03-30 10:38 UTC (permalink / raw)
To: Andreas Ericsson; +Cc: Brian Foster, git mailing list
In-Reply-To: <49D09207.9080407@op5.se>
Andreas Ericsson schrieb:
> A possibly better approach for you is to "git format-patch"
> your own changes and apply them to a clean 2.6.26.8 tree
> instead of trying to merge 2.6.26.8 into 2.6.21.
After you have successfully done *that*, you know how the resulting tree
must look like, and you give it a tag, say "like-this". If you really want
to have a merge, then you can just repeat the merge with your original
branch, at which time you will get tons of conflicts. Now you just 'git
checkout like-this -- .' and you have all your conflicts resolved in the
way you need them.
-- Hannes
^ permalink raw reply
* Re: [PATCH 4/4] Rename push.default to push.style
From: Jeff King @ 2009-03-30 10:29 UTC (permalink / raw)
To: Santi Béjar; +Cc: Johannes Schindelin, Finn Arne Gangstad, git
In-Reply-To: <adf1fd3d0903300200v65393b1bif0050392aa44652e@mail.gmail.com>
On Mon, Mar 30, 2009 at 11:00:03AM +0200, Santi Béjar wrote:
> >> This configuration variable says what push should do
> >> when no refspec is given and none are configured, so the word "default"
> >> should be in there at least. Maybe "defaultref" would have been better?
>
> I don't see the point of the word default, a lot of configuration is
> to set the default value. Git has branch.name.remote, not
> branch.name.defaultremote, or user.email, not user.defaultemail,...
The usual case is two layers of options: command line and config
options. Thus "git push <remote>" overrides "branch.*.remote".
But in this case there are actually _three_ layers: command line,
branch.*.push, and now push.default. I think a name like "push.mode"
doesn't make clear the fact that it will never be looked at if you have
"branch.*.push" set up.
I think you have a point that "default" is vague, but "defaultMode"
would be better than simply "mode".
-Peff
^ permalink raw reply
* [PATCHv2 4/4] Rename push.default to push.mode
From: Santi Béjar @ 2009-03-30 10:11 UTC (permalink / raw)
To: git
In-Reply-To: <1238407903-28020-1-git-send-email-santi@agolina.net>
push.default was too generic, and also didn't specify if it was about
remote, refspec, branches, behaviour...
Signed-off-by: Santi Béjar <santi@agolina.net>
---
Documentation/RelNotes-1.6.3.txt | 2 +-
Documentation/config.txt | 4 ++--
builtin-push.c | 16 ++++++++--------
cache.h | 14 +++++++-------
config.c | 10 +++++-----
environment.c | 2 +-
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNotes-1.6.3.txt
index f0a2e41..67b2b66 100644
--- a/Documentation/RelNotes-1.6.3.txt
+++ b/Documentation/RelNotes-1.6.3.txt
@@ -24,7 +24,7 @@ receive.denyDeleteCurrent in the receiving repository.
When the user does not tell "git push" what to push, it has always
pushed matching refs. For some people it is unexpected, and a new
-configuration variable push.default has been introduced to allow
+configuration variable push.mode has been introduced to allow
changing a different default behaviour. To advertise the new feature,
a big warning is issued if this is not configured and a git push without
arguments is attempted.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 38ab785..80bb3a6 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -480,7 +480,7 @@ branch.<name>.remote::
branch.<name>.merge::
It defines, together with branch.<name>.remote, the upstream branch
for the given branch. It tells 'git-fetch'/'git-pull' which
- branch to merge and can also afect 'git-push' (see push.default).
+ branch to merge and can also afect 'git-push' (see push.mode).
When in branch <name>, it tells 'git-fetch' the default
refspec to be marked for merging in FETCH_HEAD. The value is
handled like the remote part of a refspec, and must match a
@@ -1215,7 +1215,7 @@ pull.octopus::
pull.twohead::
The default merge strategy to use when pulling a single branch.
-push.default::
+push.mode::
Defines the action git push should take if no refspec is given
on the command line, no refspec is configured in the remote, and
no refspec is implied by any of the options given on the command
diff --git a/builtin-push.c b/builtin-push.c
index 2eabcd3..c2c4de1 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -72,7 +72,7 @@ static const char *warn_unconfigured_push_msg[] = {
"not necessarily be what you want to happen.",
"",
"You can specify what action you want to take in this case, and",
- "avoid seeing this message again, by configuring 'push.default' to:",
+ "avoid seeing this message again, by configuring 'push.mode' to:",
" 'nothing' : Do not push anything",
" 'matching' : Push all matching branches (default)",
" 'tracking' : Push the current branch to whatever it is tracking",
@@ -89,26 +89,26 @@ static void warn_unconfigured_push(void)
static void setup_default_push_refspecs(void)
{
git_config(git_default_config, NULL);
- switch (push_default) {
- case PUSH_DEFAULT_UNSPECIFIED:
+ switch (push_mode) {
+ case PUSH_MODE_UNSPECIFIED:
warn_unconfigured_push();
/* fallthrough */
- case PUSH_DEFAULT_MATCHING:
+ case PUSH_MODE_MATCHING:
add_refspec(":");
break;
- case PUSH_DEFAULT_TRACKING:
+ case PUSH_MODE_TRACKING:
setup_push_tracking();
break;
- case PUSH_DEFAULT_CURRENT:
+ case PUSH_MODE_CURRENT:
add_refspec("HEAD");
break;
- case PUSH_DEFAULT_NOTHING:
+ case PUSH_MODE_NOTHING:
die("You didn't specify any refspecs to push, and "
- "push.default is \"nothing\".");
+ "push.mode is \"nothing\".");
break;
}
}
diff --git a/cache.h b/cache.h
index 641529b..1625965 100644
--- a/cache.h
+++ b/cache.h
@@ -542,17 +542,17 @@ enum rebase_setup_type {
AUTOREBASE_ALWAYS,
};
-enum push_default_type {
- PUSH_DEFAULT_UNSPECIFIED = -1,
- PUSH_DEFAULT_NOTHING = 0,
- PUSH_DEFAULT_MATCHING,
- PUSH_DEFAULT_TRACKING,
- PUSH_DEFAULT_CURRENT,
+enum push_mode_type {
+ PUSH_MODE_UNSPECIFIED = -1,
+ PUSH_MODE_NOTHING = 0,
+ PUSH_MODE_MATCHING,
+ PUSH_MODE_TRACKING,
+ PUSH_MODE_CURRENT,
};
extern enum branch_track git_branch_track;
extern enum rebase_setup_type autorebase;
-extern enum push_default_type push_default;
+extern enum push_mode_type push_mode;
#define GIT_REPO_VERSION 0
extern int repository_format_version;
diff --git a/config.c b/config.c
index b76fe4c..ba02cfb 100644
--- a/config.c
+++ b/config.c
@@ -567,17 +567,17 @@ static int git_default_branch_config(const char *var, const char *value)
static int git_default_push_config(const char *var, const char *value)
{
- if (!strcmp(var, "push.default")) {
+ if (!strcmp(var, "push.mode")) {
if (!value)
return config_error_nonbool(var);
else if (!strcmp(value, "nothing"))
- push_default = PUSH_DEFAULT_NOTHING;
+ push_mode = PUSH_MODE_NOTHING;
else if (!strcmp(value, "matching"))
- push_default = PUSH_DEFAULT_MATCHING;
+ push_mode = PUSH_MODE_MATCHING;
else if (!strcmp(value, "tracking"))
- push_default = PUSH_DEFAULT_TRACKING;
+ push_mode = PUSH_MODE_TRACKING;
else if (!strcmp(value, "current"))
- push_default = PUSH_DEFAULT_CURRENT;
+ push_mode = PUSH_MODE_CURRENT;
else {
error("Malformed value for %s: %s", var, value);
return error("Must be one of nothing, matching, "
diff --git a/environment.c b/environment.c
index 4696885..c925ea4 100644
--- a/environment.c
+++ b/environment.c
@@ -42,7 +42,7 @@ enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
enum rebase_setup_type autorebase = AUTOREBASE_NEVER;
-enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED;
+enum push_mode_type push_mode = PUSH_MODE_UNSPECIFIED;
/* Parallel index stat data preload? */
int core_preload_index = 0;
--
1.6.1.258.g7ff14
^ permalink raw reply related
* [PATCHv2 2/4] Documentation: push.default applies to all remotes
From: Santi Béjar @ 2009-03-30 10:11 UTC (permalink / raw)
To: git
In-Reply-To: <1238407903-28020-1-git-send-email-santi@agolina.net>
push.default is not only for the current remote but setting the default
behaviour for all remotes.
Signed-off-by: Santi Béjar <santi@agolina.net>
---
Documentation/config.txt | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index fa2595b..7ae584f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1219,19 +1219,14 @@ push.default::
Defines the action git push should take if no refspec is given
on the command line, no refspec is configured in the remote, and
no refspec is implied by any of the options given on the command
- line.
-+
-The term `current remote` means the remote configured for the current
-branch, or `origin` if no remote is configured. `origin` is also used
-if you are not on any branch. Possible values are:
+ line. Possible values are:
+
* `nothing` do not push anything.
-* `matching` push all matching branches to the current remote.
+* `matching` push all matching branches.
All branches having the same name in both ends are considered to be
matching. This is the current default value.
* `tracking` push the current branch to the branch it is tracking.
-* `current` push the current branch to a branch of the same name on the
- current remote.
+* `current` push the current branch to a branch of the same name.
rebase.stat::
Whether to show a diffstat of what changed upstream since the last
--
1.6.1.258.g7ff14
^ permalink raw reply related
* [PATCHv2 3/4] Documentation: branch.*.merge can also afect 'git-push'
From: Santi Béjar @ 2009-03-30 10:11 UTC (permalink / raw)
To: git
In-Reply-To: <1238407903-28020-1-git-send-email-santi@agolina.net>
Signed-off-by: Santi Béjar <santi@agolina.net>
---
Documentation/config.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 7ae584f..38ab785 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -480,7 +480,7 @@ branch.<name>.remote::
branch.<name>.merge::
It defines, together with branch.<name>.remote, the upstream branch
for the given branch. It tells 'git-fetch'/'git-pull' which
- branch to merge.
+ branch to merge and can also afect 'git-push' (see push.default).
When in branch <name>, it tells 'git-fetch' the default
refspec to be marked for merging in FETCH_HEAD. The value is
handled like the remote part of a refspec, and must match a
--
1.6.1.258.g7ff14
^ permalink raw reply related
* [PATCHv2 1/4] Documentation: enhance branch.<name>.{remote,merge}
From: Santi Béjar @ 2009-03-30 10:11 UTC (permalink / raw)
To: git
In-Reply-To: <1238407903-28020-1-git-send-email-santi@agolina.net>
The documentation for branch.*.merge is very dense, so add a simple
explanation on top of it.
And branch.*.remote also afects 'git push'. Text taken from
'push.default'.
Signed-off-by: Santi Béjar <santi@agolina.net>
---
Documentation/config.txt | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 089569a..fa2595b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -473,10 +473,14 @@ branch.autosetuprebase::
This option defaults to never.
branch.<name>.remote::
- When in branch <name>, it tells 'git-fetch' which remote to fetch.
- If this option is not given, 'git-fetch' defaults to remote "origin".
+ When in branch <name>, it tells 'git-fetch' and 'git-push' which
+ remote to fetch/push, and defaults to `origin` if no remote is
+ configured. `origin` is also used if you are not on any branch.
branch.<name>.merge::
+ It defines, together with branch.<name>.remote, the upstream branch
+ for the given branch. It tells 'git-fetch'/'git-pull' which
+ branch to merge.
When in branch <name>, it tells 'git-fetch' the default
refspec to be marked for merging in FETCH_HEAD. The value is
handled like the remote part of a refspec, and must match a
--
1.6.1.258.g7ff14
^ permalink raw reply related
* [PATCHv2 0/4] push.default and branch.<name>.{remote,merge} changes
From: Santi Béjar @ 2009-03-30 10:11 UTC (permalink / raw)
To: git
Hi *,
the four patches are conceptually independent, but they have textual
dependency.
The 1st one can also be applied to 'maint'.
Changes from v1:
rename "tracking branch" to "upstream branch"
rename push.default to push.mode instead of push.style
Santi Béjar (4):
Documentation: enhance branch.<name>.{remote,merge}
Documentation: push.default applies to all remotes
Documentation: branch.*.merge can also afect 'git-push'
Rename push.default to push.mode
Documentation/RelNotes-1.6.3.txt | 2 +-
Documentation/config.txt | 21 ++++++++++-----------
builtin-push.c | 16 ++++++++--------
cache.h | 14 +++++++-------
config.c | 10 +++++-----
environment.c | 2 +-
6 files changed, 32 insertions(+), 33 deletions(-)
^ permalink raw reply
* [PATCH 4/5] Header includes cleanup
From: Nathaniel P Dawson @ 2009-03-30 9:55 UTC (permalink / raw)
To: git; +Cc: Nathaniel P Dawson
In-Reply-To: <1238406925-15907-4-git-send-email-nathaniel.dawson@gmail.com>
Deleted header includes of object.h, tree.h, strbuf.h, and decorate.h where commit.h was included since commit.h includes them.
Signed-off-by: Nathaniel P Dawson <nathaniel.dawson@gmail.com>
---
alloc.c | 1 -
builtin-receive-pack.c | 1 -
builtin-reset.c | 2 --
builtin.h | 2 --
bundle.c | 1 -
fsck.c | 3 +--
index-pack.c | 1 -
list-objects.c | 1 -
object.c | 1 -
read-cache.c | 1 -
revision.c | 2 --
server-info.c | 1 -
sha1_file.c | 1 -
sha1_name.c | 1 -
tag.c | 1 -
tree.c | 3 +--
upload-pack.c | 1 -
walker.c | 1 -
wt-status.c | 3 +--
19 files changed, 3 insertions(+), 25 deletions(-)
diff --git a/alloc.c b/alloc.c
index 5b3d4a2..af0dd88 100644
--- a/alloc.c
+++ b/alloc.c
@@ -11,7 +11,6 @@
*/
#include "cache.h"
#include "blob.h"
-#include "tree.h"
#include "commit.h"
#include "tag.h"
diff --git a/builtin-receive-pack.c b/builtin-receive-pack.c
index a970b39..e95aa41 100644
--- a/builtin-receive-pack.c
+++ b/builtin-receive-pack.c
@@ -5,7 +5,6 @@
#include "run-command.h"
#include "exec_cmd.h"
#include "commit.h"
-#include "object.h"
#include "remote.h"
#include "transport.h"
diff --git a/builtin-reset.c b/builtin-reset.c
index c0cb915..d44c935 100644
--- a/builtin-reset.c
+++ b/builtin-reset.c
@@ -9,13 +9,11 @@
*/
#include "cache.h"
#include "tag.h"
-#include "object.h"
#include "commit.h"
#include "run-command.h"
#include "refs.h"
#include "diff.h"
#include "diffcore.h"
-#include "tree.h"
#include "branch.h"
#include "parse-options.h"
diff --git a/builtin.h b/builtin.h
index 1495cf6..b9ef9fc 100644
--- a/builtin.h
+++ b/builtin.h
@@ -1,8 +1,6 @@
#ifndef BUILTIN_H
#define BUILTIN_H
-#include "git-compat-util.h"
-#include "strbuf.h"
#include "cache.h"
#include "commit.h"
diff --git a/bundle.c b/bundle.c
index d0dd818..14966f8 100644
--- a/bundle.c
+++ b/bundle.c
@@ -1,6 +1,5 @@
#include "cache.h"
#include "bundle.h"
-#include "object.h"
#include "commit.h"
#include "diff.h"
#include "revision.h"
diff --git a/fsck.c b/fsck.c
index e903f6a..8cbb6aa 100644
--- a/fsck.c
+++ b/fsck.c
@@ -1,8 +1,7 @@
#include "cache.h"
#include "blob.h"
-#include "tree.h"
-#include "tree-walk.h"
#include "commit.h"
+#include "tree-walk.h"
#include "tag.h"
#include "fsck.h"
diff --git a/index-pack.c b/index-pack.c
index 7546822..ac6fc84 100644
--- a/index-pack.c
+++ b/index-pack.c
@@ -5,7 +5,6 @@
#include "blob.h"
#include "commit.h"
#include "tag.h"
-#include "tree.h"
#include "progress.h"
#include "fsck.h"
#include "exec_cmd.h"
diff --git a/list-objects.c b/list-objects.c
index c8b8375..6446f81 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -1,7 +1,6 @@
#include "cache.h"
#include "tag.h"
#include "commit.h"
-#include "tree.h"
#include "blob.h"
#include "diff.h"
#include "tree-walk.h"
diff --git a/object.c b/object.c
index 380652f..83f786c 100644
--- a/object.c
+++ b/object.c
@@ -1,6 +1,5 @@
#include "cache.h"
#include "blob.h"
-#include "tree.h"
#include "commit.h"
#include "tag.h"
diff --git a/read-cache.c b/read-cache.c
index 3f58711..b50b02e 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -8,7 +8,6 @@
#include "cache-tree.h"
#include "refs.h"
#include "dir.h"
-#include "tree.h"
#include "commit.h"
#include "diff.h"
#include "diffcore.h"
diff --git a/revision.c b/revision.c
index f5771c7..827108d 100644
--- a/revision.c
+++ b/revision.c
@@ -1,7 +1,6 @@
#include "cache.h"
#include "tag.h"
#include "blob.h"
-#include "tree.h"
#include "commit.h"
#include "diff.h"
#include "refs.h"
@@ -10,7 +9,6 @@
#include "grep.h"
#include "reflog-walk.h"
#include "patch-ids.h"
-#include "decorate.h"
#include "log-tree.h"
volatile show_early_output_fn_t show_early_output;
diff --git a/server-info.c b/server-info.c
index 66b0d9d..3d54c44 100644
--- a/server-info.c
+++ b/server-info.c
@@ -1,6 +1,5 @@
#include "cache.h"
#include "refs.h"
-#include "object.h"
#include "commit.h"
#include "tag.h"
diff --git a/sha1_file.c b/sha1_file.c
index 54972f9..77e6f54 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -12,7 +12,6 @@
#include "blob.h"
#include "commit.h"
#include "tag.h"
-#include "tree.h"
#include "refs.h"
#include "pack-revindex.h"
#include "sha1-lookup.h"
diff --git a/sha1_name.c b/sha1_name.c
index 2f75179..c98cd30 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -1,7 +1,6 @@
#include "cache.h"
#include "tag.h"
#include "commit.h"
-#include "tree.h"
#include "blob.h"
#include "tree-walk.h"
#include "refs.h"
diff --git a/tag.c b/tag.c
index 4470d2b..94e2903 100644
--- a/tag.c
+++ b/tag.c
@@ -1,7 +1,6 @@
#include "cache.h"
#include "tag.h"
#include "commit.h"
-#include "tree.h"
#include "blob.h"
const char *tag_type = "tag";
diff --git a/tree.c b/tree.c
index 25d2e29..b9e427d 100644
--- a/tree.c
+++ b/tree.c
@@ -1,8 +1,7 @@
#include "cache.h"
#include "cache-tree.h"
-#include "tree.h"
-#include "blob.h"
#include "commit.h"
+#include "blob.h"
#include "tag.h"
#include "tree-walk.h"
diff --git a/upload-pack.c b/upload-pack.c
index a49d872..9a91b14 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -3,7 +3,6 @@
#include "pkt-line.h"
#include "sideband.h"
#include "tag.h"
-#include "object.h"
#include "commit.h"
#include "exec_cmd.h"
#include "diff.h"
diff --git a/walker.c b/walker.c
index e57630e..67ddcf6 100644
--- a/walker.c
+++ b/walker.c
@@ -1,7 +1,6 @@
#include "cache.h"
#include "walker.h"
#include "commit.h"
-#include "tree.h"
#include "tree-walk.h"
#include "tag.h"
#include "blob.h"
diff --git a/wt-status.c b/wt-status.c
index 929b00f..125a4c4 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1,9 +1,8 @@
#include "cache.h"
#include "wt-status.h"
#include "color.h"
-#include "object.h"
-#include "dir.h"
#include "commit.h"
+#include "dir.h"
#include "diff.h"
#include "revision.h"
#include "diffcore.h"
--
1.6.1.3
^ permalink raw reply related
* [PATCH 5/5] Header includes cleanup
From: Nathaniel P Dawson @ 2009-03-30 9:55 UTC (permalink / raw)
To: git; +Cc: Nathaniel P Dawson
In-Reply-To: <1238406925-15907-5-git-send-email-nathaniel.dawson@gmail.com>
Deleted header includes of tree-walk.h where diff.h was included since diff.h includes it.
Signed-off-by: Nathaniel P Dawson <nathaniel.dawson@gmail.com>
---
builtin-blame.c | 1 -
builtin-checkout.c | 3 +--
builtin-pack-objects.c | 1 -
builtin-reflog.c | 1 -
builtin-rev-list.c | 1 -
list-objects.c | 1 -
merge-recursive.c | 1 -
7 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/builtin-blame.c b/builtin-blame.c
index a91d350..bce181c 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -6,7 +6,6 @@
#include "builtin.h"
#include "blob.h"
#include "tag.h"
-#include "tree-walk.h"
#include "diff.h"
#include "diffcore.h"
#include "revision.h"
diff --git a/builtin-checkout.c b/builtin-checkout.c
index f8bb9ea..3000e87 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -3,13 +3,12 @@
#include "parse-options.h"
#include "refs.h"
#include "tree.h"
-#include "tree-walk.h"
+#include "diff.h"
#include "unpack-trees.h"
#include "dir.h"
#include "run-command.h"
#include "merge-recursive.h"
#include "branch.h"
-#include "diff.h"
#include "revision.h"
#include "remote.h"
#include "xdiff-interface.h"
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index c53147a..9d87fc7 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -7,7 +7,6 @@
#include "pack.h"
#include "pack-revindex.h"
#include "csum-file.h"
-#include "tree-walk.h"
#include "diff.h"
#include "revision.h"
#include "list-objects.h"
diff --git a/builtin-reflog.c b/builtin-reflog.c
index fcd92e8..4c122d6 100644
--- a/builtin-reflog.c
+++ b/builtin-reflog.c
@@ -1,7 +1,6 @@
#include "builtin.h"
#include "refs.h"
#include "dir.h"
-#include "tree-walk.h"
#include "diff.h"
#include "revision.h"
#include "reachable.h"
diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index bc86e3c..cedfe9a 100644
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -3,7 +3,6 @@
#include "refs.h"
#include "tag.h"
#include "tree.h"
-#include "tree-walk.h"
#include "diff.h"
#include "revision.h"
#include "list-objects.h"
diff --git a/list-objects.c b/list-objects.c
index 6446f81..715e06d 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -3,7 +3,6 @@
#include "commit.h"
#include "blob.h"
#include "diff.h"
-#include "tree-walk.h"
#include "revision.h"
#include "list-objects.h"
diff --git a/merge-recursive.c b/merge-recursive.c
index 352677c..370151e 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -6,7 +6,6 @@
#include "builtin.h"
#include "blob.h"
#include "cache-tree.h"
-#include "tree-walk.h"
#include "diff.h"
#include "diffcore.h"
#include "tag.h"
--
1.6.1.3
^ permalink raw reply related
* [PATCH 3/5] Header includes cleanup
From: Nathaniel P Dawson @ 2009-03-30 9:55 UTC (permalink / raw)
To: git; +Cc: Nathaniel P Dawson
In-Reply-To: <1238406925-15907-3-git-send-email-nathaniel.dawson@gmail.com>
Deleted header includes of git-compat-util.h, strbuf.h, hash.h where cache.h was included since cache.h includes them.
Signed-off-by: Nathaniel P Dawson <nathaniel.dawson@gmail.com>
---
builtin-clone.c | 1 -
builtin-remote.c | 1 -
connect.c | 1 -
diffcore-rename.c | 1 -
editor.c | 1 -
hash.c | 1 -
parse-options.c | 3 +--
shell.c | 1 -
test-delta.c | 3 +--
9 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/builtin-clone.c b/builtin-clone.c
index 0031b5f..50cb6ba 100644
--- a/builtin-clone.c
+++ b/builtin-clone.c
@@ -16,7 +16,6 @@
#include "tree-walk.h"
#include "unpack-trees.h"
#include "transport.h"
-#include "strbuf.h"
#include "dir.h"
#include "pack-refs.h"
#include "sigchain.h"
diff --git a/builtin-remote.c b/builtin-remote.c
index 9ef846f..5bf8042 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -3,7 +3,6 @@
#include "transport.h"
#include "remote.h"
#include "string-list.h"
-#include "strbuf.h"
#include "run-command.h"
#include "refs.h"
diff --git a/connect.c b/connect.c
index 7636bf9..12a5c2b 100644
--- a/connect.c
+++ b/connect.c
@@ -1,4 +1,3 @@
-#include "git-compat-util.h"
#include "cache.h"
#include "pkt-line.h"
#include "quote.h"
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 0b0d6b8..00e1ce1 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -4,7 +4,6 @@
#include "cache.h"
#include "diff.h"
#include "diffcore.h"
-#include "hash.h"
/* Table of rename/copy destinations */
diff --git a/editor.c b/editor.c
index 4d469d0..22fd4c0 100644
--- a/editor.c
+++ b/editor.c
@@ -1,5 +1,4 @@
#include "cache.h"
-#include "strbuf.h"
#include "run-command.h"
int launch_editor(const char *path, struct strbuf *buffer, const char *const *env)
diff --git a/hash.c b/hash.c
index 1cd4c9d..5a68fdf 100644
--- a/hash.c
+++ b/hash.c
@@ -2,7 +2,6 @@
* Some generic hashing helpers.
*/
#include "cache.h"
-#include "hash.h"
/*
* Look up a hash entry in the hash table. Return the pointer to
diff --git a/parse-options.c b/parse-options.c
index cf71bcf..bafeeea 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -1,6 +1,5 @@
-#include "git-compat-util.h"
-#include "parse-options.h"
#include "cache.h"
+#include "parse-options.h"
#include "commit.h"
#define OPT_SHORT 1
diff --git a/shell.c b/shell.c
index e339369..37c52c2 100644
--- a/shell.c
+++ b/shell.c
@@ -1,7 +1,6 @@
#include "cache.h"
#include "quote.h"
#include "exec_cmd.h"
-#include "strbuf.h"
static int do_generic_cmd(const char *me, char *arg)
{
diff --git a/test-delta.c b/test-delta.c
index 3d885ff..3d90611 100644
--- a/test-delta.c
+++ b/test-delta.c
@@ -8,9 +8,8 @@
* published by the Free Software Foundation.
*/
-#include "git-compat-util.h"
-#include "delta.h"
#include "cache.h"
+#include "delta.h"
static const char usage_str[] =
"test-delta (-d|-p) <from_file> <data_file> <out_file>";
--
1.6.1.3
^ permalink raw reply related
* [PATCH 2/5] Header includes cleanup
From: Nathaniel P Dawson @ 2009-03-30 9:55 UTC (permalink / raw)
To: git; +Cc: Nathaniel P Dawson
In-Reply-To: <1238406925-15907-2-git-send-email-nathaniel.dawson@gmail.com>
Deleted header includes of object.h where blob.h was included since blob.h includes it.
Signed-off-by: Nathaniel P Dawson <nathaniel.dawson@gmail.com>
---
alloc.c | 1 -
builtin-for-each-ref.c | 1 -
builtin-pack-objects.c | 1 -
builtin-unpack-objects.c | 3 +--
fast-import.c | 1 -
fsck.c | 1 -
object.c | 1 -
7 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/alloc.c b/alloc.c
index 216c23a..5b3d4a2 100644
--- a/alloc.c
+++ b/alloc.c
@@ -10,7 +10,6 @@
* for the new allocation is.
*/
#include "cache.h"
-#include "object.h"
#include "blob.h"
#include "tree.h"
#include "commit.h"
diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
index ab9bfa4..6cbfb03 100644
--- a/builtin-for-each-ref.c
+++ b/builtin-for-each-ref.c
@@ -1,6 +1,5 @@
#include "builtin.h"
#include "blob.h"
-#include "object.h"
#include "refs.h"
#include "tag.h"
#include "tree.h"
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index fe7a8de..c53147a 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1,6 +1,5 @@
#include "builtin.h"
#include "attr.h"
-#include "object.h"
#include "blob.h"
#include "tag.h"
#include "tree.h"
diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c
index 4f5495d..674bede 100644
--- a/builtin-unpack-objects.c
+++ b/builtin-unpack-objects.c
@@ -1,8 +1,7 @@
#include "builtin.h"
-#include "object.h"
+#include "blob.h"
#include "delta.h"
#include "pack.h"
-#include "blob.h"
#include "tag.h"
#include "tree.h"
#include "tree-walk.h"
diff --git a/fast-import.c b/fast-import.c
index e3c138f..8d1d9f3 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -141,7 +141,6 @@ Format of STDIN stream:
*/
#include "builtin.h"
-#include "object.h"
#include "blob.h"
#include "tree.h"
#include "delta.h"
diff --git a/fsck.c b/fsck.c
index 511b82c..e903f6a 100644
--- a/fsck.c
+++ b/fsck.c
@@ -1,5 +1,4 @@
#include "cache.h"
-#include "object.h"
#include "blob.h"
#include "tree.h"
#include "tree-walk.h"
diff --git a/object.c b/object.c
index 7e6a92c..380652f 100644
--- a/object.c
+++ b/object.c
@@ -1,5 +1,4 @@
#include "cache.h"
-#include "object.h"
#include "blob.h"
#include "tree.h"
#include "commit.h"
--
1.6.1.3
^ permalink raw reply related
* [PATCH 1/5] Header includes cleanup
From: Nathaniel P Dawson @ 2009-03-30 9:55 UTC (permalink / raw)
To: git; +Cc: Nathaniel P Dawson
In-Reply-To: <1238406925-15907-1-git-send-email-nathaniel.dawson@gmail.com>
Deleted all header includes of git-compat-util.h, strbuf.h, cache.h, and commit.h where builtin.h was already included since builtin.h includes them.
Signed-off-by: Nathaniel P Dawson <nathaniel.dawson@gmail.com>
---
builtin-add.c | 1 -
builtin-annotate.c | 1 -
builtin-apply.c | 5 ++---
builtin-archive.c | 1 -
builtin-blame.c | 3 ---
builtin-branch.c | 5 +----
builtin-bundle.c | 1 -
builtin-cat-file.c | 3 +--
builtin-check-attr.c | 1 -
builtin-check-ref-format.c | 3 +--
builtin-checkout-index.c | 1 -
builtin-checkout.c | 4 +---
builtin-clean.c | 1 -
builtin-commit-tree.c | 4 +---
builtin-commit.c | 5 +----
builtin-config.c | 1 -
builtin-count-objects.c | 3 +--
builtin-describe.c | 4 +---
builtin-diff-files.c | 4 +---
builtin-diff-index.c | 4 +---
builtin-diff-tree.c | 4 +---
builtin-diff.c | 6 ++----
builtin-fast-export.c | 2 --
builtin-fetch--tool.c | 2 --
builtin-fetch.c | 4 +---
builtin-fmt-merge-msg.c | 2 --
builtin-for-each-ref.c | 6 ++----
builtin-fsck.c | 2 --
builtin-gc.c | 1 -
builtin-grep.c | 4 +---
builtin-help.c | 1 -
builtin-init-db.c | 1 -
builtin-log.c | 4 +---
builtin-ls-files.c | 3 +--
builtin-ls-remote.c | 1 -
builtin-ls-tree.c | 4 +---
builtin-mailinfo.c | 2 --
builtin-mailsplit.c | 1 -
builtin-merge-base.c | 2 --
builtin-merge-file.c | 1 -
builtin-merge-ours.c | 1 -
builtin-merge.c | 4 +---
builtin-mv.c | 1 -
builtin-name-rev.c | 2 --
builtin-pack-objects.c | 2 --
builtin-prune-packed.c | 1 -
builtin-prune.c | 4 +---
builtin-push.c | 3 +--
builtin-read-tree.c | 3 +--
builtin-reflog.c | 2 --
builtin-rerere.c | 1 -
builtin-rev-list.c | 6 ++----
builtin-revert.c | 2 --
builtin-rm.c | 1 -
builtin-shortlog.c | 2 --
builtin-show-branch.c | 4 +---
builtin-show-ref.c | 1 -
builtin-stripspace.c | 1 -
builtin-symbolic-ref.c | 1 -
builtin-tag.c | 1 -
builtin-tar-tree.c | 2 --
builtin-unpack-objects.c | 2 --
builtin-update-index.c | 3 +--
builtin-update-ref.c | 3 +--
builtin-upload-archive.c | 1 -
builtin-verify-pack.c | 1 -
builtin-verify-tag.c | 1 -
builtin-write-tree.c | 1 -
diff-no-index.c | 4 +---
fast-import.c | 2 --
git.c | 1 -
help.c | 1 -
merge-recursive.c | 6 ++----
73 files changed, 34 insertions(+), 145 deletions(-)
diff --git a/builtin-add.c b/builtin-add.c
index cb67d2c..4d61e72 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -3,7 +3,6 @@
*
* Copyright (C) 2006 Linus Torvalds
*/
-#include "cache.h"
#include "builtin.h"
#include "dir.h"
#include "exec_cmd.h"
diff --git a/builtin-annotate.c b/builtin-annotate.c
index fc43eed..0a259a3 100644
--- a/builtin-annotate.c
+++ b/builtin-annotate.c
@@ -3,7 +3,6 @@
*
* Copyright (C) 2006 Ryan Anderson
*/
-#include "git-compat-util.h"
#include "builtin.h"
int cmd_annotate(int argc, const char **argv, const char *prefix)
diff --git a/builtin-apply.c b/builtin-apply.c
index 1926cd8..356db67 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -6,12 +6,11 @@
* This applies patches on top of some (arbitrary) version of the SCM.
*
*/
-#include "cache.h"
+#include "builtin.h"
+#include "blob.h"
#include "cache-tree.h"
#include "quote.h"
-#include "blob.h"
#include "delta.h"
-#include "builtin.h"
#include "string-list.h"
#include "dir.h"
#include "parse-options.h"
diff --git a/builtin-archive.c b/builtin-archive.c
index ab50ceb..f293d40 100644
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -2,7 +2,6 @@
* Copyright (c) 2006 Franck Bui-Huu
* Copyright (c) 2006 Rene Scharfe
*/
-#include "cache.h"
#include "builtin.h"
#include "archive.h"
#include "parse-options.h"
diff --git a/builtin-blame.c b/builtin-blame.c
index 83141fc..a91d350 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -3,11 +3,8 @@
*
* Copyright (c) 2006, Junio C Hamano
*/
-
-#include "cache.h"
#include "builtin.h"
#include "blob.h"
-#include "commit.h"
#include "tag.h"
#include "tree-walk.h"
#include "diff.h"
diff --git a/builtin-branch.c b/builtin-branch.c
index 07a440e..2cb22c7 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -4,12 +4,9 @@
* Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com>
* Based on git-branch.sh by Junio C Hamano.
*/
-
-#include "cache.h"
+#include "builtin.h"
#include "color.h"
#include "refs.h"
-#include "commit.h"
-#include "builtin.h"
#include "remote.h"
#include "parse-options.h"
#include "branch.h"
diff --git a/builtin-bundle.c b/builtin-bundle.c
index 9b58152..b36456e 100644
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -1,5 +1,4 @@
#include "builtin.h"
-#include "cache.h"
#include "bundle.h"
/*
diff --git a/builtin-cat-file.c b/builtin-cat-file.c
index 8fad19d..70c9bda 100644
--- a/builtin-cat-file.c
+++ b/builtin-cat-file.c
@@ -3,11 +3,10 @@
*
* Copyright (C) Linus Torvalds, 2005
*/
-#include "cache.h"
+#include "builtin.h"
#include "exec_cmd.h"
#include "tag.h"
#include "tree.h"
-#include "builtin.h"
#include "parse-options.h"
#define BATCH 1
diff --git a/builtin-check-attr.c b/builtin-check-attr.c
index 15a04b7..c8f0cb3 100644
--- a/builtin-check-attr.c
+++ b/builtin-check-attr.c
@@ -1,5 +1,4 @@
#include "builtin.h"
-#include "cache.h"
#include "attr.h"
#include "quote.h"
#include "parse-options.h"
diff --git a/builtin-check-ref-format.c b/builtin-check-ref-format.c
index 701de43..5289580 100644
--- a/builtin-check-ref-format.c
+++ b/builtin-check-ref-format.c
@@ -2,9 +2,8 @@
* GIT - The information manager from hell
*/
-#include "cache.h"
-#include "refs.h"
#include "builtin.h"
+#include "refs.h"
int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
{
diff --git a/builtin-checkout-index.c b/builtin-checkout-index.c
index 0d534bc..fbdb37f 100644
--- a/builtin-checkout-index.c
+++ b/builtin-checkout-index.c
@@ -37,7 +37,6 @@
* but get used to it in scripting!).
*/
#include "builtin.h"
-#include "cache.h"
#include "quote.h"
#include "cache-tree.h"
#include "parse-options.h"
diff --git a/builtin-checkout.c b/builtin-checkout.c
index fc55bbe..f8bb9ea 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -1,8 +1,7 @@
-#include "cache.h"
#include "builtin.h"
+#include "blob.h"
#include "parse-options.h"
#include "refs.h"
-#include "commit.h"
#include "tree.h"
#include "tree-walk.h"
#include "unpack-trees.h"
@@ -13,7 +12,6 @@
#include "diff.h"
#include "revision.h"
#include "remote.h"
-#include "blob.h"
#include "xdiff-interface.h"
#include "ll-merge.h"
diff --git a/builtin-clean.c b/builtin-clean.c
index c5ad33d..46a483c 100644
--- a/builtin-clean.c
+++ b/builtin-clean.c
@@ -7,7 +7,6 @@
*/
#include "builtin.h"
-#include "cache.h"
#include "dir.h"
#include "parse-options.h"
#include "quote.h"
diff --git a/builtin-commit-tree.c b/builtin-commit-tree.c
index 0453425..ea83003 100644
--- a/builtin-commit-tree.c
+++ b/builtin-commit-tree.c
@@ -3,10 +3,8 @@
*
* Copyright (C) Linus Torvalds, 2005
*/
-#include "cache.h"
-#include "commit.h"
-#include "tree.h"
#include "builtin.h"
+#include "tree.h"
#include "utf8.h"
#define BLOCKING (1ul << 14)
diff --git a/builtin-commit.c b/builtin-commit.c
index 46e649c..aba5660 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -5,20 +5,17 @@
* Based on git-commit.sh by Junio C Hamano and Linus Torvalds
*/
-#include "cache.h"
+#include "builtin.h"
#include "cache-tree.h"
#include "color.h"
#include "dir.h"
-#include "builtin.h"
#include "diff.h"
#include "diffcore.h"
-#include "commit.h"
#include "revision.h"
#include "wt-status.h"
#include "run-command.h"
#include "refs.h"
#include "log-tree.h"
-#include "strbuf.h"
#include "utf8.h"
#include "parse-options.h"
#include "string-list.h"
diff --git a/builtin-config.c b/builtin-config.c
index d8da72c..6a31764 100644
--- a/builtin-config.c
+++ b/builtin-config.c
@@ -1,5 +1,4 @@
#include "builtin.h"
-#include "cache.h"
#include "color.h"
#include "parse-options.h"
diff --git a/builtin-count-objects.c b/builtin-count-objects.c
index b814fe5..a6f2337 100644
--- a/builtin-count-objects.c
+++ b/builtin-count-objects.c
@@ -4,9 +4,8 @@
* Copyright (c) 2006 Junio C Hamano
*/
-#include "cache.h"
-#include "dir.h"
#include "builtin.h"
+#include "dir.h"
#include "parse-options.h"
static void count_objects(DIR *d, char *path, int len, int verbose,
diff --git a/builtin-describe.c b/builtin-describe.c
index 3a007ed..159c1ad 100644
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -1,8 +1,6 @@
-#include "cache.h"
-#include "commit.h"
+#include "builtin.h"
#include "tag.h"
#include "refs.h"
-#include "builtin.h"
#include "exec_cmd.h"
#include "parse-options.h"
diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index 5b64011..4770aeb 100644
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -3,11 +3,9 @@
*
* Copyright (C) Linus Torvalds, 2005
*/
-#include "cache.h"
+#include "builtin.h"
#include "diff.h"
-#include "commit.h"
#include "revision.h"
-#include "builtin.h"
static const char diff_files_usage[] =
"git diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]"
diff --git a/builtin-diff-index.c b/builtin-diff-index.c
index 0483749..7b8c813 100644
--- a/builtin-diff-index.c
+++ b/builtin-diff-index.c
@@ -1,8 +1,6 @@
-#include "cache.h"
+#include "builtin.h"
#include "diff.h"
-#include "commit.h"
#include "revision.h"
-#include "builtin.h"
static const char diff_cache_usage[] =
"git diff-index [-m] [--cached] "
diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c
index 79cedb7..0b06748 100644
--- a/builtin-diff-tree.c
+++ b/builtin-diff-tree.c
@@ -1,8 +1,6 @@
-#include "cache.h"
+#include "builtin.h"
#include "diff.h"
-#include "commit.h"
#include "log-tree.h"
-#include "builtin.h"
static struct rev_info log_tree_opt;
diff --git a/builtin-diff.c b/builtin-diff.c
index d75d69b..252c519 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -3,16 +3,14 @@
*
* Copyright (c) 2006 Junio C Hamano
*/
-#include "cache.h"
-#include "color.h"
-#include "commit.h"
+#include "builtin.h"
#include "blob.h"
+#include "color.h"
#include "tag.h"
#include "diff.h"
#include "diffcore.h"
#include "revision.h"
#include "log-tree.h"
-#include "builtin.h"
struct blobinfo {
unsigned char sha1[20];
diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index 34a419c..b62e48d 100644
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -4,8 +4,6 @@
* Copyright (C) 2007 Johannes E. Schindelin
*/
#include "builtin.h"
-#include "cache.h"
-#include "commit.h"
#include "object.h"
#include "tag.h"
#include "diff.h"
diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c
index 29356d2..1863d5f 100644
--- a/builtin-fetch--tool.c
+++ b/builtin-fetch--tool.c
@@ -1,7 +1,5 @@
#include "builtin.h"
-#include "cache.h"
#include "refs.h"
-#include "commit.h"
#include "sigchain.h"
static char *get_stdin(void)
diff --git a/builtin-fetch.c b/builtin-fetch.c
index 3c998ea..c203286 100644
--- a/builtin-fetch.c
+++ b/builtin-fetch.c
@@ -1,10 +1,8 @@
/*
* "git fetch"
*/
-#include "cache.h"
-#include "refs.h"
-#include "commit.h"
#include "builtin.h"
+#include "refs.h"
#include "string-list.h"
#include "remote.h"
#include "transport.h"
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index a788369..772414f 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -1,6 +1,4 @@
#include "builtin.h"
-#include "cache.h"
-#include "commit.h"
#include "diff.h"
#include "revision.h"
#include "tag.h"
diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
index 5cbb4b0..ab9bfa4 100644
--- a/builtin-for-each-ref.c
+++ b/builtin-for-each-ref.c
@@ -1,11 +1,9 @@
#include "builtin.h"
-#include "cache.h"
-#include "refs.h"
+#include "blob.h"
#include "object.h"
+#include "refs.h"
#include "tag.h"
-#include "commit.h"
#include "tree.h"
-#include "blob.h"
#include "quote.h"
#include "parse-options.h"
diff --git a/builtin-fsck.c b/builtin-fsck.c
index 6436bc2..eae576a 100644
--- a/builtin-fsck.c
+++ b/builtin-fsck.c
@@ -1,6 +1,4 @@
#include "builtin.h"
-#include "cache.h"
-#include "commit.h"
#include "tree.h"
#include "blob.h"
#include "tag.h"
diff --git a/builtin-gc.c b/builtin-gc.c
index fc556ed..fae3fde 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -11,7 +11,6 @@
*/
#include "builtin.h"
-#include "cache.h"
#include "parse-options.h"
#include "run-command.h"
diff --git a/builtin-grep.c b/builtin-grep.c
index 89489dd..aa5b973 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -3,13 +3,11 @@
*
* Copyright (c) 2006 Junio C Hamano
*/
-#include "cache.h"
+#include "builtin.h"
#include "blob.h"
#include "tree.h"
-#include "commit.h"
#include "tag.h"
#include "tree-walk.h"
-#include "builtin.h"
#include "grep.h"
#ifndef NO_EXTERNAL_GREP
diff --git a/builtin-help.c b/builtin-help.c
index 9b57a74..bdae8a3 100644
--- a/builtin-help.c
+++ b/builtin-help.c
@@ -3,7 +3,6 @@
*
* Builtin help command
*/
-#include "cache.h"
#include "builtin.h"
#include "exec_cmd.h"
#include "common-cmds.h"
diff --git a/builtin-init-db.c b/builtin-init-db.c
index fc63d0f..97728cd 100644
--- a/builtin-init-db.c
+++ b/builtin-init-db.c
@@ -3,7 +3,6 @@
*
* Copyright (C) Linus Torvalds, 2005
*/
-#include "cache.h"
#include "builtin.h"
#include "exec_cmd.h"
diff --git a/builtin-log.c b/builtin-log.c
index c7a5772..5105c91 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -4,13 +4,11 @@
* (C) Copyright 2006 Linus Torvalds
* 2006 Junio Hamano
*/
-#include "cache.h"
+#include "builtin.h"
#include "color.h"
-#include "commit.h"
#include "diff.h"
#include "revision.h"
#include "log-tree.h"
-#include "builtin.h"
#include "tag.h"
#include "reflog-walk.h"
#include "patch-ids.h"
diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index 88e2697..4efd46c 100644
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
@@ -5,10 +5,9 @@
*
* Copyright (C) Linus Torvalds, 2005
*/
-#include "cache.h"
+#include "builtin.h"
#include "quote.h"
#include "dir.h"
-#include "builtin.h"
#include "tree.h"
#include "parse-options.h"
diff --git a/builtin-ls-remote.c b/builtin-ls-remote.c
index 78a88f7..5fe2af0 100644
--- a/builtin-ls-remote.c
+++ b/builtin-ls-remote.c
@@ -1,5 +1,4 @@
#include "builtin.h"
-#include "cache.h"
#include "transport.h"
#include "remote.h"
diff --git a/builtin-ls-tree.c b/builtin-ls-tree.c
index 22008df..4516d14 100644
--- a/builtin-ls-tree.c
+++ b/builtin-ls-tree.c
@@ -3,12 +3,10 @@
*
* Copyright (C) Linus Torvalds, 2005
*/
-#include "cache.h"
+#include "builtin.h"
#include "blob.h"
#include "tree.h"
-#include "commit.h"
#include "quote.h"
-#include "builtin.h"
static int line_termination = '\n';
#define LS_RECURSIVE 1
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index 1eeeb4d..0139a00 100644
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -2,10 +2,8 @@
* Another stupid program, this one parsing the headers of an
* email to figure out authorship and subject
*/
-#include "cache.h"
#include "builtin.h"
#include "utf8.h"
-#include "strbuf.h"
static FILE *cmitmsg, *patchfile, *fin, *fout;
diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c
index 71f3b3b..ea22d8b 100644
--- a/builtin-mailsplit.c
+++ b/builtin-mailsplit.c
@@ -4,7 +4,6 @@
* It just splits a mbox into a list of files: "0001" "0002" ..
* so you can process them further from there.
*/
-#include "cache.h"
#include "builtin.h"
#include "string-list.h"
diff --git a/builtin-merge-base.c b/builtin-merge-base.c
index 03fc1c2..4f915e8 100644
--- a/builtin-merge-base.c
+++ b/builtin-merge-base.c
@@ -1,6 +1,4 @@
#include "builtin.h"
-#include "cache.h"
-#include "commit.h"
#include "parse-options.h"
static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index 96edb97..7589d61 100644
--- a/builtin-merge-file.c
+++ b/builtin-merge-file.c
@@ -1,5 +1,4 @@
#include "builtin.h"
-#include "cache.h"
#include "xdiff/xdiff.h"
#include "xdiff-interface.h"
#include "parse-options.h"
diff --git a/builtin-merge-ours.c b/builtin-merge-ours.c
index 8f5bbaf..33b85d0 100644
--- a/builtin-merge-ours.c
+++ b/builtin-merge-ours.c
@@ -7,7 +7,6 @@
*
* Pretend we resolved the heads, but declare our tree trumps everybody else.
*/
-#include "git-compat-util.h"
#include "builtin.h"
static const char *diff_index_args[] = {
diff --git a/builtin-merge.c b/builtin-merge.c
index 4c11935..cb4c645 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -6,13 +6,11 @@
* Based on git-merge.sh by Junio C Hamano.
*/
-#include "cache.h"
-#include "parse-options.h"
#include "builtin.h"
+#include "parse-options.h"
#include "run-command.h"
#include "diff.h"
#include "refs.h"
-#include "commit.h"
#include "diffcore.h"
#include "revision.h"
#include "unpack-trees.h"
diff --git a/builtin-mv.c b/builtin-mv.c
index 01270fe..659471b 100644
--- a/builtin-mv.c
+++ b/builtin-mv.c
@@ -3,7 +3,6 @@
*
* Copyright (C) 2006 Johannes Schindelin
*/
-#include "cache.h"
#include "builtin.h"
#include "dir.h"
#include "cache-tree.h"
diff --git a/builtin-name-rev.c b/builtin-name-rev.c
index 08c8aab..386cafe 100644
--- a/builtin-name-rev.c
+++ b/builtin-name-rev.c
@@ -1,6 +1,4 @@
#include "builtin.h"
-#include "cache.h"
-#include "commit.h"
#include "tag.h"
#include "refs.h"
#include "parse-options.h"
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 2000d97..fe7a8de 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1,9 +1,7 @@
#include "builtin.h"
-#include "cache.h"
#include "attr.h"
#include "object.h"
#include "blob.h"
-#include "commit.h"
#include "tag.h"
#include "tree.h"
#include "delta.h"
diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index 2d5b2cd..99f9fab 100644
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -1,5 +1,4 @@
#include "builtin.h"
-#include "cache.h"
#include "progress.h"
static const char prune_packed_usage[] =
diff --git a/builtin-prune.c b/builtin-prune.c
index 545e9c1..caf2751 100644
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -1,8 +1,6 @@
-#include "cache.h"
-#include "commit.h"
+#include "builtin.h"
#include "diff.h"
#include "revision.h"
-#include "builtin.h"
#include "reachable.h"
#include "parse-options.h"
#include "dir.h"
diff --git a/builtin-push.c b/builtin-push.c
index 2eabcd3..128bfd8 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -1,10 +1,9 @@
/*
* "git push"
*/
-#include "cache.h"
+#include "builtin.h"
#include "refs.h"
#include "run-command.h"
-#include "builtin.h"
#include "remote.h"
#include "transport.h"
#include "parse-options.h"
diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 8e02738..dd4a9f6 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -4,14 +4,13 @@
* Copyright (C) Linus Torvalds, 2005
*/
-#include "cache.h"
+#include "builtin.h"
#include "object.h"
#include "tree.h"
#include "tree-walk.h"
#include "cache-tree.h"
#include "unpack-trees.h"
#include "dir.h"
-#include "builtin.h"
static int nr_trees;
static struct tree *trees[MAX_UNPACK_TREES];
diff --git a/builtin-reflog.c b/builtin-reflog.c
index d95f515..fcd92e8 100644
--- a/builtin-reflog.c
+++ b/builtin-reflog.c
@@ -1,6 +1,4 @@
-#include "cache.h"
#include "builtin.h"
-#include "commit.h"
#include "refs.h"
#include "dir.h"
#include "tree-walk.h"
diff --git a/builtin-rerere.c b/builtin-rerere.c
index 020af73..d0a6ebb 100644
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -1,5 +1,4 @@
#include "builtin.h"
-#include "cache.h"
#include "dir.h"
#include "string-list.h"
#include "rerere.h"
diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 40d5fcb..bc86e3c 100644
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -1,14 +1,12 @@
-#include "cache.h"
+#include "builtin.h"
+#include "blob.h"
#include "refs.h"
#include "tag.h"
-#include "commit.h"
#include "tree.h"
-#include "blob.h"
#include "tree-walk.h"
#include "diff.h"
#include "revision.h"
#include "list-objects.h"
-#include "builtin.h"
#include "log-tree.h"
#include "graph.h"
diff --git a/builtin-revert.c b/builtin-revert.c
index 3f2614e..90fea7d 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -1,7 +1,5 @@
-#include "cache.h"
#include "builtin.h"
#include "object.h"
-#include "commit.h"
#include "tag.h"
#include "wt-status.h"
#include "run-command.h"
diff --git a/builtin-rm.c b/builtin-rm.c
index 269d608..7fb865a 100644
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -3,7 +3,6 @@
*
* Copyright (C) Linus Torvalds 2006
*/
-#include "cache.h"
#include "builtin.h"
#include "dir.h"
#include "cache-tree.h"
diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index b28091b..9b6662b 100644
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -1,6 +1,4 @@
#include "builtin.h"
-#include "cache.h"
-#include "commit.h"
#include "diff.h"
#include "string-list.h"
#include "revision.h"
diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index 828e6f8..02c2c5c 100644
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -1,7 +1,5 @@
-#include "cache.h"
-#include "commit.h"
-#include "refs.h"
#include "builtin.h"
+#include "refs.h"
static const char show_branch_usage[] =
"git show-branch [--sparse] [--current] [--all] [--remotes] [--topo-order] [--more=count | --list | --independent | --merge-base ] [--topics] [<refs>...] | --reflog[=n[,b]] <branch>";
diff --git a/builtin-show-ref.c b/builtin-show-ref.c
index dc76c50..619b64e 100644
--- a/builtin-show-ref.c
+++ b/builtin-show-ref.c
@@ -1,5 +1,4 @@
#include "builtin.h"
-#include "cache.h"
#include "refs.h"
#include "object.h"
#include "tag.h"
diff --git a/builtin-stripspace.c b/builtin-stripspace.c
index d6e3896..126b37a 100644
--- a/builtin-stripspace.c
+++ b/builtin-stripspace.c
@@ -1,5 +1,4 @@
#include "builtin.h"
-#include "cache.h"
/*
* Returns the length of a line, without trailing spaces.
diff --git a/builtin-symbolic-ref.c b/builtin-symbolic-ref.c
index 6ae6bcc..41814bf 100644
--- a/builtin-symbolic-ref.c
+++ b/builtin-symbolic-ref.c
@@ -1,5 +1,4 @@
#include "builtin.h"
-#include "cache.h"
#include "refs.h"
#include "parse-options.h"
diff --git a/builtin-tag.c b/builtin-tag.c
index 01e7374..15f4ab7 100644
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -6,7 +6,6 @@
* Based on git-tag.sh and mktag.c by Linus Torvalds.
*/
-#include "cache.h"
#include "builtin.h"
#include "refs.h"
#include "tag.h"
diff --git a/builtin-tar-tree.c b/builtin-tar-tree.c
index 0713bca..9707eea 100644
--- a/builtin-tar-tree.c
+++ b/builtin-tar-tree.c
@@ -1,8 +1,6 @@
/*
* Copyright (c) 2005, 2006 Rene Scharfe
*/
-#include "cache.h"
-#include "commit.h"
#include "tar.h"
#include "builtin.h"
#include "quote.h"
diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c
index 9a77323..4f5495d 100644
--- a/builtin-unpack-objects.c
+++ b/builtin-unpack-objects.c
@@ -1,10 +1,8 @@
#include "builtin.h"
-#include "cache.h"
#include "object.h"
#include "delta.h"
#include "pack.h"
#include "blob.h"
-#include "commit.h"
#include "tag.h"
#include "tree.h"
#include "tree-walk.h"
diff --git a/builtin-update-index.c b/builtin-update-index.c
index 1fde893..9a006bd 100644
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -3,11 +3,10 @@
*
* Copyright (C) Linus Torvalds, 2005
*/
-#include "cache.h"
+#include "builtin.h"
#include "quote.h"
#include "cache-tree.h"
#include "tree-walk.h"
-#include "builtin.h"
#include "refs.h"
/*
diff --git a/builtin-update-ref.c b/builtin-update-ref.c
index 378dc1b..cac86ef 100644
--- a/builtin-update-ref.c
+++ b/builtin-update-ref.c
@@ -1,6 +1,5 @@
-#include "cache.h"
-#include "refs.h"
#include "builtin.h"
+#include "refs.h"
#include "parse-options.h"
static const char * const git_update_ref_usage[] = {
diff --git a/builtin-upload-archive.c b/builtin-upload-archive.c
index 0206b41..fe29d7b 100644
--- a/builtin-upload-archive.c
+++ b/builtin-upload-archive.c
@@ -1,7 +1,6 @@
/*
* Copyright (c) 2006 Franck Bui-Huu
*/
-#include "cache.h"
#include "builtin.h"
#include "archive.h"
#include "pkt-line.h"
diff --git a/builtin-verify-pack.c b/builtin-verify-pack.c
index 0ee0a9a..070455f 100644
--- a/builtin-verify-pack.c
+++ b/builtin-verify-pack.c
@@ -1,5 +1,4 @@
#include "builtin.h"
-#include "cache.h"
#include "pack.h"
#include "pack-revindex.h"
diff --git a/builtin-verify-tag.c b/builtin-verify-tag.c
index 729a159..039fe0a 100644
--- a/builtin-verify-tag.c
+++ b/builtin-verify-tag.c
@@ -5,7 +5,6 @@
*
* Based on git-verify-tag.sh
*/
-#include "cache.h"
#include "builtin.h"
#include "tag.h"
#include "run-command.h"
diff --git a/builtin-write-tree.c b/builtin-write-tree.c
index 9d64050..f1ce5e5 100644
--- a/builtin-write-tree.c
+++ b/builtin-write-tree.c
@@ -4,7 +4,6 @@
* Copyright (C) Linus Torvalds, 2005
*/
#include "builtin.h"
-#include "cache.h"
#include "tree.h"
#include "cache-tree.h"
diff --git a/diff-no-index.c b/diff-no-index.c
index 42c1dd8..cb68b8d 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -4,16 +4,14 @@
* Copyright (c) 2008 by Junio C Hamano
*/
-#include "cache.h"
+#include "builtin.h"
#include "color.h"
-#include "commit.h"
#include "blob.h"
#include "tag.h"
#include "diff.h"
#include "diffcore.h"
#include "revision.h"
#include "log-tree.h"
-#include "builtin.h"
#include "string-list.h"
static int read_directory(const char *path, struct string_list *list)
diff --git a/fast-import.c b/fast-import.c
index db44da3..e3c138f 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -141,11 +141,9 @@ Format of STDIN stream:
*/
#include "builtin.h"
-#include "cache.h"
#include "object.h"
#include "blob.h"
#include "tree.h"
-#include "commit.h"
#include "delta.h"
#include "pack.h"
#include "refs.h"
diff --git a/git.c b/git.c
index c2b181e..b6c1884 100644
--- a/git.c
+++ b/git.c
@@ -1,6 +1,5 @@
#include "builtin.h"
#include "exec_cmd.h"
-#include "cache.h"
#include "quote.h"
#include "run-command.h"
diff --git a/help.c b/help.c
index fd87bb5..7edbc43 100644
--- a/help.c
+++ b/help.c
@@ -1,4 +1,3 @@
-#include "cache.h"
#include "builtin.h"
#include "exec_cmd.h"
#include "levenshtein.h"
diff --git a/merge-recursive.c b/merge-recursive.c
index 3e1bc3e..352677c 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3,11 +3,9 @@
* Fredrik Kuivinen.
* The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
*/
-#include "cache.h"
-#include "cache-tree.h"
-#include "commit.h"
-#include "blob.h"
#include "builtin.h"
+#include "blob.h"
+#include "cache-tree.h"
#include "tree-walk.h"
#include "diff.h"
#include "diffcore.h"
--
1.6.1.3
^ permalink raw reply related
* [PATCH 0/5] Header includes cleanup
From: Nathaniel P Dawson @ 2009-03-30 9:55 UTC (permalink / raw)
To: git
This is just the beginning for this project. I'm slowly cleaning up the header includes one chunk at a time. I hope my patches aren't too messy, I've learned how to better utilize git to make patches and organize my commits logically so I'll submit neater chunks henceforth. You can expect patches from me nightly until I've finished this project.
Regards,
Nathaniel P Dawson
^ permalink raw reply
* Re: [POC PATCH] diff options: Introduce --interactive
From: Ping Yin @ 2009-03-30 9:38 UTC (permalink / raw)
To: David Aguilar; +Cc: git
In-Reply-To: <20090330090438.GA18953@gmail.com>
On Mon, Mar 30, 2009 at 5:04 PM, David Aguilar <davvid@gmail.com> wrote:
> On 0, Ping Yin <pkufranky@gmail.com> wrote:
>> The new option --interactive introduces an interactive diff mode. Now we
>> can choose to see the diff for a selected file.
>
> I just tried it out. Very cool.
> It's exactly the functionality users have asked me about.
>
> I just sent a for-the-future patch that teaches difftool
> to tell difftool-helper that it shouldn't prompt when
> you're using --interactive.
>
> I noticed git-diff doesn't have a -i flag yet,
> perhaps it could be the shorthand for --interactive?
>
> (I'd have to change that for-the-future patch I just sent
> too since it also only checks for the long form...)
>
> I like it.
>
>>
>> This is a preparation to introduce the --tool option to launch the
>> external diff tool for a selected file.
>
> With both of our latest patches:
>
> git difftool --interactive <revargs>
>
> does exactly what one would expect it to.
>
>
> How are you envisioning --tool? It'd be great if we didn't
> need the perl wrapper, though something does need to set
> GIT_EXTERNAL_DIFF/GIT_PAGER/etc... (that is, unless you have a
> better way =))
These environment vars can be set in diff.c directly, by passing the
git-difftool. So i think the difftool wrapper can be just removed once
the --tool option is available
>
>
>> >> When the user types a number, git-difftool-helper is launched to show
>> >> the diff for the corresponding file.
>> >
>> > Cool.
>> > I had two patches that I sent to the list for
>> > git-difftool.perl. If you're going to patch it then you might
>> > want to base it on top of those.
>> >
>> When i try to code on git-difftool.perl, i find it is more appropriate to add
>> the --interactive and then --tool options to git-diff itself. So here is a
>> proof of concept patch based on next. What we should do next is to try to
>> design a good UI.
>
> I'll see if I can come up with any suggestions.
> I liked it on the first test drive.
>
Here is the UI i am envisioning, although i am not a good ui designer
1. interactive diff
$ git diff --interactive
1: M -10/+20 a.c
2: R -5 /+0 a1.c => a2.c
3: C -5 /+0 b1.c => b2.c
[p] What now [<n>,t<n>?,p<n>,t,p,q,?]?
When hitting '?'
<n> - see diff of file <n> in default mode
p<n> - see diff of file <n> in patch mode
t<n> - see diff of file <n> in tool mode
p - change to patch diff mode
t - change to tool diff mode
q - quit this ineraction
? - print help
When hitting 't'
[t] What now [<n>,t<n>?,p<n>,t,p,q,?]?
2. interactive diff with --tool
if using "git diff --interactive --tool", then the default diff mode is tool
$ git diff --interactive --tool
1: M -10/+20 a.c
2: R -5 /+0 a1.c => a2.c
3: C -5 /+0 b1.c => b2.c
[t] What now [<n>,t<n>?,p<n>,t,p,q,?]?
3. other considerations
- --tool can imply --interactive
- --interactive can imply -p
- pager is disabled in interactive mode
^ permalink raw reply
* Re: [Q] merging from one (kernel) stable to another?
From: Andreas Ericsson @ 2009-03-30 9:33 UTC (permalink / raw)
To: Brian Foster; +Cc: git mailing list
In-Reply-To: <200903301024.08848.brian.foster@innova-card.com>
Brian Foster wrote:
> Whilst this question involves linux(-mips) kernel tree,
> it's a git(-related?) question, not a kernel question ....
>
> We are currently in the process of upgrading our embedded
> system from kernel 2.6.21(-ish) to at least 2.6.26.8; and
> later, at some time in the future on to 2.6.3x or something.
> Going from 2.6.21 to .22 to .23 and so on to .26, then to
> .26.1 and so on to .26.8 is “easy” in the sense there are
> very few conflicts with our existing baseline (e.g., just
> 2 or 3 in 2 or 3 files).
>
> .21 --> me --> .22 --> .23 ... --> .26 --> .27 --> master
> \ \ \ \ \
> .21-stable .22-stable .23-stable \ .27-stable
> .26.8
> \
> .26-stable
>
> But (using 2.6.21-stable and 2.6.22-stable as proxies),
> tests indicate that going from .26.8 to .27 or anything
> later will have numerous conflicts (100s? in more than
> 30 files). Thinking about it, this isn't too surprising
> since the -stable branches cherry-pick important/benign
> fixes from later revisions.
>
> What's frustrating is that in essentially all “conflict”
> cases, the resolution is simple: Use the later version.
The trouble is "essentially all", as opposed to "all". Git
can never know which of the conflicts are which, so it will
leave it all up to you.
A possibly better approach for you is to "git format-patch"
your own changes and apply them to a clean 2.6.26.8 tree
instead of trying to merge 2.6.26.8 into 2.6.21. That's
how we do such things where I work (although not with the
kernel), and it's working wonderfully (we had that multi-
conflict problem earlier too). Note that this will cause
you to either get a new branch-name for your release-
branch, or your current release-branch to get rebuilt.
Neither is actually horrible in this case, since you could
easily justify taking a flag-day when doing a kernel upgrade.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
Considering the successes of the wars on alcohol, poverty, drugs and
terror, I think we should give some serious thought to declaring war
on peace.
^ permalink raw reply
* Re: Getting GIT+git-daemon+gitweb working properly on Fedora 10
From: Andreas Ericsson @ 2009-03-30 9:24 UTC (permalink / raw)
To: Aaron Gray; +Cc: Git Mailing List
In-Reply-To: <12F76915BCBF4FAAB0E3C18BCC2528D5@HPLAPTOP>
Aaron Gray wrote:
> gitweb is showing a repository last changed on the front page 2 days ago
> but in the summary is showing a change 3 hours ago.
>
> I am getting different behaviours from different repositories. on gitweb
> and in their base directories some have file some donot. The ones with
> files have not been checked out and will not commit either.
>
> What I need is a well written set of instructions on how to import both
> small and large SVN repositories and how to serve them and how to get
> gitweb to reflect actually what is going on.
>
What does google provide on the subject? What search-terms did you try?
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
Considering the successes of the wars on alcohol, poverty, drugs and
terror, I think we should give some serious thought to declaring war
on peace.
^ permalink raw reply
* Re: [PATCH 1/8] mergetool: use tabs consistently
From: David Aguilar @ 2009-03-30 9:22 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Charles Bailey
In-Reply-To: <7vzlf3flim.fsf@gitster.siamese.dyndns.org>
On 0, Junio C Hamano <gitster@pobox.com> wrote:
> Thanks.
>
> Even though this [1/8] is obviously regression free, and I think the
> overall direction in which the series is going is good, I'll wait until I
> hear Acks from Charles Bailey for the parts that involve mergetool. I do
> not use either mergetool nor difftool myself, and going over every single
> line of this series to spot potential regression is beyond my bandwidth
> right now.
>
> I do not think bits only common between mergetool and difftool should be
> called with a very generic name "sh-tools". We didn't call the result of
> a similar refactoring for launching web browser from help and instaweb
> context with such a generic name (it is called git-web--browse).
I also felt iffy about the name.
Maybe...
git-interactive--tools ?
git-merge-diff--tools ?
git-mergetool--lib ?
(i'm pretty bad with this naming stuff ;))
(I have --interactive on my brain thanks to Ping's patch ;))
I can rebase as needed once we get more feedback, particularly
notes from Charles.
--
David
^ permalink raw reply
* [PATCH 4/4] builtin-fast-export.c: handle nested tags
From: Erik Faye-Lund @ 2009-03-30 9:08 UTC (permalink / raw)
To: git; +Cc: gitster, Erik Faye-Lund
In-Reply-To: <1238404137-6693-3-git-send-email-kusmabite@gmail.com>
When tags that points to tags are passed to fast-export, an error saying
"Tag [TAGNAME] points nowhere?". This fix calls parse_object() on the object
before referencing it's tag, to ensure the tag-info is fully initialized. In
addition, it inserts a comment to point out where nested tags are handled. This
is consistent with the comment for signed tags.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
builtin-fast-export.c | 5 ++++-
t/t9301-fast-export.sh | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index 2070288..b23a502 100644
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -363,7 +363,10 @@ static void get_tags_and_duplicates(struct object_array *pending,
break;
case OBJ_TAG:
tag = (struct tag *)e->item;
+
+ /* handle nested tags */
while (tag && tag->object.type == OBJ_TAG) {
+ parse_object(tag->object.sha1);
string_list_append(full_name, extra_refs)->util = tag;
tag = (struct tag *)tag->tagged;
}
@@ -376,7 +379,7 @@ static void get_tags_and_duplicates(struct object_array *pending,
case OBJ_BLOB:
handle_object(tag->object.sha1);
continue;
- default:
+ default: /* OBJ_TAG (nested tags) is already handled */
warning("Tag points to object of unexpected type %s, skipping.",
typename(tag->object.type));
continue;
diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh
index b587feb..495c051 100755
--- a/t/t9301-fast-export.sh
+++ b/t/t9301-fast-export.sh
@@ -276,7 +276,7 @@ test_expect_success 'set-up a few more tags for tag export tests' '
# NEEDSWORK: not just check return status, but validate the output
test_expect_success 'tree_tag' 'git fast-export tree_tag'
test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj'
-test_expect_failure 'tag-obj_tag' 'git fast-export tag-obj_tag'
-test_expect_failure 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
+test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag'
+test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
test_done
--
1.6.2.1
^ permalink raw reply related
* [PATCH 3/4] builtin-fast-export.c: fix crash on tagged trees
From: Erik Faye-Lund @ 2009-03-30 9:08 UTC (permalink / raw)
To: git; +Cc: gitster, Erik Faye-Lund
In-Reply-To: <1238404137-6693-2-git-send-email-kusmabite@gmail.com>
If a tag object points to a tree (or another unhandled type), the commit-
pointer is left uninitialized and later dereferenced. This patch adds a default
case to the switch that issues a warning and skips the object.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
builtin-fast-export.c | 4 ++++
t/t9301-fast-export.sh | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index 027c4aa..2070288 100644
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -376,6 +376,10 @@ static void get_tags_and_duplicates(struct object_array *pending,
case OBJ_BLOB:
handle_object(tag->object.sha1);
continue;
+ default:
+ warning("Tag points to object of unexpected type %s, skipping.",
+ typename(tag->object.type));
+ continue;
}
break;
default:
diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh
index 763dde5..b587feb 100755
--- a/t/t9301-fast-export.sh
+++ b/t/t9301-fast-export.sh
@@ -274,8 +274,8 @@ test_expect_success 'set-up a few more tags for tag export tests' '
'
# NEEDSWORK: not just check return status, but validate the output
-test_expect_failure 'tree_tag' 'git fast-export tree_tag'
-test_expect_failure 'tree_tag-obj' 'git fast-export tree_tag-obj'
+test_expect_success 'tree_tag' 'git fast-export tree_tag'
+test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj'
test_expect_failure 'tag-obj_tag' 'git fast-export tag-obj_tag'
test_expect_failure 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
--
1.6.2.1
^ permalink raw reply related
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