{"thread":{"id":"3844","subject":"git commit broken ?","startedAt":"2006-04-10T08:02:44Z","lastAt":"2006-04-10T08:24:01Z","messageCount":3,"participants":["Franck Bui-Huu","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"18534","messageId":"cda58cb80604100102p92e5258qf33a128f75f1b088@mail.gmail.com","threadId":"3844","inReplyTo":null,"subject":"git commit broken ?","fromName":"Franck Bui-Huu","fromEmail":"vagabon.xyz@gmail.com","sentAt":"2006-04-10T08:02:44Z","receivedAt":"2006-04-10T08:02:44Z","isPatch":false,"sender":{"key":"vagabon.xyz@gmail.com","avatar":null},"body":"It seems that \"git commit -a -c ORIG_HEAD\" command do not work as\nexpected.\n\nHere is an example:\n\n\t$ ls\n\ta b c\n\n\t$ git status\n\tnothing to commit\n\n\t$ echo \"good modif\" > a\n\t$ echo \"temp modif\" > c\n\t$ git-update-index a\n\t$ git commit -m \"work in prog\"\n\n\t$ git reset --soft HEAD^\n\t$ git status\n\t#\n\t# Updated but not checked in:\n\t#   (will commit)\n\t#\n\t#       modified: a\n\t#\n\t#\n\t# Changed but not updated:\n\t#   (use git-update-index to mark for commit)\n\t#\n\t#       modified: c\n\t#\n\t\n\t$ git commit -a -c ORIG_HEAD\n\t$ git status\n\tnothing to commit\n\nSo it seems that c has been commmited this time...Is it the expected\nbehaviour ?\n\nMy git version:\n\n\t$ git --version\n\tgit version 1.3.0.rc3.g0ed4\n\nThanks\n--\n               Franck\n"},{"id":"18536","messageId":"7vhd51alti.fsf@assigned-by-dhcp.cox.net","threadId":"3844","inReplyTo":"cda58cb80604100102p92e5258qf33a128f75f1b088@mail.gmail.com","subject":"Re: git commit broken ?","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-04-10T08:15:05Z","receivedAt":"2006-04-10T08:15:05Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Franck Bui-Huu\" <vagabon.xyz@gmail.com> writes:\n\n> It seems that \"git commit -a -c ORIG_HEAD\" command do not work as\n> expected.\n>\n> \t$ git commit -a -c ORIG_HEAD\n> \t$ git status\n> \tnothing to commit\n>\n> So it seems that c has been commmited this time...Is it the expected\n> behaviour ?\n\nYou said \"git commit -a\" to tell it to commit all your changes\nin your working tree, using \"-c ORIG_HEAD\" which means \"take the\ncommit log message and authorship information from that commit\".\n\nSo I do not understand what else, other than both a and c\ngetting committed (hence subsequent \"git status\" to report\n\"nothing to commit'), you are expecting...\n"},{"id":"18538","messageId":"cda58cb80604100124k165307c3td84be984e607c6ae@mail.gmail.com","threadId":"3844","inReplyTo":"7vhd51alti.fsf@assigned-by-dhcp.cox.net","subject":"Re: git commit broken ?","fromName":"Franck Bui-Huu","fromEmail":"vagabon.xyz@gmail.com","sentAt":"2006-04-10T08:24:01Z","receivedAt":"2006-04-10T08:24:01Z","isPatch":false,"sender":{"key":"vagabon.xyz@gmail.com","avatar":null},"body":"2006/4/10, Junio C Hamano <junkio@cox.net>:\n> \"Franck Bui-Huu\" <vagabon.xyz@gmail.com> writes:\n>\n> > It seems that \"git commit -a -c ORIG_HEAD\" command do not work as\n> > expected.\n> >\n> >       $ git commit -a -c ORIG_HEAD\n> >       $ git status\n> >       nothing to commit\n> >\n> > So it seems that c has been commmited this time...Is it the expected\n> > behaviour ?\n>\n> You said \"git commit -a\" to tell it to commit all your changes\n> in your working tree, using \"-c ORIG_HEAD\" which means \"take the\n> commit log message and authorship information from that commit\".\n>\n> So I do not understand what else, other than both a and c\n> getting committed (hence subsequent \"git status\" to report\n> \"nothing to commit'), you are expecting...\n\noops, I forgot that switch, sorry for the noise.\n\nThanks\n--\n               Franck\n"}]}