Use porcelain commands

go.mod

@@ -1,3 +1,9 @@
 module gitvc
 
-go 1.22.2
+go 1.24.2
+
+toolchain go1.24.3
+
+require (
+	git.site.quack-lab.dev/dave/cylogger v1.2.2
+)

go.sum

@@ -0,0 +1,104 @@
+dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
+dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+git.site.quack-lab.dev/dave/cylogger v1.2.2 h1:4xUXASEBlG9NiGxh7f57xHh9imW4unHzakIEpQoKC5E=
+git.site.quack-lab.dev/dave/cylogger v1.2.2/go.mod h1:VS9MI4Y/cwjCBZgel7dSfCQlwtAgHmfvixOoBgBhtKg=
+github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
+github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
+github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
+github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
+github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
+github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
+github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
+github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
+github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
+github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
+github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
+github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
+github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
+github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
+github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
+github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM=
+github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
+github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
+github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
+github.com/go-git/go-git/v5 v5.16.0 h1:k3kuOEpkc0DeY7xlL6NaaNg39xdgQbtH5mwCafHO9AQ=
+github.com/go-git/go-git/v5 v5.16.0/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
+github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
+github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
+github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
+github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
+github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
+github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
+github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
+github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
+github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
+golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
+golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
+golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
+gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -2,173 +2,203 @@ package main
 
 import (
 	"flag"
-	"fmt"
-	"io"
-	"log"
 	"os"
 	"os/exec"
 	"path"
 	"path/filepath"
+	"strings"
 	"time"
+
+	logger "git.site.quack-lab.dev/dave/cylogger"
 )
 
-var Error *log.Logger
+var ROOT string
-var Warning *log.Logger
 
