Question regarding patches

Anand Arumugam anand.arumug at gmail.com
Wed Dec 19 12:01:40 EST 2012


On Wed, Dec 19, 2012 at 2:13 AM, Shraddha Kamat <sh2008ka at gmail.com> wrote:

> On Wed, 2012-12-19 at 13:58 +0400, Lijo Antony wrote:
> > On 12/19/2012 12:47 PM, Shraddha Kamat wrote:
> > > Sorry if this is not relevant to kernel. But since I am
> > > patching the kernel - Please consider this as a uber beginner
> > > question to ask on this mailing list - forgive me for that.
> > >
> > > Now my question is -
> > >
> > > What "@@ -321,7 +321,8 @@" mean in this snippet from the patch -
> > >
> > > diff --git a/exec.h b/exec.h
> > > index 722c620..6abb687 100644
> > > --- a/exec.h
> > > +++ b/exec.h
> > > @@ -321,7 +321,8 @@ static void acct_arg_size(struct linux_binprm
> *bprm,
> > > unsigned long pages);
> > >
> >
> >
> http://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html
> > http://www.artima.com/weblogs/viewpost.jsp?thread=164293
> >
> > -lijo
> >
> But I don't see any mention of the "index" field here //
> see line "index 722c620..6abb687 100644". What does this mean ?
>
>
'722c620' is the commit id in which a/exec.h is part of and
'6abb687' is the commit id in which b/exec.h is part of. 'a' and 'b' are
not folders. Its just a notation that diff uses for left and right side.

to know more on git look here: http://git-scm.com/book
and git diff in particular look at the man page or search for "git diff"
and you get a lot of links that explains it...
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20121219/425bca1d/attachment.html 


More information about the Kernelnewbies mailing list