* Re: git gui rescane_stage2 error on windows
From: astubbs @ 2008-09-30 17:43 UTC (permalink / raw)
To: git
In-Reply-To: <1222796473795-1129562.post@n2.nabble.com>
Ok, that's odd. nabble and chrome ate the line breaks
Fresh install and fresh repository on Vista.
Getting this error when launching git gui:
child process exited abnormally
child process exited abnormally
while executing"close $fd"
(procedure "rescan_stage2" line 7)
invoked from within"rescan_stage2
file1192de8 ui_ready"
Any ideas?git version 1.6.0.2
git version 1.6.0.2
astubbs wrote:
>
> Fresh install and fresh repository on Vista.Getting this error when
> launching git gui:child process exited abnormallychild process exited
> abnormally while executing"close $fd" (procedure "rescan_stage2"
> line 7) invoked from within"rescan_stage2 file1192de8 ui_ready"Any
> ideas?git version 1.6.0.2
>
--
View this message in context: http://n2.nabble.com/git-gui-rescane_stage2-error-on-windows-tp1129562p1129570.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* Re: What's cooking in git/spearce.git (Sep 2008, #04; Mon, 22)
From: Shawn O. Pearce @ 2008-09-30 18:28 UTC (permalink / raw)
To: Alex Riesen; +Cc: git
In-Reply-To: <81b0412b0809300545m7bc39fb8v2a724c05141d8d37@mail.gmail.com>
Alex Riesen <raa.lkml@gmail.com> wrote:
> 2008/9/30 Alex Riesen <raa.lkml@gmail.com>:
> > 2008/9/29 Shawn O. Pearce <spearce@spearce.org>:
> >> Here are the topics that have been cooking. Commits prefixed
> >> with '-' are only in 'pu' while commits prefixed with '+' are
> >> in 'next'.
> >
> > Would you mind adding the remove_path factorization patches
> > in there somewhere?
> >
> > http://marc.info/?l=git&m=122246984212129&w=4
> > http://marc.info/?l=git&m=122246997012269&w=4
>
> Oh, I see: they're in your master
Yea. They were trivial enough that I didn't see a reason to hold
off on applying them. That section of code has been difficult to
deal with merge conflicts on, due to all of the code moving around.
Ironically enough, its the merge code itself that is ugly to
merge... ;-)
--
Shawn.
^ permalink raw reply
* Re: What's cooking in git/spearce.git (Sep 2008, #04; Mon, 22)
From: Shawn O. Pearce @ 2008-09-30 18:36 UTC (permalink / raw)
To: Michael J Gruber; +Cc: git
In-Reply-To: <48E1DAC2.7070304@drmicha.warpmail.net>
Michael J Gruber <git@drmicha.warpmail.net> wrote:
> > * mg/maint-remote-fix (Mon Sep 22 10:57:51 2008 +0200) 1 commit
> > + make "git remote" report multiple URLs
...
> > The above two are ready for 'maint'.
>
> They are already in maint, as per "What's in..." and the repo.
*sigh*.
I sent out issue #4. Not #5 like I should have.
--
Shawn.
^ permalink raw reply
* What's cooking in git.git (Sep 2008, #05; Mon, 29)
From: Shawn O. Pearce @ 2008-09-30 18:37 UTC (permalink / raw)
To: git
Sorry for sending out two issues in two days; yesterday I resent
issue #4 by mistake. :-)
Everything below is worded for yesterday, as that is when I wrote
it, and when I meant to mail it.
*sigh*
----
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. The topics
meant to be merged to the maintenance series have "maint-" in their names.
If I have dropped anything recently its not because I don't want
to apply it, it just slipped through the cracks. Please feel free
to give me a gentle prod (and a patch resend or a pointer to the
series on gmane). Thanks.
----------------------------------------------------------------
[New Topics]
* gb/gitweb-pathinfo (Mon Sep 29 17:26:57 2008 +0200) 4 commits
- gitweb: generate parent..current URLs
- gitweb: parse parent..current syntax from pathinfo
- gitweb: generate project/action/hash URLs
- gitweb: parse project/action/hash_base:filename PATH_INFO
This series just came in today. I haven't had a chance to look at
it beyond stashing in `pu`.
* mw/sendemail (Mon Sep 29 12:41:06 2008 -0500) 8 commits
- send-email: signedoffcc -> signedoffbycc, but handle both
- Docs: send-email: Create logical groupings for man text
- Docs: send-email: Remove unnecessary config variable description
- Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to
- send-email: change --no-validate to boolean --[no-]validate
- Docs: send-email: Man page option ordering
- Docs: send-email usage text much sexier
- Docs: send-email's usage text and man page mention same options
This series has already gone through 3 iterations before I could
start to carry it in-tree. I haven't had a chance to read it yet
myself, so its sitting around in `pu` for futher review.
* pb/gitweb (Thu Sep 25 18:48:48 2008 +0200) 2 commits
- gitweb: Sort the list of forks on the summary page by age
- gitweb: Clean-up sorting of project list
I forgot to look at this series today. I meant to review and try
to merge it to `next` before publishing. Will do that tomorrow.
* ae/preservemerge (Tue Sep 23 22:58:20 2008 +0200) 3 commits
- git pull: Support --preserve-merges as a flag to rebase
- git rebase: Support non-interactive merge-preserving rebase
- Prepare for non-interactive merge-preserving rebase
Andreas says there's some issues in here. I'm waiting for a respin
on the series before I look at it futher.
* mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit
- make prune report removed objects on -v
Just came in today. Looks sane. I'll drop it onto `next` tomorrow.
----------------------------------------------------------------
[Graduated to "master"]
* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
+ builtin-merge: release the lockfile in try_merge_strategy()
+ merge-recursive: get rid of virtual_id
+ merge-recursive: move current_{file,directory}_set to struct
merge_options
+ merge-recursive: move the global obuf to struct merge_options
+ merge-recursive: get rid of the index_only global variable
+ merge-recursive: move call_depth to struct merge_options
+ cherry-pick/revert: make direct internal call to merge_tree()
+ builtin-merge: avoid run_command_v_opt() for recursive and subtree
+ merge-recursive: introduce merge_options
+ merge-recursive.c: Add more generic merge_recursive_generic()
+ Split out merge_recursive() to merge-recursive.c
(Tip at 4271666)
* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
+ diff --dirstat-by-file: count changed files, not lines
(Tip at fd33777)
* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
+ safe_create_leading_directories(): make it about "leading"
directories
(Tip at 5f0bdf5)
* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
+ git-apply:--include=pathspec
(Tip at 6ecb1ee)
* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
+ t7603: add new testcases to ensure builtin-commit uses
reduce_heads()
+ builtin-commit: use commit_tree()
+ commit_tree(): add a new author parameter
(Tip at 7a172b0)
* pb/autocorrect-wrapper (Wed Sep 10 17:54:28 2008 +0200) 1 commit
+ git wrapper: also use aliases to correct mistyped commands
(Tip at 746c221)
* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 commits
+ Fix AsciiDoc errors in merge documentation
+ git-merge documentation: describe how conflict is presented
+ checkout --conflict=<style>: recreate merge in a non-default style
+ checkout -m: recreate merge when checking out of unmerged index
+ Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-
resolution'
+ git-merge-recursive: learn to honor merge.conflictstyle
+ merge.conflictstyle: choose between "merge" and "diff3 -m" styles
+ rerere: understand "diff3 -m" style conflicts with the original
+ rerere.c: use symbolic constants to keep track of parsing states
+ xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or
less
+ xmerge.c: minimum readability fixups
+ xdiff-merge: optionally show conflicts in "diff3 -m" style
+ xdl_fill_merge_buffer(): separate out a too deeply nested function
+ checkout --ours/--theirs: allow checking out one side of a
conflicting merge
+ checkout -f: allow ignoring unmerged paths when checking out of
the index
(Tip at 3407a7a)
* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
+ push: receiver end advertises refs from alternate repositories
+ push: prepare sender to receive extended ref information from the
receiver
+ receive-pack: make it a builtin
+ is_directory(): a generic helper function
(Tip at d79796b)
* bc/master-diff-hunk-header-fix (Sat Sep 20 18:36:22 2008 -0700) 10 commits
+ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
hunk-header-fix
+ diff hunk pattern: fix misconverted "\{" tex macro introducers
+ diff: fix "multiple regexp" semantics to find hunk header comment
+ diff: use extended regexp to find hunk headers
+ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
hunk-header-fix
+ diff: use extended regexp to find hunk headers
+ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
hunk-header-fix
+ diff.*.xfuncname which uses "extended" regex's for hunk header
selection
+ diff.c: associate a flag with each pattern and use it for
compiling regex
+ diff.c: return pattern entry pointer rather than just the hunk
header pattern
(Tip at 92bb978)
* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
+ wt-status: Teach how to discard changes in the working directory
+ wt-status: Split header generation into three functions
(Tip at 4d6e4c4)
* mg/maint-remote-fix (Mon Sep 22 10:57:51 2008 +0200) 1 commit
+ make "git remote" report multiple URLs
(Tip at 7d20e21)
* bc/maint-diff-hunk-header-fix (Sat Sep 20 15:30:12 2008 -0700) 5 commits
+ diff hunk pattern: fix misconverted "\{" tex macro introducers
+ diff: use extended regexp to find hunk headers
+ diff.*.xfuncname which uses "extended" regex's for hunk header
selection
+ diff.c: associate a flag with each pattern and use it for
compiling regex
+ diff.c: return pattern entry pointer rather than just the hunk
header pattern
(Tip at 96d1a8e)
----------------------------------------------------------------
[Old New Topics]
* nd/narrow (Sun Sep 14 20:07:59 2008 +0700) 9 commits
- grep: skip files that have not been checked out
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
- Prevent diff machinery from examining worktree outside narrow
checkout
- Add tests for updating no-checkout entries in index
- ls-files: add --narrow-checkout option to "will checkout" entries
- update-index: add --checkout/--no-checkout to update
CE_NO_CHECKOUT bit
- update-index: refactor mark_valid() in preparation for new options
- Introduce CE_NO_CHECKOUT bit
- Extend index to save more flags
[jc: This is an early half of the earlier series (I haven't had
chance to look at the updated series yet), and should be replaced
with the updated one posted recently.]
I haven't touched this branch since I inherited it from Junio.
I'd appreciate a resend or a pointer to the updated series so I
can at least replace it.
----------------------------------------------------------------
[Stalled -- Needs Action to Proceed (or to be dropped)]
* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
- t7400: Add short "git submodule add" testsuite
[jc: Waiting for a reroll.]
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
- Use xdiff caching to improve git blame performance
- Allow xdiff machinery to cache hash results for a file
- Always initialize xpparam_t to 0
- Bypass textual patch generation and parsing in git blame
- Allow alternate "low-level" emit function from xdl_diff
[jc: Réne had good comments on how the callback should be
structured.]
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
- git-am: Pass the --directory option through to git-apply
[jc: I think this is still buggy and drops the option when am stops
with conflicts.]
All three of these are stalled. I'm not going to drop them just
yet, but Junio's comments still hold. If there's no action on
these next week we may seem them drop off.
----------------------------------------------------------------
[Will be merged to 'master/maint' soon]
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
+ git-add --intent-to-add (-N)
Teaches "git add" to record only the intent to add a path later.
[jc: I rerolled this without the fake empty blob object.]
I'm inclined to merge this next week.
(Tip at 3942581)
----------------------------------------------------------------
[Actively Cooking]
* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
+ Documentation: Refer to git-rebase(1) to warn against rewriting
+ Documentation: new upstream rebase recovery section in git-rebase
[jc: My impression from the last round of discusson on the third
patch in this series (not queued here) was that as long as we
do not present it as "One True Workflow", the description was
a good starting point, possibly others to add other recommended
flows later.]
I haven't looked at this series yet. Based on Junios remarks above
I'm looking for more input on this series before it goes anywhere.
* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
+ builtin-commit.c: show on which branch a commit was added
[jc: Tentatively kicked back to "still cooking" status after
Jeff voiced his annoyance. I personally do not like making this
multi-line as Jeff suggested as an alternative (the message already
is too verbose to my taste).]
Agree with Junio. Hence its still here.
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
+ date/time: do not get confused by fractional seconds
I need to look at this in more detail. I suspect we can merge
this to master soon, but its been kicking around since Aug 16th.
I need to look at it to see if there's any obvious reason why Junio
has no notes on this branch and why it hasn't merged yet.
----------------------------------------------------------------
[On Hold]
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
- revision --simplify-merges: incremental simplification
- revision --simplify-merges: prepare for incremental simplification
[jc: I started making this incremental but the progress is not so great.]
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
- git-am --forge: add Signed-off-by: line for the author
- git-am: clean-up Signed-off-by: lines
- stripspace: add --log-clean option to clean up signed-off-by:
lines
- stripspace: use parse_options()
- Add "git am -s" test
- git-am: refactor code to add signed-off-by line for the committer
[jc: The one at second from the tip needs reworking.]
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
- "git push": tellme-more protocol extension
* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
. WIP: start teaching the --whitespace=fix to merge machinery
This has a merge conflict with `next` and isn't even in pu right now.
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
- blame: show "previous" information in --porcelain/--incremental
format
- git-blame: refactor code to emit "porcelain format" output
I should look at this in more detail. We may be able to merge it
to next soon-ish.
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
+ merge: remove deprecated summary and diffstat options and config
variables
[jc: This was previously in "will be in master soon" category,
but it turns out that the synonyms to the ones this one deletes
are fairly new invention that happend in 1.5.6 timeframe, and
we cannot do this just yet. Perhaps in 1.7.0, but with the loud
whining about moving git-foo out of $PATH we have been hearing,
it might not be a bad idea to drop this.]
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
- diff: enable "too large a rename" warning when -M/-C is explicitly
asked for
[jc: This would be the right thing to do for command line use,
but gitk will be hit due to tcl/tk's limitation, so I am holding
this back for now.]
--
Shawn.
^ permalink raw reply
* [GUILT] Use git_editor
From: Alan Jenkins @ 2008-09-30 18:43 UTC (permalink / raw)
To: Josef 'Jeff' Sipek; +Cc: git
Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
diff --git a/guilt b/guilt
index 1cef7b9..8d023e9 100755
--- a/guilt
+++ b/guilt
@@ -693,10 +693,6 @@ fi
series="$GUILT_DIR/$branch/series"
applied="$GUILT_DIR/$branch/status"
-# determine an editor to use for anything interactive (fall back to vi)
-editor="vi"
-[ ! -z "$EDITOR" ] && editor="$EDITOR"
-
# determine a pager to use for anything interactive (fall back to more)
pager="more"
[ ! -z "$PAGER" ] && pager="$PAGER"
diff --git a/guilt-header b/guilt-header
index da46c82..66521ac 100755
--- a/guilt-header
+++ b/guilt-header
@@ -46,7 +46,7 @@ if [ -z "$edit" ]; then
else
do_get_full_header "$GUILT_DIR/$branch/$patch" > "$TMP_MSG"
do_get_patch "$GUILT_DIR/$branch/$patch" > "$TMP_DIFF"
- $editor "$TMP_MSG"
+ git_editor "$TMP_MSG"
mv "$GUILT_DIR/$branch/$patch" "$GUILT_DIR/$branch/$patch~"
(
diff --git a/guilt-new b/guilt-new
index 05318a5..7845d00 100755
--- a/guilt-new
+++ b/guilt-new
@@ -77,7 +77,7 @@ mkdir_dir=`dirname "$GUILT_DIR/$branch/$patch"`
) >> "$GUILT_DIR/$branch/$patch"
# edit -e ?
-[ "$edit" = "t" ] && $editor "$GUILT_DIR/$branch/$patch"
+[ "$edit" = "t" ] && git_editor "$GUILT_DIR/$branch/$patch"
if [ ! -z "$force" ]; then
(
diff --git a/guilt-series b/guilt-series
index 7d8f8e9..4f24ffd 100755
--- a/guilt-series
+++ b/guilt-series
@@ -22,7 +22,7 @@ do
done
if [ ! -z "$edit" ]; then
- $editor "$series"
+ git_editor "$series"
elif [ ! -z "$gui" ]; then
[ -z "`get_top`" ] && die "No patches applied."
bottom=`git rev-parse refs/patches/$branch/$(head -1 $applied)`
^ permalink raw reply related
* Re: How Blobs Work ( Blobs Vs. Deltas)
From: Jakub Narebski @ 2008-09-30 18:54 UTC (permalink / raw)
To: Feanil Patel; +Cc: git
In-Reply-To: <16946e800809300814v134a42dft37becdbd8aa7669a@mail.gmail.com>
"Feanil Patel" <feanil@gmail.com> writes:
> Hello,
>
> I was reading about git objects in "The Git Community Book"
> (http://book.git-scm.com/1_the_git_object_model.html), which was
> posted on the mailing list a while back, and I was wondering something
> about blobs and how files are stored in any particular version. If
> file A is changed from version one to version two there are two
> different blobs that exist for the two versions of the file, is that
> correct? The Book was saying Git does not use delta storage so does
> this mean that there are two almost identical copies of the file with
> the difference being the change that was put in from version one to
> version two?
In Git there are two kinds of storage: loose objects and packs. Each
object generally starts as a loose object; for those it is like you
wrote: if you have two versions of some file, you would have both
of those contents of a file stored as separate objects (blobs). Note
that those 'blob' objects are compressed, so they usually don't take
more time than current version of file and its backup.
But there exists also other type of storage, namely packed. In the
past you had to pack (repack) objects by invoking "git repack" and
"git prune", and in more modern times by calling "git gc"; nowadays
this should be taken care of by git using "git gc --auto" behind.
When packing git tries to find objects which are close contents,
and store them as base object and binary delta (based on LibXDiff).
So you get benefits of delta storage, while on the API and script
level you always see single objects.
Note that explicit repacking allow git to not only consider versions
of the same file to diff against, tree and not only linear chains of
deltas (think branches), and while recency order is preferred it is
not enforced; objects and deltas are then compressed individually.
HTH
--
Jakub Narebski
Poland
ShadeHawk on #git
^ permalink raw reply
* Re: [PATCH] doc: enhance git describe --tags help
From: Shawn O. Pearce @ 2008-09-30 19:04 UTC (permalink / raw)
To: Uwe Kleine-KKKnig
Cc: Pierre Habouzit, Erez Zilber, git@vger.kernel.org, open-iscsi,
Junio C Hamano
In-Reply-To: <20080930095641.GA9001@strlen.de>
Uwe Kleine-KKKnig <ukleinek@strlen.de> wrote:
> On Mon, Sep 29, 2008 at 08:01:27AM -0700, Shawn O. Pearce wrote:
> > --tags::
> > If a lightweight tag exactly matches, output it. If no
> > annotated tag is found in the ancestry but a lightweight
> > tag is found, output the lightweight tag.
>
> IMHO --tags should behave as Erez expected (because it's what I
> expected, too). As --tags currently behaves it's only usable in very
> rare cases (most of the time it only makes a difference on repos without
> any annotated tag).
>
> When do you pass --tags? Only if a lightweight tag is OK for an answer.
> And then I would prefer a "near" lightweight tag to a "farer" annotated
> one.
I don't disagree. I've been tempted to write a patch to change the
behavior of git-describe so that --tags and --all control what names
are inserted into the candidate list, but don't control the ordering
of their selection.
I think this is all that is needed to make the behavior do what you
and Erez expected. But its a pretty big change in the results if
you are passing in --all or --tags today.
--8<--
[WIP] Change meaning of --tags and --all
---
builtin-describe.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/builtin-describe.c b/builtin-describe.c
index ec404c8..fd54fec 100644
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -15,8 +15,8 @@ static const char * const describe_usage[] = {
};
static int debug; /* Display lots of verbose info */
-static int all; /* Default to annotated tags only */
-static int tags; /* But allow any tags if --tags is specified */
+static int all; /* Any valid ref can be used */
+static int tags; /* Either lightweight or annotated tags */
static int longformat;
static int abbrev = DEFAULT_ABBREV;
static int max_candidates = 10;
@@ -112,8 +112,6 @@ static int compare_pt(const void *a_, const void *b_)
{
struct possible_tag *a = (struct possible_tag *)a_;
struct possible_tag *b = (struct possible_tag *)b_;
- if (a->name->prio != b->name->prio)
- return b->name->prio - a->name->prio;
if (a->depth != b->depth)
return a->depth - b->depth;
if (a->found_order != b->found_order)
--
1.6.0.2.513.g6dbd
--
Shawn.
^ permalink raw reply related
* Re: [GUILT] Use git_editor
From: Josef 'Jeff' Sipek @ 2008-09-30 19:07 UTC (permalink / raw)
To: Alan Jenkins; +Cc: git
In-Reply-To: <48E27366.3080503@tuffmail.co.uk>
On Tue, Sep 30, 2008 at 07:43:50PM +0100, Alan Jenkins wrote:
> Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
>
> diff --git a/guilt b/guilt
> index 1cef7b9..8d023e9 100755
> --- a/guilt
> +++ b/guilt
> @@ -693,10 +693,6 @@ fi
> series="$GUILT_DIR/$branch/series"
> applied="$GUILT_DIR/$branch/status"
>
> -# determine an editor to use for anything interactive (fall back to vi)
> -editor="vi"
> -[ ! -z "$EDITOR" ] && editor="$EDITOR"
> -
Looks good from a quick glance. Any chance there's a git_pager?
Josef 'Jeff' Sipek.
--
Bad pun of the week: The formula 1 control computer suffered from a race
condition
^ permalink raw reply
* Re: [PATCH] parse-opt: migrate fmt-merge-msg.
From: Shawn O. Pearce @ 2008-09-30 19:10 UTC (permalink / raw)
To: Pierre Habouzit; +Cc: git, gitster
In-Reply-To: <20080930084019.GB11453@artemis.corp>
Pierre Habouzit <madcoder@debian.org> wrote:
> On Mon, Sep 29, 2008 at 04:35:23PM +0000, Shawn O. Pearce wrote:
> > Pierre Habouzit <madcoder@debian.org> wrote:
> > > Also fix an inefficient printf("%s", ...) where we can use write_in_full.
> >
> > Near as I can tell, this is based upon a merge commit in next.
>
> Hmm I've always sent my patches this way, and I believe you can git am
> -3 them on top of master easily. I can send you the updated series if
> you want.
I'd appreciate an updated series if you can send it. am -3 isn't
"easily" applying it. Here I define "easy" as "the patch applies
without me needing to resolve conflicts":
$ git co -b ph/parseopt master
$ git am -3 -s X
Applying: parse-opt: migrate fmt-merge-msg.
error: patch failed: builtin-fmt-merge-msg.c:5
error: builtin-fmt-merge-msg.c: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in builtin-fmt-merge-msg.c
Recorded preimage for 'builtin-fmt-merge-msg.c'
Failed to merge in the changes.
Patch failed at 0001.
When you have resolved this problem run "git am -3 --resolved".
If you would prefer to skip this patch, instead run "git am -3 --skip".
To restore the original branch and stop patching run "git am -3 --abort".
:-\
--
Shawn.
^ permalink raw reply
* Re: [GUILT] Use git_editor
From: Alan Jenkins @ 2008-09-30 19:14 UTC (permalink / raw)
To: Josef 'Jeff' Sipek; +Cc: git
In-Reply-To: <20080930190744.GO32444@josefsipek.net>
Josef 'Jeff' Sipek wrote:
> On Tue, Sep 30, 2008 at 07:43:50PM +0100, Alan Jenkins wrote:
>
>> Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
>>
>> diff --git a/guilt b/guilt
>> index 1cef7b9..8d023e9 100755
>> --- a/guilt
>> +++ b/guilt
>> @@ -693,10 +693,6 @@ fi
>> series="$GUILT_DIR/$branch/series"
>> applied="$GUILT_DIR/$branch/status"
>>
>> -# determine an editor to use for anything interactive (fall back to vi)
>> -editor="vi"
>> -[ ! -z "$EDITOR" ] && editor="$EDITOR"
>> -
>>
>
> Looks good from a quick glance. Any chance there's a git_pager?
>
> Josef 'Jeff' Sipek.
>
Not in git-sh-setup. I did check :-).
Alan
^ permalink raw reply
* [PATCH] Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set
From: David Bryson @ 2008-09-30 19:05 UTC (permalink / raw)
To: git
Hi all,
This is a quick janitor patch and my first patch sent to the git mailing
list. Please let me know if I have done any process of the patch
submission wrong, and if I got the Janitorial task done in the proper
fashion.
Signed-off-by: David Bryson <david@statichacks.org>
---
builtin-gc.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/builtin-gc.c b/builtin-gc.c
index fac200e..6260652 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -57,15 +57,12 @@ static int gc_config(const char *var, const char *value, void *cb)
return 0;
}
if (!strcmp(var, "gc.pruneexpire")) {
- if (!value)
- return config_error_nonbool(var);
- if (strcmp(value, "now")) {
+ if (value && strcmp(value, "now")) {
unsigned long now = approxidate("now");
if (approxidate(value) >= now)
return error("Invalid %s: '%s'", var, value);
}
- prune_expire = xstrdup(value);
- return 0;
+ return git_config_string(&prune_expire, var, value);
}
return git_default_config(var, value, cb);
}
--
1.6.0.2
^ permalink raw reply related
* Re: [PATCH] Improve git-log documentation wrt file filters
From: Shawn O. Pearce @ 2008-09-30 19:25 UTC (permalink / raw)
To: martin f. krafft; +Cc: git
In-Reply-To: <1222785372-32336-1-git-send-email-madduck@madduck.net>
"martin f. krafft" <madduck@madduck.net> wrote:
> The need for "--" in the git-log synopsis was previously unclear and
> confusing. This patch makes it a little clearer.
> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
> index 0446bad..b7409f8 100644
> --- a/Documentation/git-log.txt
> +++ b/Documentation/git-log.txt
> @@ -8,7 +8,7 @@ git-log - Show commit logs
>
> SYNOPSIS
> --------
> -'git log' <option>...
> +'git log' [<options>] [<since>..<until>] [[--] <path>...]
This part is really useful.
> DESCRIPTION
> -----------
> @@ -57,8 +57,10 @@ include::diff-options.txt[]
> Note that only message is considered, if also a diff is shown
> its size is not included.
>
> -<path>...::
> - Show only commits that affect any of the specified paths.
> +-- <path>...::
> + Show only commits that affect any of the specified paths. To
> + prevent confusion with options and branch names, paths should be
> + prefixed with "-- " to separate them from options or refnames.
Indentation here looks wrong, especially on the last two lines.
I'm also not sure we want to say "-- <path>" in the header for
this section. The -- is optional but I'm reading this as though it
is required. Maybe "... paths can be prefixed with -- ..." instead?
--
Shawn.
^ permalink raw reply
* Re: [PATCH] Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set
From: Shawn O. Pearce @ 2008-09-30 19:37 UTC (permalink / raw)
To: David Bryson; +Cc: git
In-Reply-To: <20080930190549.GA9869@eratosthenes.cryptobackpack.org>
David Bryson <david@statichacks.org> wrote:
> Hi all,
> This is a quick janitor patch and my first patch sent to the git mailing
> list. Please let me know if I have done any process of the patch
> submission wrong, and if I got the Janitorial task done in the proper
> fashion.
This part of the message probably should go after the "---" line.
Everything above "---" goes into the commit message, everything
after it is automatically cut by git-am.
This sort of "Hi, I'm new" isn't very useful in the long term in
the project logs, but its still useful to introduce yourself. ;-)
> Signed-off-by: David Bryson <david@statichacks.org>
> ---
> builtin-gc.c | 7 ++-----
> 1 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/builtin-gc.c b/builtin-gc.c
> index fac200e..6260652 100644
> --- a/builtin-gc.c
> +++ b/builtin-gc.c
> @@ -57,15 +57,12 @@ static int gc_config(const char *var, const char *value, void *cb)
> return 0;
> }
> if (!strcmp(var, "gc.pruneexpire")) {
> - if (!value)
> - return config_error_nonbool(var);
> - if (strcmp(value, "now")) {
> + if (value && strcmp(value, "now")) {
> unsigned long now = approxidate("now");
> if (approxidate(value) >= now)
> return error("Invalid %s: '%s'", var, value);
> }
> - prune_expire = xstrdup(value);
> - return 0;
> + return git_config_string(&prune_expire, var, value);
> }
> return git_default_config(var, value, cb);
> }
--
Shawn.
^ permalink raw reply
* Re: [PATCH] git-gui: Implement a 'clone' subcommand
From: Shawn O. Pearce @ 2008-09-30 19:53 UTC (permalink / raw)
To: Petr Baudis; +Cc: git, Petr Baudis
In-Reply-To: <1222793501-17997-1-git-send-email-pasky@suse.cz>
Petr Baudis <pasky@suse.cz> wrote:
> This enables git-gui to be started with the clone dialog opened right
> away, possibly with the URL prefilled when it is passed as another
> argument. git-gui can then be e.g. registered as the git:// protocol
> handler.
>
> This is just a simple implementation - we construct the front actions
> page, then throw it away immediately; I wanted to avoid unnecessary
> refactoring and complication of the code, though.
>
> Signed-off-by: Petr Baudis <petr.baudis@novartis.com>
>
> ---
> Documentation/git-gui.txt | 5 +++++
> git-gui/git-gui.sh | 21 ++++++++++++++++++---
> git-gui/lib/choose_repository.tcl | 11 ++++++++++-
> 3 files changed, 33 insertions(+), 4 deletions(-)
This looks fine, except for the diffstat. You can't patch
the docs and the code in the same patch as they are in two
different repositories... :-|
Also, I don't know if you've noticed but I think tg is
sending duplicate "To" headers in the messages:
From: Petr Baudis <pasky@suse.cz>
* To: git@vger.kernel.org
Cc: spearce@spearce.org, Petr Baudis <petr.baudis@novartis.com>
Subject: [PATCH] git-gui: Implement a 'clone' subcommand
Date: Tue, 30 Sep 2008 18:51:41 +0200
Message-Id: <1222793501-17997-1-git-send-email-pasky@suse.cz>
X-Mailer: git-send-email 1.5.6.3.392.g292f1
* To: git@vger.kernel.org
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
--
Shawn.
^ permalink raw reply
* [PATCH] Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set
From: David Bryson @ 2008-09-30 19:53 UTC (permalink / raw)
To: git
In-Reply-To: <20080930190549.GA9869@eratosthenes.cryptobackpack.org>
Signed-off-by: David Bryson <david@statichacks.org>
---
builtin-gc.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/builtin-gc.c b/builtin-gc.c
index fac200e..6260652 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -57,15 +57,12 @@ static int gc_config(const char *var, const char *value, void *cb)
return 0;
}
if (!strcmp(var, "gc.pruneexpire")) {
- if (!value)
- return config_error_nonbool(var);
- if (strcmp(value, "now")) {
+ if (value && strcmp(value, "now")) {
unsigned long now = approxidate("now");
if (approxidate(value) >= now)
return error("Invalid %s: '%s'", var, value);
}
- prune_expire = xstrdup(value);
- return 0;
+ return git_config_string(&prune_expire, var, value);
}
return git_default_config(var, value, cb);
}
--
1.6.0.2
^ permalink raw reply related
* [PATCH] Improve git-log documentation wrt file filters
From: martin f. krafft @ 2008-09-30 19:57 UTC (permalink / raw)
To: git; +Cc: martin f. krafft
In-Reply-To: <20080930192553.GI21310@spearce.org>
The need for "--" in the git-log synopsis was previously unclear and
confusing. This patch makes it a little clearer.
Thanks to hyy <yiyihu@gmail.com> for his help.
Signed-off-by: martin f. krafft <madduck@madduck.net>
---
Documentation/git-log.txt | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 0446bad..5a3a625 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -8,7 +8,7 @@ git-log - Show commit logs
SYNOPSIS
--------
-'git log' <option>...
+'git log' [<options>] [<since>..<until>] [[--] <path>...]
DESCRIPTION
-----------
@@ -57,8 +57,10 @@ include::diff-options.txt[]
Note that only message is considered, if also a diff is shown
its size is not included.
-<path>...::
- Show only commits that affect any of the specified paths.
+[--] <path>...::
+ Show only commits that affect any of the specified paths. To
+ prevent confusion with options and branch names, paths may need to be
+ prefixed with "-- " to separate them from options or refnames.
include::rev-list-options.txt[]
--
1.5.6.5
^ permalink raw reply related
* Re: [PATCH] git-gui: Implement a 'clone' subcommand
From: Shawn O. Pearce @ 2008-09-30 19:58 UTC (permalink / raw)
To: Petr Baudis; +Cc: git, Petr Baudis
In-Reply-To: <20080930195330.GA4413@spearce.org>
"Shawn O. Pearce" <spearce@spearce.org> wrote:
> Petr Baudis <pasky@suse.cz> wrote:
> > This enables git-gui to be started with the clone dialog opened right
> > away, possibly with the URL prefilled when it is passed as another
> > argument. git-gui can then be e.g. registered as the git:// protocol
> > handler.
> >
> > This is just a simple implementation - we construct the front actions
> > page, then throw it away immediately; I wanted to avoid unnecessary
> > refactoring and complication of the code, though.
> >
> > Signed-off-by: Petr Baudis <petr.baudis@novartis.com>
> >
> > ---
> > Documentation/git-gui.txt | 5 +++++
> > git-gui/git-gui.sh | 21 ++++++++++++++++++---
> > git-gui/lib/choose_repository.tcl | 11 ++++++++++-
> > 3 files changed, 33 insertions(+), 4 deletions(-)
>
> This looks fine [...]
I take that back. "git gui clone git://repo.or.cz/alt-git.git"
didn't show the URL in the clone dialog for me. This is on top
of your previous series, including the "locator" feature, and
with two locators configured in my .git/config.
--
Shawn.
^ permalink raw reply
* Re: [PATCH] Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set
From: Shawn O. Pearce @ 2008-09-30 20:04 UTC (permalink / raw)
To: David Bryson; +Cc: git
In-Reply-To: <20080930195355.GA14499@eratosthenes.cryptobackpack.org>
David Bryson <david@statichacks.org> wrote:
> diff --git a/builtin-gc.c b/builtin-gc.c
> index fac200e..6260652 100644
> --- a/builtin-gc.c
> +++ b/builtin-gc.c
> @@ -57,15 +57,12 @@ static int gc_config(const char *var, const char *value, void *cb)
> return 0;
> }
> if (!strcmp(var, "gc.pruneexpire")) {
> - if (!value)
> - return config_error_nonbool(var);
> - if (strcmp(value, "now")) {
> + if (value && strcmp(value, "now")) {
> unsigned long now = approxidate("now");
> if (approxidate(value) >= now)
> return error("Invalid %s: '%s'", var, value);
> }
> - prune_expire = xstrdup(value);
> - return 0;
> + return git_config_string(&prune_expire, var, value);
The message formatting was a lot better. But:
builtin-gc.c:65: warning: passing argument 1 of 'git_config_string' from incompatible pointer type
>From http://git.or.cz/gitwiki/Janitor:
This is because the first argument to "git_config_string" should
be a "const char **", not a "char **". There will be a compile
time warning if a "char **" is passed instead of a "const char **"
and the patch will be rejected. (And no, casting the "char **"
into a "const char **" is not a good solution either.)"
--
Shawn.
^ permalink raw reply
* Re: [GUILT] Use git_editor
From: Josef 'Jeff' Sipek @ 2008-09-30 20:22 UTC (permalink / raw)
To: Alan Jenkins; +Cc: git
In-Reply-To: <48E27A87.9060205@tuffmail.co.uk>
On Tue, Sep 30, 2008 at 08:14:15PM +0100, Alan Jenkins wrote:
> Josef 'Jeff' Sipek wrote:
> > On Tue, Sep 30, 2008 at 07:43:50PM +0100, Alan Jenkins wrote:
> >
> >> Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
> >>
> >> diff --git a/guilt b/guilt
> >> index 1cef7b9..8d023e9 100755
> >> --- a/guilt
> >> +++ b/guilt
> >> @@ -693,10 +693,6 @@ fi
> >> series="$GUILT_DIR/$branch/series"
> >> applied="$GUILT_DIR/$branch/status"
> >>
> >> -# determine an editor to use for anything interactive (fall back to vi)
> >> -editor="vi"
> >> -[ ! -z "$EDITOR" ] && editor="$EDITOR"
> >> -
> >>
> >
> > Looks good from a quick glance. Any chance there's a git_pager?
> >
> > Josef 'Jeff' Sipek.
>
> Not in git-sh-setup. I did check :-).
Interesting! There are definitely places in git that invoke _a_
pager...maybe there's a patch to git that need creating :)
Josef 'Jeff' Sipek.
--
Failure is not an option,
It comes bundled with your Microsoft product.
^ permalink raw reply
* [PATCH, resent] fix openssl headers conflicting with custom SHA1 implementations
From: Nicolas Pitre @ 2008-09-30 20:22 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
On ARM I have the following compilation errors:
CC fast-import.o
In file included from cache.h:8,
from builtin.h:6,
from fast-import.c:142:
arm/sha1.h:14: error: conflicting types for 'SHA_CTX'
/usr/include/openssl/sha.h:105: error: previous declaration of 'SHA_CTX' was here
arm/sha1.h:16: error: conflicting types for 'SHA1_Init'
/usr/include/openssl/sha.h:115: error: previous declaration of 'SHA1_Init' was here
arm/sha1.h:17: error: conflicting types for 'SHA1_Update'
/usr/include/openssl/sha.h:116: error: previous declaration of 'SHA1_Update' was here
arm/sha1.h:18: error: conflicting types for 'SHA1_Final'
/usr/include/openssl/sha.h:117: error: previous declaration of 'SHA1_Final' was here
make: *** [fast-import.o] Error 1
This is because openssl header files are always included in
git-compat-util.h since commit 684ec6c63c whenever NO_OPENSSL is not
set, which somehow brings in <openssl/sha1.h> clashing with the custom
ARM version. Compilation of git is probably broken on PPC too for the
same reason.
Turns out that the only file requiring openssl/ssl.h and openssl/err.h
is imap-send.c. But only moving those problematic includes there
doesn't solve the issue as it also includes cache.h which brings in the
conflicting header. So also conditionally including SHA1_HEADER allows
for not including it when compiling imap-send.c.
Signed-off-by: Nicolas Pitre <nico@cam.org>
---
This is a bit ugly but given the rat nest of system includes we have I
don't know how to solve this any better.
diff --git a/Makefile b/Makefile
index 3c0664a..a0f86dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1242,6 +1242,9 @@ endif
git-%$X: %.o $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
+imap-send.o: imap-send.c GIT-CFLAGS
+ $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -USHA1_HEADER $<
+
git-imap-send$X: imap-send.o $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL)
diff --git a/cache.h b/cache.h
index de8c2b6..d93e086 100644
--- a/cache.h
+++ b/cache.h
@@ -5,7 +5,10 @@
#include "strbuf.h"
#include "hash.h"
+#ifdef SHA1_HEADER
#include SHA1_HEADER
+#endif
+
#include <zlib.h>
#if defined(NO_DEFLATE_BOUND) || ZLIB_VERNUM < 0x1200
diff --git a/git-compat-util.h b/git-compat-util.h
index db2836f..044f62b 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -99,11 +99,6 @@
#include <iconv.h>
#endif
-#ifndef NO_OPENSSL
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#endif
-
/* On most systems <limits.h> would have given us this, but
* not on some systems (e.g. GNU/Hurd).
*/
diff --git a/imap-send.c b/imap-send.c
index af7e08c..01f1c9a 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -22,11 +22,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "cache.h"
#ifdef NO_OPENSSL
typedef void *SSL;
+#else
+#include <openssl/ssl.h>
+#include <openssl/err.h>
#endif
+#include "cache.h"
+
struct store_conf {
char *name;
const char *path; /* should this be here? its interpretation is driver-specific */
Nicolas
^ permalink raw reply related
* Re: [PATCH 4/4 v2] cygwin: Use native Win32 API for stat
From: Shawn O. Pearce @ 2008-09-30 20:26 UTC (permalink / raw)
To: Marcus Griep
Cc: Dmitry Potapov, Johannes Sixt, git, Junio C Hamano, Alex Riesen
In-Reply-To: <48E23E5B.7020404@griep.us>
Marcus Griep <marcus@griep.us> wrote:
> Dmitry Potapov wrote:
> > lstat/stat functions in Cygwin are very slow, because they try to emulate
> > some *nix things that Git does not actually need. This patch adds Win32
> > specific implementation of these functions for Cygwin.
>
> Can't wait to see this patch in next or master! If you recall my benchmarks
> from earlier, the speed-up is pretty good for cygwin users working with
> large repositories.
>
> > Signed-off-by: Dmitry Potapov <dpotapov@gmail.com>
>
> Thanks for the work, Dmitry!
Thanks folks. I'm scheduling this for 'next'. Lets see how
it goes...
--
Shawn.
^ permalink raw reply
* [PATCH] Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set
From: David Bryson @ 2008-09-30 20:28 UTC (permalink / raw)
To: git
In-Reply-To: <20080930190549.GA9869@eratosthenes.cryptobackpack.org>
Signed-off-by: David Bryson <david@statichacks.org>
---
Manage to fix the const char ** compile error, third time is a
harm(hopefully!)
builtin-gc.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/builtin-gc.c b/builtin-gc.c
index fac200e..7af65bb 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -26,7 +26,7 @@ static int pack_refs = 1;
static int aggressive_window = -1;
static int gc_auto_threshold = 6700;
static int gc_auto_pack_limit = 50;
-static char *prune_expire = "2.weeks.ago";
+static const char *prune_expire = "2.weeks.ago";
#define MAX_ADD 10
static const char *argv_pack_refs[] = {"pack-refs", "--all", "--prune", NULL};
@@ -57,15 +57,12 @@ static int gc_config(const char *var, const char *value, void *cb)
return 0;
}
if (!strcmp(var, "gc.pruneexpire")) {
- if (!value)
- return config_error_nonbool(var);
- if (strcmp(value, "now")) {
+ if (value && strcmp(value, "now")) {
unsigned long now = approxidate("now");
if (approxidate(value) >= now)
return error("Invalid %s: '%s'", var, value);
}
- prune_expire = xstrdup(value);
- return 0;
+ return git_config_string(&prune_expire, var, value);
}
return git_default_config(var, value, cb);
}
--
1.6.0.2
^ permalink raw reply related
* Re: [PATCH, resent] fix openssl headers conflicting with custom SHA1 implementations
From: Shawn O. Pearce @ 2008-09-30 20:39 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: git
In-Reply-To: <alpine.LFD.2.00.0809301621091.3635@xanadu.home>
Nicolas Pitre <nico@cam.org> wrote:
> On ARM I have the following compilation errors:
...
> This is a bit ugly but given the rat nest of system includes we have I
> don't know how to solve this any better.
Hmm. On Linux x86 with your change:
In file included from imap-send.c:32:
cache.h: In function 'create_ce_mode':
cache.h:186: error: 'S_IFLNK' undeclared (first use in this function)
I think that last hunk which moved the openssl includes to be before
cache.h is the problem. This squashed in seems to make it my build
work again:
diff --git a/imap-send.c b/imap-send.c
index 01f1c9a..6b8c66e 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -22,6 +22,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "cache.h"
#ifdef NO_OPENSSL
typedef void *SSL;
#else
@@ -29,8 +30,6 @@ typedef void *SSL;
#include <openssl/err.h>
#endif
-#include "cache.h"
-
struct store_conf {
char *name;
const char *path; /* should this be here? its interpretation is driver-specific */
--
Shawn.
^ permalink raw reply related
* Re: [PATCH, resent] fix openssl headers conflicting with custom SHA1 implementations
From: Nicolas Pitre @ 2008-09-30 20:46 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
In-Reply-To: <20080930203928.GN21310@spearce.org>
On Tue, 30 Sep 2008, Shawn O. Pearce wrote:
> Nicolas Pitre <nico@cam.org> wrote:
> > On ARM I have the following compilation errors:
> ...
> > This is a bit ugly but given the rat nest of system includes we have I
> > don't know how to solve this any better.
>
> Hmm. On Linux x86 with your change:
>
> In file included from imap-send.c:32:
> cache.h: In function 'create_ce_mode':
> cache.h:186: error: 'S_IFLNK' undeclared (first use in this function)
>
> I think that last hunk which moved the openssl includes to be before
> cache.h is the problem. This squashed in seems to make it my build
> work again:
>
> diff --git a/imap-send.c b/imap-send.c
> index 01f1c9a..6b8c66e 100644
> --- a/imap-send.c
> +++ b/imap-send.c
> @@ -22,6 +22,7 @@
> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> */
>
> +#include "cache.h"
> #ifdef NO_OPENSSL
> typedef void *SSL;
> #else
> @@ -29,8 +30,6 @@ typedef void *SSL;
> #include <openssl/err.h>
> #endif
>
> -#include "cache.h"
> -
> struct store_conf {
> char *name;
> const char *path; /* should this be here? its interpretation is driver-specific */
With that, my build on ARM bombs out with:
CC imap-send.o
In file included from /usr/include/openssl/kssl.h:71,
from /usr/include/openssl/ssl.h:191,
from imap-send.c:30:
/usr/include/ctype.h:102: error: expected expression before ']' token
/usr/include/ctype.h:102: error: expected ')' before '!=' token
/usr/include/ctype.h:103: error: expected expression before ']' token
/usr/include/ctype.h:103: error: expected ')' before '!=' token
/usr/include/ctype.h:105: error: expected expression before ']' token
/usr/include/ctype.h:105: error: expected ')' before '!=' token
/usr/include/ctype.h:110: error: expected expression before ']' token
/usr/include/ctype.h:110: error: expected ')' before '!=' token
/usr/include/ctype.h:116: error: expected declaration specifiers or '...' before '(' token
/usr/include/ctype.h:116: error: expected declaration specifiers or '...' before numeric constant
/usr/include/ctype.h:119: error: expected declaration specifiers or '...' before '(' token
/usr/include/ctype.h:119: error: expected declaration specifiers or '...' before numeric constant
/usr/include/ctype.h:191: error: expected declaration specifiers or '...' before '(' token
/usr/include/ctype.h:191: error: expected declaration specifiers or '...' before numeric constant
/usr/include/ctype.h:192: error: redefinition of 'sane_case'
git-compat-util.h:338: error: previous definition of 'sane_case' was here
/usr/include/ctype.h: In function 'sane_case':
/usr/include/ctype.h:192: error: number of arguments doesn't match prototype
git-compat-util.h:338: error: prototype declaration
/usr/include/ctype.h:193: error: '__c' undeclared (first use in this function)
/usr/include/ctype.h:193: error: (Each undeclared identifier is reported only once
/usr/include/ctype.h:193: error: for each function it appears in.)
/usr/include/ctype.h: At top level:
/usr/include/ctype.h:197: error: expected declaration specifiers or '...' before '(' token
/usr/include/ctype.h:197: error: expected declaration specifiers or '...' before numeric constant
/usr/include/ctype.h:198: error: redefinition of 'sane_case'
/usr/include/ctype.h:192: error: previous definition of 'sane_case' was here
/usr/include/ctype.h: In function 'sane_case':
/usr/include/ctype.h:198: error: number of arguments doesn't match prototype
/usr/include/ctype.h:192: error: prototype declaration
/usr/include/ctype.h:199: error: '__c' undeclared (first use in this function)
make: *** [imap-send.o] Error 1
Nicolas
^ permalink raw reply
* Re: [PATCH, resent] fix openssl headers conflicting with custom SHA1 implementations
From: Shawn O. Pearce @ 2008-09-30 20:51 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: git
In-Reply-To: <alpine.LFD.2.00.0809301645340.3635@xanadu.home>
Nicolas Pitre <nico@cam.org> wrote:
> On Tue, 30 Sep 2008, Shawn O. Pearce wrote:
> > Nicolas Pitre <nico@cam.org> wrote:
> > > On ARM I have the following compilation errors:
> > ...
> > > This is a bit ugly but given the rat nest of system includes we have I
> > > don't know how to solve this any better.
> >
> > Hmm. On Linux x86 with your change:
> >
> > In file included from imap-send.c:32:
> > cache.h: In function 'create_ce_mode':
> > cache.h:186: error: 'S_IFLNK' undeclared (first use in this function)
> >
> > I think that last hunk which moved the openssl includes to be before
> > cache.h is the problem.
>
> With that, my build on ARM bombs out with:
>
> CC imap-send.o
> In file included from /usr/include/openssl/kssl.h:71,
> from /usr/include/openssl/ssl.h:191,
> from imap-send.c:30:
> /usr/include/ctype.h:102: error: expected expression before ']' token
*sigh*
Yea, its a bit ugly due to the rats nest of system includes.
Right now I don't see how we can include your patch, it breaks a
major platform for us. But obviously my "fix" is also bogus and
won't get ARM working again.
Any other ideas we can try? 'cause I don't have any right now. :-|
--
Shawn.
^ 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