-func init() {
+// executeGitCommand runs a git command in the ROOT directory and returns the output
-	log.SetFlags(log.Ldate | log.Ltime)
+func executeGitCommand(args ...string) (string, error) {
-	Error = log.New(io.MultiWriter(os.Stderr, os.Stdout),
+	cmd := exec.Command("git", args...)
-		fmt.Sprintf("%sERROR:%s ", "\033[0;101m", "\033[0m"),
+	cmd.Dir = ROOT
-		log.Ldate|log.Ltime)
+	output, err := cmd.CombinedOutput()
-	Warning = log.New(io.MultiWriter(os.Stdout),
+	if err != nil {
-		fmt.Sprintf("%sWarning:%s ", "\033[0;93m", "\033[0m"),
+		logger.Error("Git command failed: %s", string(output))
-		log.Ldate|log.Ltime)
+		return "", err
+	}
+	return strings.TrimSpace(string(output)), nil
 }
 
-var ROOT string
+// isGitRepository checks if the current directory is a git repository
+func isGitRepository() bool {
+	_, err := executeGitCommand("rev-parse", "--git-dir")
+	return err == nil
+}
 
 func main() {
 	scanIntervalF := flag.String("interval", "2s", "scan interval")
 	flag.Parse()
-	log.SetFlags(log.Lmicroseconds)
 
 	scanInterval, err := time.ParseDuration(*scanIntervalF)
 	if err != nil {
-		Error.Printf("error parsing SCAN_INTERVAL: %v", err)
+		logger.Error("error parsing SCAN_INTERVAL: %v", err)
 		return
 	}
 
 	cwd, err := os.Getwd()
 	if err != nil {
-		Error.Printf("error getting cwd: %v", err)
+		logger.Error("error getting cwd: %v", err)
 		return
 	}
 
 	ROOT = path.Clean(cwd)
 	ROOT, err = filepath.Abs(ROOT)
 	if err != nil {
-		Error.Printf("error getting absolute path for ROOT: %v", err)
+		logger.Error("error getting absolute path for ROOT: %v", err)
 		return
 	}
 
-	log.Printf("Input args parsed as:")
+	logger.Info("Input args parsed as:")
-	log.Printf("ROOT: %s", ROOT)
+	logger.Info("ROOT: %s", ROOT)
-	log.Printf("SCAN_INTERVAL: %.0fs", scanInterval.Seconds())
+	logger.Info("SCAN_INTERVAL: %.0fs", scanInterval.Seconds())
 
-	// This shit DOES NOT run correctly on windows
-	// It absolutely butchers CRLF -> LF
-	// And shits the bed
-	// Thinking there are changed files
-	// Making empty commits
-	// And other stupid shit
-	// It does run on unix though
 	for {
-		log.Printf("Running at %s", time.Now().Format(time.RFC3339))
+		logger.Info("Running at %s", time.Now().Format(time.RFC3339))
 		doRun()
 		time.Sleep(scanInterval)
 	}
 }
 
 func doRun() {
-	file, err := os.Open(filepath.Join(ROOT, ".git/index.lock"))
+	// Check if repository exists
-	if err == nil {
+	if !isGitRepository() {
-		log.Printf("Index lock found, removing")
+		// Initialize a new repository
-		file.Close()
+		_, err := executeGitCommand("init")
-		err = os.Remove(filepath.Join(ROOT, ".git/index.lock"))
 		if err != nil {
-			Error.Printf("Error removing index.lock: %v", err)
+			logger.Error("Error creating repository: %v", err)
 			return
 		}
-	}
+		logger.Info("New repository created at: %s", ROOT)
 
-	status, err := doStatus()
+		// Create .gitignore file
-	if err != nil {
+		gitignorePath := filepath.Join(ROOT, ".gitignore")
-		Error.Printf("Error executing doStatus code %v with out: %v", err, status)
+		if err := os.WriteFile(gitignorePath, []byte("*.log\n"), 0644); err != nil {
+			logger.Error("Error creating .gitignore: %v", err)
 			return
 		}
-	if status == "" {
+
-		log.Printf("Nothing to commit")
+		// Set identity
+		if err := setIdentity(); err != nil {
+			logger.Error("Error setting identity: %v", err)
 			return
 		}
-	log.Printf("Changes detected")
 
-	res, err := doAddAll()
+		// Add .gitignore
-	if err != nil {
+		if _, err := executeGitCommand("add", ".gitignore"); err != nil {
-		Error.Printf("Error executing doAddAll with code %v and out: %v", err, res)
+			logger.Error("Error adding .gitignore: %v", err)
 			return
 		}
-	log.Printf("Changes added to index: %v", res)
 
-	res, err = setIdentity()
+		// Create initial commit
-	if err != nil {
+		if _, err := executeGitCommand("commit", "-m", "Initial commit"); err != nil {
-		Error.Printf("Error setting identity with code %v and out: %v", err, res)
+			logger.Error("Error creating initial commit: %v", err)
-	}
-
-	res, err = doCommit()
-	if err != nil {
-		Error.Printf("Error executing doCommitAll with code %v and out: %v", err, res)
 			return
 		}
-	log.Printf("Changes committed: %v", res)
+
+		logger.Info("Initial commit created with .gitignore")
+		return
+	}
+
+	// Check status
+	statusOutput, err := executeGitCommand("status", "--porcelain")
+	if err != nil {
+		logger.Error("Error getting status: %v", err)
+		return
+	}
+
+	if statusOutput == "" {
+		logger.Info("Nothing to commit")
+		return
+	}
+
+	// Count changes by type using porcelain status
+	lines := strings.Split(statusOutput, "\n")
+	var added, modified, deleted int
+	for _, line := range lines {
+		if len(line) >= 2 {
+			status := line[:2]
+			// Parse porcelain status format
+			// First character: index status (staged)
+			// Second character: working tree status (unstaged)
+			indexStatus := status[0]
+			worktreeStatus := status[1]
+
+			// Count staged changes
+			switch indexStatus {
+			case 'A':
+				added++
+			case 'M':
+				modified++
+			case 'D':
+				deleted++
+			}
+
+			// Count unstaged changes (only if not already counted as staged)
+			if worktreeStatus == 'M' && indexStatus != 'M' {
+				modified++
+			} else if worktreeStatus == 'D' && indexStatus != 'D' {
+				deleted++
+			}
+		}
+	}
+
+	logger.Info("Changes detected: %d added, %d modified, %d deleted", added, modified, deleted)
+
+	// Add all changes
+	_, err = executeGitCommand("add", ".")
+	if err != nil {
+		logger.Error("Error adding changes: %v", err)
+		return
+	}
+	logger.Info("Changes added to index")
+
+	// Set identity
+	if err := setIdentity(); err != nil {
+		logger.Error("Error setting identity: %v", err)
+		return
+	}
+
+	// Get current branch
+	branch, err := executeGitCommand("branch", "--show-current")
+	if err != nil {
+		logger.Error("Error getting current branch: %v", err)
+		return
+	}
+
+	// Commit changes
+	commitHash, err := executeGitCommand("commit", "-m", "Update")
+	if err != nil {
+		logger.Error("Error committing changes: %v", err)
+		return
+	}
+
+	// Get commit details using porcelain format
+	authorName, _ := executeGitCommand("log", "-1", "--pretty=format:%an")
+	authorEmail, _ := executeGitCommand("log", "-1", "--pretty=format:%ae")
+	commitDate, _ := executeGitCommand("log", "-1", "--pretty=format:%ai")
+	commitMessage, _ := executeGitCommand("log", "-1", "--pretty=format:%s")
+
+	logger.Info("Changes committed successfully:")
+	logger.Info("  Branch: %s", branch)
+	logger.Info("  Commit: %s", commitHash)
+	logger.Info("  Author: %s <%s>", authorName, authorEmail)
+	logger.Info("  Date: %s", commitDate)
+	logger.Info("  Message: %s", commitMessage)
 }
 
-func doStatus() (string, error) {
+func setIdentity() error {
-	gitStatus := exec.Command("git", "status", "-s")
+	_, err := executeGitCommand("config", "user.name", "system")
-	gitStatus.Dir = ROOT
-	out, err := gitStatus.CombinedOutput()
 	if err != nil {
-		return string(out), err
+		return err
 	}
-	return string(out), nil
-}
-func doAddAll() (string, error) {
-	gitAdd := exec.Command("git", "add", ".")
-	gitAdd.Dir = ROOT
-	out, err := gitAdd.CombinedOutput()
-	if err != nil {
-		return string(out), err
-	}
-	return string(out), nil
-}
 
-func doCommit() (string, error) {
+	_, err = executeGitCommand("config", "user.email", "system@localhost")
-	gitCommit := exec.Command("git", "commit", "-am", "Update")
+	return err
-	gitCommit.Dir = ROOT
-	out, err := gitCommit.CombinedOutput()
-	if err != nil {
-		return string(out), err
-	}
-	return string(out), nil
-}
-
-func setIdentity() (string, error) {
-	res, err := setUsername()
-	if err != nil {
-		log.Println("Error executing setUsername:", err)
-		return string(res), err
-	}
-	res, err = setEmail()
-	if err != nil {
-		log.Println("Error executing setEmail:", err)
-		return string(res), err
-	}
-	return "", nil
-}
-func setUsername() (string, error) {
-	gitConfig := exec.Command("git", "config", "user.name", "system")
-	gitConfig.Dir = ROOT
-	out, err := gitConfig.CombinedOutput()
-	if err != nil {
-		return string(out), err
-	}
-	return string(out), nil
-}
-func setEmail() (string, error) {
-	gitConfig := exec.Command("git", "config", "user.email", "system@localhost")
-	gitConfig.Dir = ROOT
-	out, err := gitConfig.CombinedOutput()
-	if err != nil {
-		return string(out), err
-	}
-	return string(out), nil
 }