Thanks Henning for clarification Yes, I made fresh repo close and history is correct.
On Wed, 2025-12-10 at 07:24 +0000, Henning Westerholt wrote: > > > Hello Sergey, > > seems to work fine for me. Did you maybe work on a limited clone? > E.g. as indicated from our tutorials git clone --depth 1 --no- > single-branch > > $ git clonehttps://github.com/kamailio/kamailio kamailio-test > Cloning into 'kamailio-test'... > remote: Enumerating objects: 365192, done. > remote: Counting objects: 100% (1638/1638), done. > remote: Compressing objects: 100% (830/830), done. > remote: Total 365192 (delta 1021), reused 987 (delta 807), pack- > reused 363554 (from 3) > Receiving objects: 100% (365192/365192), 120.10 MiB | 37.78 MiB/s, > done. > Resolving deltas: 100% (277635/277635), done. > $ cd kamailio-test > $ git log | tail > Author: Andrei Pelinescu-Onciul > Date: Tue Sep 4 01:41:39 2001 +0000 > > parser seems to work > > commit 512dcd9838f5aeb0bfccd02cfc156067b7f02b71 > Author: Andrei Pelinescu-Onciul > Date: Mon Sep 3 21:27:11 2001 +0000 > > Initial revision > > Cheers, > > Henning > > > > > From: Sergey Safarov via sr-dev <[email protected]> > Sent: Mittwoch, 10. Dezember 2025 08:16 > To: Kamailio (SER) - Devel Mailing List <[email protected]> > Cc: Sergey Safarov <[email protected]> > Subject: [sr-dev] git log truncated > > > I see something wrong git log in kamailio history. > > > > If you execute "git log" in the command line and scroll down, then > the first commit will be > > > > commit 46737c269ae290c29639ab1a5e66e4cf1637556e (grafted) > Author: Daniel-Constantin Mierla <[email protected]> > Date: Tue Dec 9 11:49:53 2025 +0100 > > db_redis: use set max fetch for result to 1000 when *keys_count > == 1000 > > - GH #4511 > > > > And no ability to view older commits. > > > > Also, when I rebase my local master branch on upstream/master then I > see an error > > > > safarov@nout:~/kamailio-upstream$ git rebase upstream/master > Auto-merging Makefile > CONFLICT (add/add): Merge conflict in Makefile > error: could not apply e60a9728a5... First working release > hint: Resolve all conflicts manually, mark them as resolved with > hint: "git add/rm <conflicted_files>", then run "git rebase -- > continue". > hint: You can instead skip this commit: run "git rebase --skip". > hint: To abort and get back to the state before "git rebase", run > "git rebase --abort". > hint: Disable this message with "git config set advice.mergeConflict > false" > Could not apply e60a9728a5... # First working release > > > > Question, maybe we need fix git history and force push master branch?
_______________________________________________ Kamailio - Development Mailing List -- [email protected] To unsubscribe send an email to [email protected] Important: keep the mailing list in the recipients, do not reply only to the sender!
