Arch Linux

Nyutag

Member

Registered: 2012-07-19

Posts: 18

[Solved] Need help with the new aur@aur4.archlinux.org git

$ls
LICENSE  PKGBUILD  scrolls  scrolls.desktop  scrolls.png
$

$ git add scrolls.desktop scrolls.png PKGBUILD .SRCINFO LICENSE
$

$ git commit -m 'Initial import'
[master (commit racine) 91e52b1] Initial import
# Maintainer: Tanguy ALEXIS <tanguy@metatux.fr>
 5 files changed, 175 insertions(+)
 create mode 100644 .SRCINFO
 create mode 100644 LICENSE
 create mode 100644 PKGBUILD
#!/bin/sh
 create mode 100644 scrolls.desktop
 create mode 100644 scrolls.png
$

$ git push origin master
Décompte des objets: 7, fait.
Delta compression using up to 2 threads.
Compression des objets: 100% (7/7), fait.
Écriture des objets: 100% (7/7), 33.16 KiB | 0 bytes/s, fait.
Total 7 (delta 0), reused 0 (delta 0)
remote: error: The following error occurred when parsing commit
remote: error: 91e52b155f5a80976ad4dcf7ef480baeb3806bf9:
remote: error: missing source file: scrolls
remote: error: hook declined to update refs/heads/master
To ssh://aur@aur4.archlinux.org/scrolls.git
 ! [remote rejected] master -> master (hook declined)
error: impossible de pousser des références vers 'ssh://aur@aur4.archlinux.org/scrolls.git'
$

Oups, look like I forgot the "scrolls" file.

$ git add scrolls
$

$ git commit -m 'Add missing file'          
Sur la branche master
rien à valider, la copie de travail est propre
$

Translation, on master branch, nothing to validate, job copy clean "?"

$ $ git push origin master
Décompte des objets: 10, fait.
Delta compression using up to 2 threads.
Compression des objets: 100% (9/9), fait.
Écriture des objets: 100% (10/10), 33.39 KiB | 0 bytes/s, fait.
Total 10 (delta 1), reused 0 (delta 0)
remote: error: The following error occurred when parsing commit
remote: error: 91e52b155f5a80976ad4dcf7ef480baeb3806bf9:
remote: error: missing source file: scrolls
remote: error: hook declined to update refs/heads/master
To ssh://aur@aur4.archlinux.org/scrolls.git
 ! [remote rejected] master -> master (hook declined)
error: impossible de pousser des références vers 'ssh://aur@aur4.archlinux.org/scrolls.git'
$

Okay... It's seems to be stuck on the same commit (91e52b155f5a80976ad4dcf7ef480baeb3806bf9 aka ''Initial import")
What can I do?
I'm a still earning git noob.

Last edited by Nyutag (2015-06-17 07:10:16)

Spider.007

Member

Registered: 2004-06-20

Posts: 1,176

Re: [Solved] Need help with the new aur@aur4.archlinux.org git

use git rebase to merge both commits into one commit which will then pass. Next time, your second commit should include --amend to correct the previous commit instead of append to it

Nyutag

Member

Registered: 2012-07-19

Posts: 18

Re: [Solved] Need help with the new aur@aur4.archlinux.org git

$ git log --pretty=oneline
c65db9fe3062d480d9bfa76049c5ae6c8a3275a3 Initial import
91e52b155f5a80976ad4dcf7ef480baeb3806bf9 Initial import
$ git reset --soft "HEAD^"
$ git commit --amend
[master b33979b] Initial import
 Date: Tue Jun 16 17:22:38 2015 +0200
 6 files changed, 178 insertions(+)
 create mode 100644 .SRCINFO
 create mode 100644 LICENSE
 create mode 100644 PKGBUILD
 create mode 100644 scrolls
 create mode 100644 scrolls.desktop
 create mode 100644 scrolls.png
$ git log --pretty=oneline
b33979b4f89168c25389dd678d410895a6c6874e Initial import
$ git push origin master
Décompte des objets: 8, fait.
Delta compression using up to 2 threads.
Compression des objets: 100% (7/7), fait.
Écriture des objets: 100% (8/8), 33.23 KiB | 0 bytes/s, fait.
Total 8 (delta 0), reused 0 (delta 0)
To ssh://aur@aur4.archlinux.org/scrolls.git
 * [new branch]      master -> master
$

Solved! Thanks!