Re: [PATCH] doc: AC_*_TOOL does not canonicalize the prefix

[Benoit Sigoure]

On Nov 16, 2007, at 11:36 PM, Stepan Kasal wrote:

> Hello Benoit,
>
> On Fri, Nov 16, 2007 at 10:38:25PM +0100, Benoit Sigoure wrote:
> > If you have commit access to the autoconf repo, setup [...]
>
> I followed your hints and have pushed my change.
> Thanks a lot.
>
> Unfortunately, I forgot to add a changelog entry, so I pushed another
> commit to fix that.

That's why you should proofread twice before pushing ;)
FWIW, you can easily check what you're about to push with:
  git log --patch-with-stat --reverse origin/master..
which is equivalent to:
  git log --patch-with-stat --reverse origin/master..<current branch>
which basically means:
  "show me the commits that are in <current branch> but not in  
origin/master"
the --patch-with-stat helps to proofread the patches and --reverse  
helps by showing you the older commits first (so you can proofread  
them in the order they will be applied, which is more natural)

In order to remember what `a..b' means (I used to forget this  
constantly) think of it as the path from `a' to `b' (the commits you  
need to add to go from a's HEAD to b's HEAD).

If you prefer GUIs, you can inspect the changes with `gitk origin/ 
master..'

> Then I tried to correct that and "reset" the remote repo.
> I tried git-reset and "git-push -f" but the server has refused that.

Don't do that.  Once you pushed, you published your history, it's too  
late.  You can rewrite it, but it will annoy people who fetched your  
`bad' commits.  Maybe if you do the reset/push very very quickly, no  
one will notice, but that's risky.  For instance, the repository of  
Autoconf is mirrored on repo.or.cz, I don't know how it'll behave if  
the mirror syncs right after your push, before your reset/push.

> That did not work.

Meaning?  What happened?

$ git push
updating 'refs/heads/master'
  from a447aa5bbce979377dd20e0adf351d4e66af869b
  to   28432ca1fee4339a08799a0a908422b618006a8b
Counting objects: 4, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), done.
Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
refs/heads/master: a447aa5bbce979377dd20e0adf351d4e66af869b ->  
28432ca1fee4339a08799a0a908422b618006a8b
updating local tracking ref 'refs/remotes/origin/master'

<omg, that commit I just pushed has something wrong>
<hack hack>

$ git ci -a --amend
$ git push
error: remote 'refs/heads/master' is not an ancestor of
local  'refs/heads/master'.
Maybe you are not up-to-date and need to pull first?
$ git push --force
updating 'refs/heads/master'
  from 28432ca1fee4339a08799a0a908422b618006a8b
  to   66e758efec34684c3289c9fb2e16ddedca6ed243
Counting objects: 4, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), done.
Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
refs/heads/master: 28432ca1fee4339a08799a0a908422b618006a8b ->  
66e758efec34684c3289c9fb2e16ddedca6ed243
updating local tracking ref 'refs/remotes/origin/master'

Works for me...

> > > +dash.  For example, if the user runs
> > > address@hidden --build=x86_64-gnu --host=i386-gnu}, then this  
> > > call:
> > >  @example
> > >  AC_CHECK_TOOL([RANLIB], [ranlib], [:])
> > >  @end example
> >
> > s/call/&s/
>
> "call" is a noun here; the sentence continues "... sets RANLIB to ..."

Heh, yeah, indeed.

--
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory

PGP.sig
Description: This is a digitally signed message part