git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git loses commits on git pull --rebase with Dictator and Lieutenants Workflow

From
DDick <dick@mrns.nl>
Date
Jan 28, 2015, 19:49 UTC
Message-ID
<loom.20150128T203924-608@post.gmane.org>
Hi all,

I've encountered a problem with the Dictator and Lieutenants Workflow. I've configured remote origin so it pulls from the "blessed repository" and pushes to the "developer public" repository.

When the "blessed repository" has the same branch name as the "developer public" repository git pull seems to drop commits.

I've create a test script to demonstrate, left is the blessed repository, right.git is the developer public and right is the developer private repository.

rm -rf left/ right/ right.git/ git init left cd left/ echo "hello world" > test.txt git add test.txt git commit -m . cd .. git clone --bare left right.git git clone right.git/ right cd right git remote set-url origin ../left git remote set-url origin --push ../right.git echo "bye world" >> test.txt git commit -a -m . git push git log echo "start: two commits, ok" git fetch git rebase origin/master git log echo "manual fetch/rebase: two commits, still ok" git pull --rebase git log echo "pull: one commits, oops?"

Am I using git wrong or is this a git bug?
Thanks for having a look!
Dick
Next: Chris Packham
Message 1 of 7 in “git loses commits on git pull --rebase with Dictator and Lieutenants Workflow”
  1. DickJan 28, 2015
  2. Chris PackhamJan 29, 2015
  3. Chris PackhamJan 29, 2015
  4. Junio C HamanoJan 29, 2015
  5. DickJan 29, 2015
  6. Re* git loses commits on git pull --rebase with Dictator and Lieutenants WorkflowJunio C Hamano, Jan 29, 2015
  7. Eric SunshineJan 29, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.